From e01ab0ff2b4749bc948838ba05f29c9943bb194c Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Mon, 28 Jan 2013 19:42:39 +0530
Subject: [PATCH 001/547] [IMP]Update jquery datetime lib and make use of
 'select' controltype.

bzr revid: vme@tinyerp.com-20130128141239-l0gefk6dfhzbqpfq
---
 addons/web/__openerp__.py                     |    1 +
 .../css/jquery-ui-timepicker-addon.css        |    4 +
 .../js/jquery-ui-sliderAccess.js              |   89 +
 .../js/jquery-ui-timepicker-addon.js          | 2976 ++++++++++-------
 addons/web/static/src/js/view_form.js         |   22 +-
 5 files changed, 1884 insertions(+), 1208 deletions(-)
 create mode 100644 addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-sliderAccess.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 2303b6a68e8..ffe0fe66acc 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -28,6 +28,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.blockUI/jquery.blockUI.js",
         "static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js",
         "static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js",
+        "static/lib/jquery.ui.timepicker/js/jquery-ui-sliderAccess.js",
         "static/lib/jquery.ui.notify/js/jquery.notify.js",
         "static/lib/jquery.deferred-queue/jquery.deferred-queue.js",
         "static/lib/jquery.scrollTo/jquery.scrollTo-min.js",
diff --git a/addons/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css b/addons/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css
index e0d03c290af..b93a85f62b3 100644
--- a/addons/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css
+++ b/addons/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css
@@ -4,3 +4,7 @@
 .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
 .ui-timepicker-div td { font-size: 90%; }
 .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; }
+.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
\ No newline at end of file
diff --git a/addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-sliderAccess.js b/addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-sliderAccess.js
new file mode 100644
index 00000000000..a54cf4ab9a7
--- /dev/null
+++ b/addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-sliderAccess.js
@@ -0,0 +1,89 @@
+/*
+ * jQuery UI Slider Access
+ * By: Trent Richardson [http://trentrichardson.com]
+ * Version 0.3
+ * Last Modified: 10/20/2012
+ * 
+ * Copyright 2011 Trent Richardson
+ * Dual licensed under the MIT and GPL licenses.
+ * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+ * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+ * 
+ */
+ (function($){
+
+	$.fn.extend({
+		sliderAccess: function(options){
+			options = options || {};
+			options.touchonly = options.touchonly !== undefined? options.touchonly : true; // by default only show it if touch device
+
+			if(options.touchonly === true && !("ontouchend" in document))
+				return $(this);
+				
+			return $(this).each(function(i,obj){
+						var $t = $(this),
+							o = $.extend({},{ 
+											where: 'after',
+											step: $t.slider('option','step'), 
+											upIcon: 'ui-icon-plus', 
+											downIcon: 'ui-icon-minus',
+											text: false,
+											upText: '+',
+											downText: '-',
+											buttonset: true,
+											buttonsetTag: 'span',
+											isRTL: false
+										}, options),
+							$buttons = $('<'+ o.buttonsetTag +' class="ui-slider-access">'+
+											'<button data-icon="'+ o.downIcon +'" data-step="'+ (o.isRTL? o.step : o.step*-1) +'">'+ o.downText +'</button>'+
+											'<button data-icon="'+ o.upIcon +'" data-step="'+ (o.isRTL? o.step*-1 : o.step) +'">'+ o.upText +'</button>'+
+										'</'+ o.buttonsetTag +'>');
+
+						$buttons.children('button').each(function(j, jobj){
+							var $jt = $(this);
+							$jt.button({ 
+											text: o.text, 
+											icons: { primary: $jt.data('icon') }
+										})
+								.click(function(e){
+											var step = $jt.data('step'),
+												curr = $t.slider('value'),
+												newval = curr += step*1,
+												minval = $t.slider('option','min'),
+												maxval = $t.slider('option','max'),
+												slidee = $t.slider("option", "slide") || function(){},
+												stope = $t.slider("option", "stop") || function(){};
+
+											e.preventDefault();
+											
+											if(newval < minval || newval > maxval)
+												return;
+											
+											$t.slider('value', newval);
+
+											slidee.call($t, null, { value: newval });
+											stope.call($t, null, { value: newval });
+										});
+						});
+						
+						// before or after					
+						$t[o.where]($buttons);
+
+						if(o.buttonset){
+							$buttons.removeClass('ui-corner-right').removeClass('ui-corner-left').buttonset();
+							$buttons.eq(0).addClass('ui-corner-left');
+							$buttons.eq(1).addClass('ui-corner-right');
+						}
+
+						// adjust the width so we don't break the original layout
+						var bOuterWidth = $buttons.css({
+									marginLeft: ((o.where == 'after' && !o.isRTL) || (o.where == 'before' && o.isRTL)? 10:0), 
+									marginRight: ((o.where == 'before' && !o.isRTL) || (o.where == 'after' && o.isRTL)? 10:0)
+								}).outerWidth(true) + 5;
+						var tOuterWidth = $t.outerWidth(true);
+						$t.css('display','inline-block').width(tOuterWidth-bOuterWidth);
+					});		
+		}
+	});
+
+})(jQuery);
\ No newline at end of file
diff --git a/addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js b/addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js
index 84888dbaaec..1bc8d53b740 100644
--- a/addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js
+++ b/addons/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js
@@ -1,1326 +1,1902 @@
 /*
-* jQuery timepicker addon
-* By: Trent Richardson [http://trentrichardson.com]
-* Version 0.9.9
-* Last Modified: 02/05/2012
-* 
-* Copyright 2012 Trent Richardson
-* Dual licensed under the MIT and GPL licenses.
-* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
-* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
-* 
-* HERES THE CSS:
-* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-* .ui-timepicker-div dl { text-align: left; }
-* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
-* .ui-timepicker-div td { font-size: 90%; }
-* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-*/
+ * jQuery timepicker addon
+ * By: Trent Richardson [http://trentrichardson.com]
+ * Version 1.1.2
+ * Last Modified: 01/19/2013
+ *
+ * Copyright 2012 Trent Richardson
+ * You may use this project under MIT or GPL licenses.
+ * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+ * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+ */
+
+/*jslint evil: true, white: false, undef: false, nomen: false */
 
 (function($) {
 
-$.extend($.ui, { timepicker: { version: "0.9.9" } });
+	/*
+	* Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+	*/
+	$.ui.timepicker = $.ui.timepicker || {};
+	if ($.ui.timepicker.version) {
+		return;
+	}
 
-/* Time picker manager.
-   Use the singleton instance of this class, $.timepicker, to interact with the time picker.
-   Settings for (groups of) time pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
+	/*
+	* Extend jQueryUI, get it started with our version number
+	*/
+	$.extend($.ui, {
+		timepicker: {
+			version: "1.1.2"
+		}
+	});
 
-function Timepicker() {
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[''] = { // Default regional settings
-		currentText: 'Now',
-		closeText: 'Done',
-		ampm: false,
-		amNames: ['AM', 'A'],
-		pmNames: ['PM', 'P'],
-		timeFormat: 'hh:mm tt',
-		timeSuffix: '',
-		timeOnlyTitle: 'Choose Time',
-		timeText: 'Time',
-		hourText: 'Hour',
-		minuteText: 'Minute',
-		secondText: 'Second',
-		millisecText: 'Millisecond',
-		timezoneText: 'Time Zone'
-	};
-	this._defaults = { // Global defaults for all the datetime picker instances
-		showButtonPanel: true,
-		timeOnly: false,
-		showHour: true,
-		showMinute: true,
-		showSecond: false,
-		showMillisec: false,
-		showTimezone: false,
-		showTime: true,
-		stepHour: 1,
-		stepMinute: 1,
-		stepSecond: 1,
-		stepMillisec: 1,
+	/* 
+	* Timepicker manager.
+	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+	* Settings for (groups of) time pickers are maintained in an instance object,
+	* allowing multiple different settings on the same page.
+	*/
+	function Timepicker() {
+		this.regional = []; // Available regional settings, indexed by language code
+		this.regional[''] = { // Default regional settings
+			currentText: 'Now',
+			closeText: 'Done',
+			amNames: ['AM', 'A'],
+			pmNames: ['PM', 'P'],
+			timeFormat: 'HH:mm',
+			timeSuffix: '',
+			timeOnlyTitle: 'Choose Time',
+			timeText: 'Time',
+			hourText: 'Hour',
+			minuteText: 'Minute',
+			secondText: 'Second',
+			millisecText: 'Millisecond',
+			timezoneText: 'Time Zone',
+			isRTL: false
+		};
+		this._defaults = { // Global defaults for all the datetime picker instances
+			showButtonPanel: true,
+			timeOnly: false,
+			showHour: true,
+			showMinute: true,
+			showSecond: false,
+			showMillisec: false,
+			showTimezone: false,
+			showTime: true,
+			stepHour: 1,
+			stepMinute: 1,
+			stepSecond: 1,
+			stepMillisec: 1,
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			timezone: null,
+			useLocalTimezone: false,
+			defaultTimezone: "+0000",
+			hourMin: 0,
+			minuteMin: 0,
+			secondMin: 0,
+			millisecMin: 0,
+			hourMax: 23,
+			minuteMax: 59,
+			secondMax: 59,
+			millisecMax: 999,
+			minDateTime: null,
+			maxDateTime: null,
+			onSelect: null,
+			hourGrid: 0,
+			minuteGrid: 0,
+			secondGrid: 0,
+			millisecGrid: 0,
+			alwaysSetTime: true,
+			separator: ' ',
+			altFieldTimeOnly: true,
+			altTimeFormat: null,
+			altSeparator: null,
+			altTimeSuffix: null,
+			pickerTimeFormat: null,
+			pickerTimeSuffix: null,
+			showTimepicker: true,
+			timezoneIso8601: false,
+			timezoneList: null,
+			addSliderAccess: false,
+			sliderAccessArgs: null,
+			controlType: 'slider',
+			defaultValue: null,
+			parse: 'strict'
+		};
+		$.extend(this._defaults, this.regional['']);
+	}
+
+	$.extend(Timepicker.prototype, {
+		$input: null,
+		$altInput: null,
+		$timeObj: null,
+		inst: null,
+		hour_slider: null,
+		minute_slider: null,
+		second_slider: null,
+		millisec_slider: null,
+		timezone_select: null,
 		hour: 0,
 		minute: 0,
 		second: 0,
 		millisec: 0,
-		timezone: '+0000',
-		hourMin: 0,
-		minuteMin: 0,
-		secondMin: 0,
-		millisecMin: 0,
-		hourMax: 23,
-		minuteMax: 59,
-		secondMax: 59,
-		millisecMax: 999,
-		minDateTime: null,
-		maxDateTime: null,
-		onSelect: null,
-		hourGrid: 0,
-		minuteGrid: 0,
-		secondGrid: 0,
-		millisecGrid: 0,
-		alwaysSetTime: true,
-		separator: ' ',
-		altFieldTimeOnly: true,
-		showTimepicker: true,
-		timezoneIso8609: false,
+		timezone: null,
+		defaultTimezone: "+0000",
+		hourMinOriginal: null,
+		minuteMinOriginal: null,
+		secondMinOriginal: null,
+		millisecMinOriginal: null,
+		hourMaxOriginal: null,
+		minuteMaxOriginal: null,
+		secondMaxOriginal: null,
+		millisecMaxOriginal: null,
+		ampm: '',
+		formattedDate: '',
+		formattedTime: '',
+		formattedDateTime: '',
 		timezoneList: null,
-		addSliderAccess: false,
-		sliderAccessArgs: null
-	};
-	$.extend(this._defaults, this.regional['']);
-};
+		units: ['hour','minute','second','millisec'],
+		control: null,
 
-$.extend(Timepicker.prototype, {
-	$input: null,
-	$altInput: null,
-	$timeObj: null,
-	inst: null,
-	hour_slider: null,
-	minute_slider: null,
-	second_slider: null,
-	millisec_slider: null,
-	timezone_select: null,
-	hour: 0,
-	minute: 0,
-	second: 0,
-	millisec: 0,
-	timezone: '+0000',
-	hourMinOriginal: null,
-	minuteMinOriginal: null,
-	secondMinOriginal: null,
-	millisecMinOriginal: null,
-	hourMaxOriginal: null,
-	minuteMaxOriginal: null,
-	secondMaxOriginal: null,
-	millisecMaxOriginal: null,
-	ampm: '',
-	formattedDate: '',
-	formattedTime: '',
-	formattedDateTime: '',
-	timezoneList: null,
+		/* 
+		* Override the default settings for all instances of the time picker.
+		* @param  settings  object - the new settings to use as defaults (anonymous object)
+		* @return the manager object
+		*/
+		setDefaults: function(settings) {
+			extendRemove(this._defaults, settings || {});
+			return this;
+		},
 
-	/* Override the default settings for all instances of the time picker.
-	   @param  settings  object - the new settings to use as defaults (anonymous object)
-	   @return the manager object */
-	setDefaults: function(settings) {
-		extendRemove(this._defaults, settings || {});
-		return this;
-	},
+		/*
+		* Create a new Timepicker instance
+		*/
+		_newInst: function($input, o) {
+			var tp_inst = new Timepicker(),
+				inlineSettings = {},
+                fns = {},
+		        overrides, i;
 
-	//########################################################################
-	// Create a new Timepicker instance
-	//########################################################################
-	_newInst: function($input, o) {
-		var tp_inst = new Timepicker(),
-			inlineSettings = {};
-			
-		for (var attrName in this._defaults) {
-			var attrValue = $input.attr('time:' + attrName);
-			if (attrValue) {
-				try {
-					inlineSettings[attrName] = eval(attrValue);
-				} catch (err) {
-					inlineSettings[attrName] = attrValue;
-				}
-			}
-		}
-		tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
-			beforeShow: function(input, dp_inst) {
-				if ($.isFunction(o.beforeShow))
-					return o.beforeShow(input, dp_inst, tp_inst);
-			},
-			onChangeMonthYear: function(year, month, dp_inst) {
-				// Update the time as well : this prevents the time from disappearing from the $input field.
-				tp_inst._updateDateTime(dp_inst);
-				if ($.isFunction(o.onChangeMonthYear))
-					o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
-			},
-			onClose: function(dateText, dp_inst) {
-				if (tp_inst.timeDefined === true && $input.val() != '')
-					tp_inst._updateDateTime(dp_inst);
-				if ($.isFunction(o.onClose))
-					o.onClose.call($input[0], dateText, dp_inst, tp_inst);
-			},
-			timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
-		});
-		tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase() });
-		tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase() });
-
-		if (tp_inst._defaults.timezoneList === null) {
-			var timezoneList = [];
-			for (var i = -11; i <= 12; i++)
-				timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
-			if (tp_inst._defaults.timezoneIso8609)
-				timezoneList = $.map(timezoneList, function(val) {
-					return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
-				});
-			tp_inst._defaults.timezoneList = timezoneList;
-		}
-
-		tp_inst.hour = tp_inst._defaults.hour;
-		tp_inst.minute = tp_inst._defaults.minute;
-		tp_inst.second = tp_inst._defaults.second;
-		tp_inst.millisec = tp_inst._defaults.millisec;
-		tp_inst.ampm = '';
-		tp_inst.$input = $input;
-
-		if (o.altField)
-			tp_inst.$altInput = $(o.altField)
-				.css({ cursor: 'pointer' })
-				.focus(function(){ $input.trigger("focus"); });
-		
-		if(tp_inst._defaults.minDate==0 || tp_inst._defaults.minDateTime==0)
-		{
-			tp_inst._defaults.minDate=new Date();
-		}
-		if(tp_inst._defaults.maxDate==0 || tp_inst._defaults.maxDateTime==0)
-		{
-			tp_inst._defaults.maxDate=new Date();
-		}
-		
-		// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
-		if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
-			tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
-		if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date)
-			tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
-		if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date)
-			tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
-		if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date)
-			tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
-		return tp_inst;
-	},
-
-	//########################################################################
-	// add our sliders to the calendar
-	//########################################################################
-	_addTimePicker: function(dp_inst) {
-		var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
-				this.$input.val() + ' ' + this.$altInput.val() : 
-				this.$input.val();
-
-		this.timeDefined = this._parseTime(currDT);
-		this._limitMinMaxDateTime(dp_inst, false);
-		this._injectTimePicker();
-	},
-
-	//########################################################################
-	// parse the time string from input value or _setTime
-	//########################################################################
-	_parseTime: function(timeString, withDate) {
-		var regstr = this._defaults.timeFormat.toString()
-				.replace(/h{1,2}/ig, '(\\d?\\d)')
-				.replace(/m{1,2}/ig, '(\\d?\\d)')
-				.replace(/s{1,2}/ig, '(\\d?\\d)')
-				.replace(/l{1}/ig, '(\\d?\\d?\\d)')
-				.replace(/t{1,2}/ig, this._getPatternAmpm())
-				.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
-				.replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$',
-			order = this._getFormatPositions(),
-			ampm = '',
-			treg;
-
-		if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
-
-		if (withDate || !this._defaults.timeOnly) {
-			// the time should come after x number of characters and a space.
-			// x = at least the length of text specified by the date format
-			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
-			// escape special regex characters in the seperator
-			var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
-			regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;
-		}
-		
-		treg = timeString.match(new RegExp(regstr, 'i'));
-
-		if (treg) {
-			if (order.t !== -1) {
-				if (treg[order.t] === undefined || treg[order.t].length === 0) {
-					ampm = '';
-					this.ampm = '';
-				} else {
-					ampm = $.inArray(treg[order.t].toUpperCase(), this.amNames) !== -1 ? 'AM' : 'PM';
-					this.ampm = this._defaults[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
-				}
-			}
-
-			if (order.h !== -1) {
-				if (ampm == 'AM' && treg[order.h] == '12')
-					this.hour = 0; // 12am = 0 hour
-				else if (ampm == 'PM' && treg[order.h] != '12')
-					this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12
-				else this.hour = Number(treg[order.h]);
-			}
-
-			if (order.m !== -1) this.minute = Number(treg[order.m]);
-			if (order.s !== -1) this.second = Number(treg[order.s]);
-			if (order.l !== -1) this.millisec = Number(treg[order.l]);
-			if (order.z !== -1 && treg[order.z] !== undefined) {
-				var tz = treg[order.z].toUpperCase();
-				switch (tz.length) {
-				case 1:	// Z
-					tz = this._defaults.timezoneIso8609 ? 'Z' : '+0000';
-					break;
-				case 5:	// +hhmm
-					if (this._defaults.timezoneIso8609)
-						tz = tz.substring(1) == '0000'
-						   ? 'Z'
-						   : tz.substring(0, 3) + ':' + tz.substring(3);
-					break;
-				case 6:	// +hh:mm
-					if (!this._defaults.timezoneIso8609)
-						tz = tz == 'Z' || tz.substring(1) == '00:00'
-						   ? '+0000'
-						   : tz.replace(/:/, '');
-					else if (tz.substring(1) == '00:00')
-						tz = 'Z';
-					break;
-				}
-				this.timezone = tz;
-			}
-			
-			return true;
-
-		}
-		return false;
-	},
-
-	//########################################################################
-	// pattern for standard and localized AM/PM markers
-	//########################################################################
-	_getPatternAmpm: function() {
-		var markers = [];
-			o = this._defaults;
-		if (o.amNames)
-			$.merge(markers, o.amNames);
-		if (o.pmNames)
-			$.merge(markers, o.pmNames);
-		markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&') });
-		return '(' + markers.join('|') + ')?';
-	},
-
-	//########################################################################
-	// figure out position of time elements.. cause js cant do named captures
-	//########################################################################
-	_getFormatPositions: function() {
-		var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
-			orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 };
-
-		if (finds)
-			for (var i = 0; i < finds.length; i++)
-				if (orders[finds[i].toString().charAt(0)] == -1)
-					orders[finds[i].toString().charAt(0)] = i + 1;
-
-		return orders;
-	},
-
-	//########################################################################
-	// generate and inject html for timepicker into ui datepicker
-	//########################################################################
-	_injectTimePicker: function() {
-		var $dp = this.inst.dpDiv,
-			o = this._defaults,
-			tp_inst = this,
-			// Added by Peter Medeiros:
-			// - Figure out what the hour/minute/second max should be based on the step values.
-			// - Example: if stepMinute is 15, then minMax is 45.
-			hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
-			minMax  = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
-			secMax  = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
-			millisecMax  = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
-			dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
-
-		// Prevent displaying twice
-		//if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
-		if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
-			var noDisplay = ' style="display:none;"',
-				html =	'<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' +
-						'<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
-						((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
-						'<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' +
-						((o.showTime) ? '' : noDisplay) + '></dd>' +
-						'<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
-						((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
-				hourGridSize = 0,
-				minuteGridSize = 0,
-				secondGridSize = 0,
-				millisecGridSize = 0,
-				size;
-
- 			// Hours
-			html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
-						((o.showHour) ? '' : noDisplay) + '></div>';
-			if (o.showHour && o.hourGrid > 0) {
-				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
-				for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) {
-					hourGridSize++;
-					var tmph = (o.ampm && h > 12) ? h-12 : h;
-					if (tmph < 10) tmph = '0' + tmph;
-					if (o.ampm) {
-						if (h == 0) tmph = 12 +'a';
-						else if (h < 12) tmph += 'a';
-						else tmph += 'p';
+			for (var attrName in this._defaults) {
+				if(this._defaults.hasOwnProperty(attrName)){
+					var attrValue = $input.attr('time:' + attrName);
+					if (attrValue) {
+						try {
+							inlineSettings[attrName] = eval(attrValue);
+						} catch (err) {
+							inlineSettings[attrName] = attrValue;
+						}
 					}
-					html += '<td>' + tmph + '</td>';
 				}
-
-				html += '</tr></table></div>';
 			}
-			html += '</dd>';
+		    overrides = {
+		        beforeShow: function (input, dp_inst) {
+		            if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
+		                return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
+		            }
+		        },
+		        onChangeMonthYear: function (year, month, dp_inst) {
+		            // Update the time as well : this prevents the time from disappearing from the $input field.
+		            tp_inst._updateDateTime(dp_inst);
+		            if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
+		                tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+		            }
+		        },
+		        onClose: function (dateText, dp_inst) {
+		            if (tp_inst.timeDefined === true && $input.val() !== '') {
+		                tp_inst._updateDateTime(dp_inst);
+		            }
+		            if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
+		                tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
+		            }
+		        }
+		    };
+		    for (i in overrides) {
+		        if (overrides.hasOwnProperty(i)) {
+		            fns[i] = o[i] || null;
+		        }
+		    }
+		    tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, overrides, {
+		        evnts:fns,
+		        timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+		    });
+			tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) {
+				return val.toUpperCase();
+			});
+			tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) {
+				return val.toUpperCase();
+			});
 
-			// Minutes
-			html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
-					((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
-					'<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
-							((o.showMinute) ? '' : noDisplay) + '></div>';
-
-			if (o.showMinute && o.minuteGrid > 0) {
-				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
-				for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
-					minuteGridSize++;
-					html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
+			// controlType is string - key to our this._controls
+			if(typeof(tp_inst._defaults.controlType) === 'string'){
+				if($.fn[tp_inst._defaults.controlType] === undefined){
+					tp_inst._defaults.controlType = 'select';
 				}
-
-				html += '</tr></table></div>';
+				tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
+			}
+			// controlType is an object and must implement create, options, value methods
+			else{ 
+				tp_inst.control = tp_inst._defaults.controlType;
 			}
-			html += '</dd>';
 
-			// Seconds
-			html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
-					((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
-					'<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
-							((o.showSecond) ? '' : noDisplay) + '></div>';
+			if (tp_inst._defaults.timezoneList === null) {
+				var timezoneList = ['-1200', '-1100', '-1000', '-0930', '-0900', '-0800', '-0700', '-0600', '-0500', '-0430', '-0400', '-0330', '-0300', '-0200', '-0100', '+0000', 
+									'+0100', '+0200', '+0300', '+0330', '+0400', '+0430', '+0500', '+0530', '+0545', '+0600', '+0630', '+0700', '+0800', '+0845', '+0900', '+0930', 
+									'+1000', '+1030', '+1100', '+1130', '+1200', '+1245', '+1300', '+1400'];
 
-			if (o.showSecond && o.secondGrid > 0) {
-				html += '<div style="padding-left: 1px"><table><tr>';
-
-				for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
-					secondGridSize++;
-					html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
+				if (tp_inst._defaults.timezoneIso8601) {
+					timezoneList = $.map(timezoneList, function(val) {
+						return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
+					});
 				}
-
-				html += '</tr></table></div>';
+				tp_inst._defaults.timezoneList = timezoneList;
 			}
-			html += '</dd>';
 
-			// Milliseconds
-			html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
-					((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
-					'<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
-							((o.showMillisec) ? '' : noDisplay) + '></div>';
+			tp_inst.timezone = tp_inst._defaults.timezone;
+			tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin? tp_inst._defaults.hourMin : 
+							tp_inst._defaults.hour > tp_inst._defaults.hourMax? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
+			tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin? tp_inst._defaults.minuteMin : 
+							tp_inst._defaults.minute > tp_inst._defaults.minuteMax? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
+			tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin? tp_inst._defaults.secondMin : 
+							tp_inst._defaults.second > tp_inst._defaults.secondMax? tp_inst._defaults.secondMax : tp_inst._defaults.second;
+			tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin? tp_inst._defaults.millisecMin : 
+							tp_inst._defaults.millisec > tp_inst._defaults.millisecMax? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
+			tp_inst.ampm = '';
+			tp_inst.$input = $input;
 
-			if (o.showMillisec && o.millisecGrid > 0) {
-				html += '<div style="padding-left: 1px"><table><tr>';
+			if (o.altField) {
+				tp_inst.$altInput = $(o.altField).css({
+					cursor: 'pointer'
+				}).focus(function() {
+					$input.trigger("focus");
+				});
+			}
 
-				for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
-					millisecGridSize++;
-					html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
+			if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
+				tp_inst._defaults.minDate = new Date();
+			}
+			if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
+				tp_inst._defaults.maxDate = new Date();
+			}
+
+			// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+			if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+				tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+			}
+			if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+				tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+			}
+			if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+				tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+			}
+			if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+				tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+			}
+			tp_inst.$input.bind('focus', function() {
+				tp_inst._onFocus();
+			});
+
+			return tp_inst;
+		},
+
+		/*
+		* add our sliders to the calendar
+		*/
+		_addTimePicker: function(dp_inst) {
+			var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val();
+
+			this.timeDefined = this._parseTime(currDT);
+			this._limitMinMaxDateTime(dp_inst, false);
+			this._injectTimePicker();
+		},
+
+		/*
+		* parse the time string from input value or _setTime
+		*/
+		_parseTime: function(timeString, withDate) {
+			if (!this.inst) {
+				this.inst = $.datepicker._getInst(this.$input[0]);
+			}
+
+			if (withDate || !this._defaults.timeOnly) {
+				var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+				try {
+					var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+					if (!parseRes.timeObj) {
+						return false;
+					}
+					$.extend(this, parseRes.timeObj);
+				} catch (err) {
+					$.datepicker.log("Error parsing the date/time string: " + err +
+									"\ndate/time string = " + timeString +
+									"\ntimeFormat = " + this._defaults.timeFormat +
+									"\ndateFormat = " + dp_dateFormat);
+					return false;
 				}
-
-				html += '</tr></table></div>';
+				return true;
+			} else {
+				var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+				if (!timeObj) {
+					return false;
+				}
+				$.extend(this, timeObj);
+				return true;
 			}
-			html += '</dd>';
+		},
 
-			// Timezone
-			html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
-					((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
-			html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"'	+
-							((o.showTimezone) ? '' : noDisplay) + '></dd>';
+		/*
+		* generate and inject html for timepicker into ui datepicker
+		*/
+		_injectTimePicker: function() {
+			var $dp = this.inst.dpDiv,
+				o = this.inst.settings,
+				tp_inst = this,
+				litem = '',
+				uitem = '',
+				max = {},
+				gridSize = {},
+				size = null;
 
-			html += '</dl></div>';
-			$tp = $(html);
+			// Prevent displaying twice
+			if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
+				var noDisplay = ' style="display:none;"',
+					html = '<div class="ui-timepicker-div'+ (o.isRTL? ' ui-timepicker-rtl' : '') +'"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' + 
+								'<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
+
+				// Create the markup
+				for(var i=0,l=this.units.length; i<l; i++){
+					litem = this.units[i];
+					uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
+					// Added by Peter Medeiros:
+					// - Figure out what the hour/minute/second max should be based on the step values.
+					// - Example: if stepMinute is 15, then minMax is 45.
+					max[litem] = parseInt((o[litem+'Max'] - ((o[litem+'Max'] - o[litem+'Min']) % o['step'+uitem])), 10);
+					gridSize[litem] = 0;
+
+					html += '<dt class="ui_tpicker_'+ litem +'_label"' + ((o['show'+uitem]) ? '' : noDisplay) + '>' + o[litem +'Text'] + '</dt>' + 
+								'<dd class="ui_tpicker_'+ litem +'"><div class="ui_tpicker_'+ litem +'_slider"' + ((o['show'+uitem]) ? '' : noDisplay) + '></div>';
+
+					if (o['show'+uitem] && o[litem+'Grid'] > 0) {
+						html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+						if(litem == 'hour'){
+							for (var h = o[litem+'Min']; h <= max[litem]; h += parseInt(o[litem+'Grid'], 10)) {
+								gridSize[litem]++;
+								var tmph = $.datepicker.formatTime(useAmpm(o.pickerTimeFormat || o.timeFormat)? 'hht':'HH', {hour:h}, o);									
+								html += '<td data-for="'+litem+'">' + tmph + '</td>';
+							}
+						}
+						else{
+							for (var m = o[litem+'Min']; m <= max[litem]; m += parseInt(o[litem+'Grid'], 10)) {
+								gridSize[litem]++;
+								html += '<td data-for="'+litem+'">' + ((m < 10) ? '0' : '') + m + '</td>';
+							}
+						}
+
+						html += '</tr></table></div>';
+					}
+					html += '</dd>';
+				}
+				
+				// Timezone
+				html += '<dt class="ui_tpicker_timezone_label"' + ((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+				html += '<dd class="ui_tpicker_timezone" ' + ((o.showTimezone) ? '' : noDisplay) + '></dd>';
+
+				// Create the elements from string
+				html += '</dl></div>';
+				var $tp = $(html);
 
 				// if we only want time picker...
-			if (o.timeOnly === true) {
-				$tp.prepend(
-					'<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' +
-						'<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
-					'</div>');
-				$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
-			}
-
-			this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.hour,
-				min: o.hourMin,
-				max: hourMax,
-				step: o.stepHour,
-				slide: function(event, ui) {
-					tp_inst.hour_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
+				if (o.timeOnly === true) {
+					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
+					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
 				}
-			});
+				
+				// add sliders, adjust grids, add events
+				for(var i=0,l=tp_inst.units.length; i<l; i++){
+					litem = tp_inst.units[i];
+					uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
 
-			
-			// Updated by Peter Medeiros:
-			// - Pass in Event and UI instance into slide function
-			this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.minute,
-				min: o.minuteMin,
-				max: minMax,
-				step: o.stepMinute,
-				slide: function(event, ui) {
-					tp_inst.minute_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
-				}
-			});
+					// add the slider
+					tp_inst[litem+'_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_'+litem+'_slider'), litem, tp_inst[litem], o[litem+'Min'], max[litem], o['step'+uitem]);
 
-			this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.second,
-				min: o.secondMin,
-				max: secMax,
-				step: o.stepSecond,
-				slide: function(event, ui) {
-					tp_inst.second_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
-				}
-			});
+					// adjust the grid and add click event
+					if (o['show'+uitem] && o[litem+'Grid'] > 0) {
+						size = 100 * gridSize[litem] * o[litem+'Grid'] / (max[litem] - o[litem+'Min']);
+						$tp.find('.ui_tpicker_'+litem+' table').css({
+							width: size + "%",
+							marginLeft: o.isRTL? '0' : ((size / (-2 * gridSize[litem])) + "%"),
+							marginRight: o.isRTL? ((size / (-2 * gridSize[litem])) + "%") : '0',
+							borderCollapse: 'collapse'
+						}).find("td").click(function(e){
+								var $t = $(this),
+									h = $t.html(),
+									n = parseInt(h.replace(/[^0-9]/g),10),
+									ap = h.replace(/[^apm]/ig),
+									f = $t.data('for'); // loses scope, so we use data-for
 
-			this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.millisec,
-				min: o.millisecMin,
-				max: millisecMax,
-				step: o.stepMillisec,
-				slide: function(event, ui) {
-					tp_inst.millisec_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
-				}
-			});
+								if(f == 'hour'){
+									if(ap.indexOf('p') !== -1 && n < 12){
+										n += 12;
+									}
+									else{
+										if(ap.indexOf('a') !== -1 && n === 12){
+											n = 0;
+										}
+									}
+								}
+								
+								tp_inst.control.value(tp_inst, tp_inst[f+'_slider'], litem, n);
 
-			this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
-			$.fn.append.apply(this.timezone_select,
-				$.map(o.timezoneList, function(val, idx) {
-					return $("<option />")
-						.val(typeof val == "object" ? val.value : val)
-						.text(typeof val == "object" ? val.label : val);
-				})
-			);
-			this.timezone_select.val((typeof this.timezone != "undefined" && this.timezone != null && this.timezone != "") ? this.timezone : o.timezone);
-			this.timezone_select.change(function() {
-				tp_inst._onTimeChange();
-			});
-
-			// Add grid functionality
-			if (o.showHour && o.hourGrid > 0) {
-				size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
-
-				$tp.find(".ui_tpicker_hour table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * hourGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each( function(index) {
-					$(this).click(function() {
-						var h = $(this).html();
-						if(o.ampm)	{
-							var ap = h.substring(2).toLowerCase(),
-								aph = parseInt(h.substring(0,2), 10);
-							if (ap == 'a') {
-								if (aph == 12) h = 0;
-								else h = aph;
-							} else if (aph == 12) h = 12;
-							else h = aph + 12;
-						}
-						tp_inst.hour_slider.slider("option", "value", h);
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / hourGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			if (o.showMinute && o.minuteGrid > 0) {
-				size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
-				$tp.find(".ui_tpicker_minute table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * minuteGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each(function(index) {
-					$(this).click(function() {
-						tp_inst.minute_slider.slider("option", "value", $(this).html());
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / minuteGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			if (o.showSecond && o.secondGrid > 0) {
-				$tp.find(".ui_tpicker_second table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * secondGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each(function(index) {
-					$(this).click(function() {
-						tp_inst.second_slider.slider("option", "value", $(this).html());
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / secondGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			if (o.showMillisec && o.millisecGrid > 0) {
-				$tp.find(".ui_tpicker_millisec table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * millisecGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each(function(index) {
-					$(this).click(function() {
-						tp_inst.millisec_slider.slider("option", "value", $(this).html());
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / millisecGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
-			if ($buttonPanel.length) $buttonPanel.before($tp);
-			else $dp.append($tp);
-
-			this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
-
-			if (this.inst !== null) {
-				var timeDefined = this.timeDefined;
-				this._onTimeChange();
-				this.timeDefined = timeDefined;
-			}
-
-			//Emulate datepicker onSelect behavior. Call on slidestop.
-			var onSelectDelegate = function() {
-				tp_inst._onSelectHandler();
-			};
-			this.hour_slider.bind('slidestop',onSelectDelegate);
-			this.minute_slider.bind('slidestop',onSelectDelegate);
-			this.second_slider.bind('slidestop',onSelectDelegate);
-			this.millisec_slider.bind('slidestop',onSelectDelegate);
-			
-			// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
-			if (this._defaults.addSliderAccess){
-				var sliderAccessArgs = this._defaults.sliderAccessArgs;
-				setTimeout(function(){ // fix for inline mode
-					if($tp.find('.ui-slider-access').length == 0){
-						$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
-
-						// fix any grids since sliders are shorter
-						var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
-						if(sliderAccessWidth){
-							$tp.find('table:visible').each(function(){
-								var $g = $(this),
-									oldWidth = $g.outerWidth(),
-									oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
-									newWidth = oldWidth - sliderAccessWidth,
-									newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
-						
-								$g.css({ width: newWidth, marginLeft: newMarginLeft });
+								tp_inst._onTimeChange();
+								tp_inst._onSelectHandler();
+							})
+						.css({
+								cursor: 'pointer',
+								width: (100 / gridSize[litem]) + '%',
+								textAlign: 'center',
+								overflow: 'hidden'
 							});
-						}
-					}
-				},0);
-			}
-			// end slideAccess integration
-			
-		}
-	},
+					} // end if grid > 0
+				} // end for loop
 
-	//########################################################################
-	// This function tries to limit the ability to go outside the
-	// min/max date range
-	//########################################################################
-	_limitMinMaxDateTime: function(dp_inst, adjustSliders){
-		var o = this._defaults,
-			dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
-
-		if(!this._defaults.showTimepicker) return; // No time so nothing to check here
-
-		if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
-			var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
-				minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
-
-			if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){
-				this.hourMinOriginal = o.hourMin;
-				this.minuteMinOriginal = o.minuteMin;
-				this.secondMinOriginal = o.secondMin;
-				this.millisecMinOriginal = o.millisecMin;
-			}
-
-			if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
-				this._defaults.hourMin = minDateTime.getHours();
-				if (this.hour <= this._defaults.hourMin) {
-					this.hour = this._defaults.hourMin;
-					this._defaults.minuteMin = minDateTime.getMinutes();
-					if (this.minute <= this._defaults.minuteMin) {
-						this.minute = this._defaults.minuteMin;
-						this._defaults.secondMin = minDateTime.getSeconds();
-					} else if (this.second <= this._defaults.secondMin){
-						this.second = this._defaults.secondMin;
-						this._defaults.millisecMin = minDateTime.getMilliseconds();
+				// Add timezone options
+				this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
+				$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function(val, idx) {
+					return $("<option />").val(typeof val == "object" ? val.value : val).text(typeof val == "object" ? val.label : val);
+				}));
+				if (typeof(this.timezone) != "undefined" && this.timezone !== null && this.timezone !== "") {
+					var local_date = new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12);
+					var local_timezone = $.timepicker.timeZoneOffsetString(local_date);
+					if (local_timezone == this.timezone) {
+						selectLocalTimeZone(tp_inst);
 					} else {
-						if(this.millisec < this._defaults.millisecMin)
-							this.millisec = this._defaults.millisecMin;
+						this.timezone_select.val(this.timezone);
+					}
+				} else {
+					if (typeof(this.hour) != "undefined" && this.hour !== null && this.hour !== "") {
+						this.timezone_select.val(o.defaultTimezone);
+					} else {
+						selectLocalTimeZone(tp_inst);
+					}
+				}
+				this.timezone_select.change(function() {
+					tp_inst._defaults.useLocalTimezone = false;
+					tp_inst._onTimeChange();
+					tp_inst._onSelectHandler();
+				});
+				// End timezone options
+				
+				// inject timepicker into datepicker
+				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+				if ($buttonPanel.length) {
+					$buttonPanel.before($tp);
+				} else {
+					$dp.append($tp);
+				}
+
+				this.$timeObj = $tp.find('.ui_tpicker_time');
+
+				if (this.inst !== null) {
+					var timeDefined = this.timeDefined;
+					this._onTimeChange();
+					this.timeDefined = timeDefined;
+				}
+
+				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+				if (this._defaults.addSliderAccess) {
+					var sliderAccessArgs = this._defaults.sliderAccessArgs,
+						rtl = this._defaults.isRTL;
+					sliderAccessArgs.isRTL = rtl;
+						
+					setTimeout(function() { // fix for inline mode
+						if ($tp.find('.ui-slider-access').length === 0) {
+							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+							// fix any grids since sliders are shorter
+							var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+							if (sliderAccessWidth) {
+								$tp.find('table:visible').each(function() {
+									var $g = $(this),
+										oldWidth = $g.outerWidth(),
+										oldMarginLeft = $g.css(rtl? 'marginRight':'marginLeft').toString().replace('%', ''),
+										newWidth = oldWidth - sliderAccessWidth,
+										newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
+										css = { width: newWidth, marginRight: 0, marginLeft: 0 };
+									css[rtl? 'marginRight':'marginLeft'] = newMarginLeft;
+									$g.css(css);
+								});
+							}
+						}
+					}, 10);
+				}
+				// end slideAccess integration
+
+			}
+		},
+
+		/*
+		* This function tries to limit the ability to go outside the
+		* min/max date range
+		*/
+		_limitMinMaxDateTime: function(dp_inst, adjustSliders) {
+			var o = this._defaults,
+				dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+			if (!this._defaults.showTimepicker) {
+				return;
+			} // No time so nothing to check here
+
+			if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
+				var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+					minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null) {
+					this.hourMinOriginal = o.hourMin;
+					this.minuteMinOriginal = o.minuteMin;
+					this.secondMinOriginal = o.secondMin;
+					this.millisecMinOriginal = o.millisecMin;
+				}
+
+				if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+					this._defaults.hourMin = minDateTime.getHours();
+					if (this.hour <= this._defaults.hourMin) {
+						this.hour = this._defaults.hourMin;
+						this._defaults.minuteMin = minDateTime.getMinutes();
+						if (this.minute <= this._defaults.minuteMin) {
+							this.minute = this._defaults.minuteMin;
+							this._defaults.secondMin = minDateTime.getSeconds();
+							if (this.second <= this._defaults.secondMin) {
+								this.second = this._defaults.secondMin;
+								this._defaults.millisecMin = minDateTime.getMilliseconds();
+							} else {
+								if (this.millisec < this._defaults.millisecMin) {
+									this.millisec = this._defaults.millisecMin;
+								}
+								this._defaults.millisecMin = this.millisecMinOriginal;
+							}
+						} else {
+							this._defaults.secondMin = this.secondMinOriginal;
+							this._defaults.millisecMin = this.millisecMinOriginal;
+						}
+					} else {
+						this._defaults.minuteMin = this.minuteMinOriginal;
+						this._defaults.secondMin = this.secondMinOriginal;
 						this._defaults.millisecMin = this.millisecMinOriginal;
 					}
 				} else {
+					this._defaults.hourMin = this.hourMinOriginal;
 					this._defaults.minuteMin = this.minuteMinOriginal;
 					this._defaults.secondMin = this.secondMinOriginal;
 					this._defaults.millisecMin = this.millisecMinOriginal;
 				}
-			}else{
-				this._defaults.hourMin = this.hourMinOriginal;
-				this._defaults.minuteMin = this.minuteMinOriginal;
-				this._defaults.secondMin = this.secondMinOriginal;
-				this._defaults.millisecMin = this.millisecMinOriginal;
-			}
-		}
-
-		if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
-			var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
-				maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
-
-			if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
-				this.hourMaxOriginal = o.hourMax;
-				this.minuteMaxOriginal = o.minuteMax;
-				this.secondMaxOriginal = o.secondMax;
-				this.millisecMaxOriginal = o.millisecMax;
 			}
 
-			if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
-				this._defaults.hourMax = maxDateTime.getHours();
-				if (this.hour >= this._defaults.hourMax) {
-					this.hour = this._defaults.hourMax;
-					this._defaults.minuteMax = maxDateTime.getMinutes();
-					if (this.minute >= this._defaults.minuteMax) {
-						this.minute = this._defaults.minuteMax;
-						this._defaults.secondMax = maxDateTime.getSeconds();
-					} else if (this.second >= this._defaults.secondMax) {
-						this.second = this._defaults.secondMax;
-						this._defaults.millisecMax = maxDateTime.getMilliseconds();
+			if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
+				var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+					maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null) {
+					this.hourMaxOriginal = o.hourMax;
+					this.minuteMaxOriginal = o.minuteMax;
+					this.secondMaxOriginal = o.secondMax;
+					this.millisecMaxOriginal = o.millisecMax;
+				}
+
+				if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()) {
+					this._defaults.hourMax = maxDateTime.getHours();
+					if (this.hour >= this._defaults.hourMax) {
+						this.hour = this._defaults.hourMax;
+						this._defaults.minuteMax = maxDateTime.getMinutes();
+						if (this.minute >= this._defaults.minuteMax) {
+							this.minute = this._defaults.minuteMax;
+							this._defaults.secondMax = maxDateTime.getSeconds();
+							if (this.second >= this._defaults.secondMax) {
+								this.second = this._defaults.secondMax;
+								this._defaults.millisecMax = maxDateTime.getMilliseconds();
+							} else {
+								if (this.millisec > this._defaults.millisecMax) {
+									this.millisec = this._defaults.millisecMax;
+								}
+								this._defaults.millisecMax = this.millisecMaxOriginal;
+							}
+						} else {
+							this._defaults.secondMax = this.secondMaxOriginal;
+							this._defaults.millisecMax = this.millisecMaxOriginal;
+						}
 					} else {
-						if(this.millisec > this._defaults.millisecMax) this.millisec = this._defaults.millisecMax;
+						this._defaults.minuteMax = this.minuteMaxOriginal;
+						this._defaults.secondMax = this.secondMaxOriginal;
 						this._defaults.millisecMax = this.millisecMaxOriginal;
 					}
 				} else {
+					this._defaults.hourMax = this.hourMaxOriginal;
 					this._defaults.minuteMax = this.minuteMaxOriginal;
 					this._defaults.secondMax = this.secondMaxOriginal;
 					this._defaults.millisecMax = this.millisecMaxOriginal;
 				}
-			}else{
-				this._defaults.hourMax = this.hourMaxOriginal;
-				this._defaults.minuteMax = this.minuteMaxOriginal;
-				this._defaults.secondMax = this.secondMaxOriginal;
-				this._defaults.millisecMax = this.millisecMaxOriginal;
 			}
-		}
 
-		if(adjustSliders !== undefined && adjustSliders === true){
-			var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
-                minMax  = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
-                secMax  = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
-				millisecMax  = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
+			if (adjustSliders !== undefined && adjustSliders === true) {
+				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
+					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
+					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
+					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10);
 
-			if(this.hour_slider)
-				this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
-			if(this.minute_slider)
-				this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
-			if(this.second_slider)
-				this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
-			if(this.millisec_slider)
-				this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec);
-		}
+				if (this.hour_slider) {
+					this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax });
+					this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
+				}
+				if (this.minute_slider) {
+					this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax });
+					this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
+				}
+				if (this.second_slider) {
+					this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax });
+					this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
+				}
+				if (this.millisec_slider) {
+					this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax });
+					this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
+				}
+			}
 
-	},
+		},
 
-	
-	//########################################################################
-	// when a slider moves, set the internal time...
-	// on time change is also called when the time is updated in the text field
-	//########################################################################
-	_onTimeChange: function() {
-		var hour   = (this.hour_slider) ? this.hour_slider.slider('value') : false,
-			minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
-			second = (this.second_slider) ? this.second_slider.slider('value') : false,
-			millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
-			timezone = (this.timezone_select) ? this.timezone_select.val() : false,
-			o = this._defaults;
+		/*
+		* when a slider moves, set the internal time...
+		* on time change is also called when the time is updated in the text field
+		*/
+		_onTimeChange: function() {
+			var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
+				minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
+				second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
+				millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
+				timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+				o = this._defaults,
+				pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
+				pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
 
-		if (typeof(hour) == 'object') hour = false;
-		if (typeof(minute) == 'object') minute = false;
-		if (typeof(second) == 'object') second = false;
-		if (typeof(millisec) == 'object') millisec = false;
-		if (typeof(timezone) == 'object') timezone = false;
+			if (typeof(hour) == 'object') {
+				hour = false;
+			}
+			if (typeof(minute) == 'object') {
+				minute = false;
+			}
+			if (typeof(second) == 'object') {
+				second = false;
+			}
+			if (typeof(millisec) == 'object') {
+				millisec = false;
+			}
+			if (typeof(timezone) == 'object') {
+				timezone = false;
+			}
 
-		if (hour !== false) hour = parseInt(hour,10);
-		if (minute !== false) minute = parseInt(minute,10);
-		if (second !== false) second = parseInt(second,10);
-		if (millisec !== false) millisec = parseInt(millisec,10);
+			if (hour !== false) {
+				hour = parseInt(hour, 10);
+			}
+			if (minute !== false) {
+				minute = parseInt(minute, 10);
+			}
+			if (second !== false) {
+				second = parseInt(second, 10);
+			}
+			if (millisec !== false) {
+				millisec = parseInt(millisec, 10);
+			}
 
-		var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
 
-		// If the update was done in the input field, the input field should not be updated.
-		// If the update was done using the sliders, update the input field.
-		var hasChanged = (hour != this.hour || minute != this.minute
-				|| second != this.second || millisec != this.millisec
-				|| (this.ampm.length > 0
-				    && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1))
-				|| timezone != this.timezone);
-		
-		if (hasChanged) {
+			// If the update was done in the input field, the input field should not be updated.
+			// If the update was done using the sliders, update the input field.
+			var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || millisec != this.millisec 
+								|| (this.ampm.length > 0 && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) 
+								|| ((this.timezone === null && timezone != this.defaultTimezone) || (this.timezone !== null && timezone != this.timezone)));
 
-			if (hour !== false)this.hour = hour;
-			if (minute !== false) this.minute = minute;
-			if (second !== false) this.second = second;
-			if (millisec !== false) this.millisec = millisec;
-			if (timezone !== false) this.timezone = timezone;
-			
-			if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
-			
-			this._limitMinMaxDateTime(this.inst, true);
-		}
-		if (o.ampm) this.ampm = ampm;
-		
-		//this._formatTime();
-		this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
-		if (this.$timeObj) this.$timeObj.text(this.formattedTime + o.timeSuffix);
-		this.timeDefined = true;
-		if (hasChanged) this._updateDateTime();
-	},
-    
-	//########################################################################
-	// call custom onSelect. 
-	// bind to sliders slidestop, and grid click.
-	//########################################################################
-	_onSelectHandler: function() {
-		var onSelect = this._defaults.onSelect;
-		var inputEl = this.$input ? this.$input[0] : null;
-		if (onSelect && inputEl) {
-			onSelect.apply(inputEl, [this.formattedDateTime, this]);
-		}
-	},
+			if (hasChanged) {
 
-	//########################################################################
-	// left for any backwards compatibility
-	//########################################################################
-	_formatTime: function(time, format) {
-		time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone };
-		var tmptime = (format || this._defaults.timeFormat).toString();
+				if (hour !== false) {
+					this.hour = hour;
+				}
+				if (minute !== false) {
+					this.minute = minute;
+				}
+				if (second !== false) {
+					this.second = second;
+				}
+				if (millisec !== false) {
+					this.millisec = millisec;
+				}
+				if (timezone !== false) {
+					this.timezone = timezone;
+				}
 
-		tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
-		
-		if (arguments.length) return tmptime;
-		else this.formattedTime = tmptime;
-	},
+				if (!this.inst) {
+					this.inst = $.datepicker._getInst(this.$input[0]);
+				}
 
-	//########################################################################
-	// update our input with the new date time..
-	//########################################################################
-	_updateDateTime: function(dp_inst) {
-		dp_inst = this.inst || dp_inst;
-		var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
-			dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
-			formatCfg = $.datepicker._getFormatConfig(dp_inst),
-			timeAvailable = dt !== null && this.timeDefined;
-		this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
-		var formattedDateTime = this.formattedDate;
-		if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
-			return;
+				this._limitMinMaxDateTime(this.inst, true);
+			}
+			if (useAmpm(o.timeFormat)) {
+				this.ampm = ampm;
+			}
 
-		if (this._defaults.timeOnly === true) {
-			formattedDateTime = this.formattedTime;
-		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
-			formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
-		}
+			// Updates the time within the timepicker
+			this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
+			if (this.$timeObj) {
+				if(pickerTimeFormat === o.timeFormat){
+					this.$timeObj.text(this.formattedTime + pickerTimeSuffix);
+				}
+				else{
+					this.$timeObj.text($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
+				}
+			}
 
-		this.formattedDateTime = formattedDateTime;
+			this.timeDefined = true;
+			if (hasChanged) {
+				this._updateDateTime();
+			}
+		},
 
-		if(!this._defaults.showTimepicker) {
-			this.$input.val(this.formattedDate);
-		} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
-			this.$altInput.val(this.formattedTime);
-			this.$input.val(this.formattedDate);
-		} else if(this.$altInput) {
-			this.$altInput.val(formattedDateTime);
-			this.$input.val(formattedDateTime);
-		} else {
-			this.$input.val(formattedDateTime);
-		}
-		
-		this.$input.trigger("change");
-	}
+		/*
+		* call custom onSelect.
+		* bind to sliders slidestop, and grid click.
+		*/
+		_onSelectHandler: function() {
+			var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
+			var inputEl = this.$input ? this.$input[0] : null;
+			if (onSelect && inputEl) {
+				onSelect.apply(inputEl, [this.formattedDateTime, this]);
+			}
+		},
 
-});
+		/*
+		* update our input with the new date time..
+		*/
+		_updateDateTime: function(dp_inst) {
+			dp_inst = this.inst || dp_inst;
+			var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+				formatCfg = $.datepicker._getFormatConfig(dp_inst),
+				timeAvailable = dt !== null && this.timeDefined;
+			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+			var formattedDateTime = this.formattedDate;
 
-$.fn.extend({
-	//########################################################################
-	// shorthand just to use timepicker..
-	//########################################################################
-	timepicker: function(o) {
-		o = o || {};
-		var tmp_args = arguments;
+			/*
+			* remove following lines to force every changes in date picker to change the input value
+			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
+			* If the user manually empty the value in the input field, the date picker will never change selected value.
+			*/
+			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+			//	return;
+			//}
 
-		if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true });
+			if (this._defaults.timeOnly === true) {
+				formattedDateTime = this.formattedTime;
+			} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+				formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+			}
 
-		return $(this).each(function() {
-			$.fn.datetimepicker.apply($(this), tmp_args);
-		});
-	},
+			this.formattedDateTime = formattedDateTime;
 
-	//########################################################################
-	// extend timepicker to datepicker
-	//########################################################################
-	datetimepicker: function(o) {
-		o = o || {};
-		var $input = this,
-		tmp_args = arguments;
+			if (!this._defaults.showTimepicker) {
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+				this.$altInput.val(this.formattedTime);
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput) {
+				this.$input.val(formattedDateTime);
+				var altFormattedDateTime = '',
+					altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
+					altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
 
-		if (typeof(o) == 'string'){
-			if(o == 'getDate' || o == 'widget')
-				return $.fn.datepicker.apply($(this[0]), tmp_args);
-			else 
+				if (this._defaults.altFormat) altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
+				else altFormattedDateTime = this.formattedDate;
+				if (altFormattedDateTime) altFormattedDateTime += altSeparator;
+				if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
+				else altFormattedDateTime += this.formattedTime + altTimeSuffix;
+				this.$altInput.val(altFormattedDateTime);
+			} else {
+				this.$input.val(formattedDateTime);
+			}
+
+			this.$input.trigger("change");
+		},
+
+		_onFocus: function() {
+			if (!this.$input.val() && this._defaults.defaultValue) {
+				this.$input.val(this._defaults.defaultValue);
+				var inst = $.datepicker._getInst(this.$input.get(0)),
+					tp_inst = $.datepicker._get(inst, 'timepicker');
+				if (tp_inst) {
+					if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+						try {
+							$.datepicker._updateDatepicker(inst);
+						} catch (err) {
+							$.datepicker.log(err);
+						}
+					}
+				}
+			}
+		},
+
+		/*
+		* Small abstraction to control types
+		* We can add more, just be sure to follow the pattern: create, options, value
+		*/
+		_controls: {
+			// slider methods
+			slider: {
+				create: function(tp_inst, obj, unit, val, min, max, step){
+					var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
+					return obj.prop('slide', null).slider({
+						orientation: "horizontal",
+						value: rtl? val*-1 : val,
+						min: rtl? max*-1 : min,
+						max: rtl? min*-1 : max,
+						step: step,
+						slide: function(event, ui) {
+							tp_inst.control.value(tp_inst, $(this), unit, rtl? ui.value*-1:ui.value);
+							tp_inst._onTimeChange();
+						},
+						stop: function(event, ui) {
+							tp_inst._onSelectHandler();
+						}
+					});	
+				},
+				options: function(tp_inst, obj, unit, opts, val){
+					if(tp_inst._defaults.isRTL){
+						if(typeof(opts) == 'string'){
+							if(opts == 'min' || opts == 'max'){
+								if(val !== undefined)
+									return obj.slider(opts, val*-1);
+								return Math.abs(obj.slider(opts));
+							}
+							return obj.slider(opts);
+						}
+						var min = opts.min, 
+							max = opts.max;
+						opts.min = opts.max = null;
+						if(min !== undefined)
+							opts.max = min * -1;
+						if(max !== undefined)
+							opts.min = max * -1;
+						return obj.slider(opts);
+					}
+					if(typeof(opts) == 'string' && val !== undefined)
+							return obj.slider(opts, val);
+					return obj.slider(opts);
+				},
+				value: function(tp_inst, obj, unit, val){
+					if(tp_inst._defaults.isRTL){
+						if(val !== undefined)
+							return obj.slider('value', val*-1);
+						return Math.abs(obj.slider('value'));
+					}
+					if(val !== undefined)
+						return obj.slider('value', val);
+					return obj.slider('value');
+				}
+			},
+			// select methods
+			select: {
+				create: function(tp_inst, obj, unit, val, min, max, step){
+					var sel = '<select class="ui-timepicker-select" data-unit="'+ unit +'" data-min="'+ min +'" data-max="'+ max +'" data-step="'+ step +'">',
+						ul = tp_inst._defaults.timeFormat.indexOf('t') !== -1? 'toLowerCase':'toUpperCase',
+						m = 0;
+
+					for(var i=min; i<=max; i+=step){						
+						sel += '<option value="'+ i +'"'+ (i==val? ' selected':'') +'>';
+						if(unit == 'hour' && useAmpm(tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat))
+							sel += $.datepicker.formatTime("hh TT", {hour:i}, tp_inst._defaults);
+						else if(unit == 'millisec' || i >= 10) sel += i;
+						else sel += '0'+ i.toString();
+						sel += '</option>';
+					}
+					sel += '</select>';
+
+					obj.children('select').remove();
+
+					$(sel).appendTo(obj).change(function(e){
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					});
+
+					return obj;
+				},
+				options: function(tp_inst, obj, unit, opts, val){
+					var o = {},
+						$t = obj.children('select');
+					if(typeof(opts) == 'string'){
+						if(val === undefined)
+							return $t.data(opts);
+						o[opts] = val;	
+					}
+					else o = opts;
+					return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
+				},
+				value: function(tp_inst, obj, unit, val){
+					var $t = obj.children('select');
+					if(val !== undefined)
+						return $t.val(val);
+					return $t.val();
+				}
+			}
+		} // end _controls
+
+	});
+
+	$.fn.extend({
+		/*
+		* shorthand just to use timepicker..
+		*/
+		timepicker: function(o) {
+			o = o || {};
+			var tmp_args = Array.prototype.slice.call(arguments);
+
+			if (typeof o == 'object') {
+				tmp_args[0] = $.extend(o, {
+					timeOnly: true
+				});
+			}
+
+			return $(this).each(function() {
+				$.fn.datetimepicker.apply($(this), tmp_args);
+			});
+		},
+
+		/*
+		* extend timepicker to datepicker
+		*/
+		datetimepicker: function(o) {
+			o = o || {};
+			var tmp_args = arguments;
+
+			if (typeof(o) == 'string') {
+				if (o == 'getDate') {
+					return $.fn.datepicker.apply($(this[0]), tmp_args);
+				} else {
+					return this.each(function() {
+						var $t = $(this);
+						$t.datepicker.apply($t, tmp_args);
+					});
+				}
+			} else {
 				return this.each(function() {
 					var $t = $(this);
-					$t.datepicker.apply($t, tmp_args);
+					$t.datepicker($.timepicker._newInst($t, o)._defaults);
 				});
-		}
-		else
-			return this.each(function() {
-				var $t = $(this);
-				$t.datepicker($.timepicker._newInst($t, o)._defaults);
-			});
-	}
-});
-
-//########################################################################
-// format the time all pretty... 
-// format = string format of the time
-// time = a {}, not a Date() for timezones
-// options = essentially the regional[].. amNames, pmNames, ampm
-//########################################################################
-$.datepicker.formatTime = function(format, time, options) {
-	options = options || {};
-	options = $.extend($.timepicker._defaults, options);
-	time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
-	
-	var tmptime = format;
-	var ampmName = options['amNames'][0];
-
-	var hour = parseInt(time.hour, 10);
-	if (options.ampm) {
-		if (hour > 11){
-			ampmName = options['pmNames'][0];
-			if(hour > 12)
-				hour = hour % 12;
-		}
-		if (hour === 0)
-			hour = 12;
-	}
-	tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) {
-		switch (match.toLowerCase()) {
-			case 'hh': return ('0' + hour).slice(-2);
-			case 'h':  return hour;
-			case 'mm': return ('0' + time.minute).slice(-2);
-			case 'm':  return time.minute;
-			case 'ss': return ('0' + time.second).slice(-2);
-			case 's':  return time.second;
-			case 'l':  return ('00' + time.millisec).slice(-3);
-			case 'z':  return time.timezone;
-			case 't': case 'tt':
-				if (options.ampm) {
-					if (match.length == 1)
-						ampmName = ampmName.charAt(0);
-					return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
-				}
-				return '';
+			}
 		}
 	});
 
-	tmptime = $.trim(tmptime);
-	return tmptime;
-}
+	/*
+	* Public Utility to parse date and time
+	*/
+	$.datepicker.parseDateTime = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+		if (parseRes.timeObj) {
+			var t = parseRes.timeObj;
+			parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+		}
 
-//########################################################################
-// the bad hack :/ override datepicker so it doesnt close on select
-// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
-//########################################################################
-$.datepicker._base_selectDate = $.datepicker._selectDate;
-$.datepicker._selectDate = function (id, dateStr) {
-	var inst = this._getInst($(id)[0]),
-		tp_inst = this._get(inst, 'timepicker');
+		return parseRes.date;
+	};
 
-	if (tp_inst) {
-		tp_inst._limitMinMaxDateTime(inst, true);
-		inst.inline = inst.stay_open = true;
-		//This way the onSelect handler called from calendarpicker get the full dateTime
-		this._base_selectDate(id, dateStr);
-		inst.inline = inst.stay_open = false;
-		this._notifyChange(inst);
-		this._updateDatepicker(inst);
-	}
-	else this._base_selectDate(id, dateStr);
-};
+	/*
+	* Public utility to parse time
+	*/
+	$.datepicker.parseTime = function(timeFormat, timeString, options) {		
+		var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {});
 
-//#############################################################################################
-// second bad hack :/ override datepicker so it triggers an event when changing the input field
-// and does not redraw the datepicker on every selectDate event
-//#############################################################################################
-$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
-$.datepicker._updateDatepicker = function(inst) {
+		// Strict parse requires the timeString to match the timeFormat exactly
+		var strictParse = function(f, s, o){
 
-	// don't popup the datepicker if there is another instance already opened
-	var input = inst.input[0];
-	if($.datepicker._curInst &&
-	   $.datepicker._curInst != inst &&
-	   $.datepicker._datepickerShowing &&
-	   $.datepicker._lastInput != input) {
-		return;
-	}
+			// pattern for standard and localized AM/PM markers
+			var getPatternAmpm = function(amNames, pmNames) {
+				var markers = [];
+				if (amNames) {
+					$.merge(markers, amNames);
+				}
+				if (pmNames) {
+					$.merge(markers, pmNames);
+				}
+				markers = $.map(markers, function(val) {
+					return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
+				});
+				return '(' + markers.join('|') + ')?';
+			};
 
-	if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
-				
-		this._base_updateDatepicker(inst);
+			// figure out position of time elements.. cause js cant do named captures
+			var getFormatPositions = function(timeFormat) {
+				var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z|'.*?')/g),
+					orders = {
+						h: -1,
+						m: -1,
+						s: -1,
+						l: -1,
+						t: -1,
+						z: -1
+					};
+
+				if (finds) {
+					for (var i = 0; i < finds.length; i++) {
+						if (orders[finds[i].toString().charAt(0)] == -1) {
+							orders[finds[i].toString().charAt(0)] = i + 1;
+						}
+					}
+				}
+				return orders;
+			};
+
+			var regstr = '^' + f.toString()
+					.replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[lz]|'.*?')/g, function (match) {
+							var ml = match.length;
+							switch (match.charAt(0).toLowerCase()) {
+								case 'h': return ml === 1? '(\\d?\\d)':'(\\d{'+ml+'})';
+								case 'm': return ml === 1? '(\\d?\\d)':'(\\d{'+ml+'})';
+								case 's': return ml === 1? '(\\d?\\d)':'(\\d{'+ml+'})';
+								case 'l': return '(\\d?\\d?\\d)';
+								case 'z': return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
+								case 't': return getPatternAmpm(o.amNames, o.pmNames);
+								default:    // literal escaped in quotes
+									return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
+							}
+						})
+					.replace(/\s/g, '\\s?') +
+					o.timeSuffix + '$',
+				order = getFormatPositions(f),
+				ampm = '',
+				treg;
+
+			treg = s.match(new RegExp(regstr, 'i'));
+
+			var resTime = {
+				hour: 0,
+				minute: 0,
+				second: 0,
+				millisec: 0
+			};
+
+			if (treg) {
+				if (order.t !== -1) {
+					if (treg[order.t] === undefined || treg[order.t].length === 0) {
+						ampm = '';
+						resTime.ampm = '';
+					} else {
+						ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
+						resTime.ampm = o[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+					}
+				}
+
+				if (order.h !== -1) {
+					if (ampm == 'AM' && treg[order.h] == '12') {
+						resTime.hour = 0; // 12am = 0 hour
+					} else {
+						if (ampm == 'PM' && treg[order.h] != '12') {
+							resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
+						} else {
+							resTime.hour = Number(treg[order.h]);
+						}
+					}
+				}
+
+				if (order.m !== -1) {
+					resTime.minute = Number(treg[order.m]);
+				}
+				if (order.s !== -1) {
+					resTime.second = Number(treg[order.s]);
+				}
+				if (order.l !== -1) {
+					resTime.millisec = Number(treg[order.l]);
+				}
+				if (order.z !== -1 && treg[order.z] !== undefined) {
+					var tz = treg[order.z].toUpperCase();
+					switch (tz.length) {
+					case 1:
+						// Z
+						tz = o.timezoneIso8601 ? 'Z' : '+0000';
+						break;
+					case 5:
+						// +hhmm
+						if (o.timezoneIso8601) {
+							tz = tz.substring(1) == '0000' ? 'Z' : tz.substring(0, 3) + ':' + tz.substring(3);
+						}
+						break;
+					case 6:
+						// +hh:mm
+						if (!o.timezoneIso8601) {
+							tz = tz == 'Z' || tz.substring(1) == '00:00' ? '+0000' : tz.replace(/:/, '');
+						} else {
+							if (tz.substring(1) == '00:00') {
+								tz = 'Z';
+							}
+						}
+						break;
+					}
+					resTime.timezone = tz;
+				}
+
+
+				return resTime;
+			}
+			return false;
+		};// end strictParse
+
+		// First try JS Date, if that fails, use strictParse
+		var looseParse = function(f,s,o){
+			try{
+				var d = new Date('2012-01-01 '+ s);
+				if(isNaN(d.getTime())){
+					d = new Date('2012-01-01T'+ s);
+					if(isNaN(d.getTime())){
+						d = new Date('01/01/2012 '+ s);
+						if(isNaN(d.getTime())){
+							throw "Unable to parse time with native Date: "+ s;
+						}
+					}
+				}
+
+				return {
+					hour: d.getHours(),
+					minute: d.getMinutes(),
+					second: d.getSeconds(),
+					millisec: d.getMilliseconds(),
+					timezone: $.timepicker.timeZoneOffsetString(d)
+				};
+			}
+			catch(err){
+				try{
+					return strictParse(f,s,o);
+				}
+				catch(err2){
+					$.datepicker.log("Unable to parse \ntimeString: "+ s +"\ntimeFormat: "+ f);
+				}				
+			}
+			return false;
+		}; // end looseParse
 		
-		// Reload the time control when changing something in the input text field.
+		if(typeof o.parse === "function"){
+			return o.parse(timeFormat, timeString, o)
+		}
+		if(o.parse === 'loose'){
+			return looseParse(timeFormat, timeString, o);
+		}
+		return strictParse(timeFormat, timeString, o);
+	};
+
+	/*
+	* Public utility to format the time
+	* format = string format of the time
+	* time = a {}, not a Date() for timezones
+	* options = essentially the regional[].. amNames, pmNames, ampm
+	*/
+	$.datepicker.formatTime = function(format, time, options) {
+		options = options || {};
+		options = $.extend({}, $.timepicker._defaults, options);
+		time = $.extend({
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			timezone: '+0000'
+		}, time);
+
+		var tmptime = format,
+			ampmName = options.amNames[0],
+			hour = parseInt(time.hour, 10);
+
+		if (hour > 11) {
+			ampmName = options.pmNames[0];
+		}
+
+		tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[lz]|('.*?'|".*?"))/g, function(match) {
+		switch (match) {
+			case 'HH':
+				return ('0' + hour).slice(-2);
+			case 'H':
+				return hour;
+			case 'hh':
+				return ('0' + convert24to12(hour)).slice(-2);
+			case 'h':
+				return convert24to12(hour);
+			case 'mm':
+				return ('0' + time.minute).slice(-2);
+			case 'm':
+				return time.minute;
+			case 'ss':
+				return ('0' + time.second).slice(-2);
+			case 's':
+				return time.second;
+			case 'l':
+				return ('00' + time.millisec).slice(-3);
+			case 'z':
+				return time.timezone === null? options.defaultTimezone : time.timezone;
+			case 'T': 
+				return ampmName.charAt(0).toUpperCase();
+			case 'TT': 
+				return ampmName.toUpperCase();
+			case 't':
+				return ampmName.charAt(0).toLowerCase();
+			case 'tt':
+				return ampmName.toLowerCase();
+			default:
+				return match.replace(/\'/g, "") || "'";
+			}
+		});
+
+		tmptime = $.trim(tmptime);
+		return tmptime;
+	};
+
+	/*
+	* the bad hack :/ override datepicker so it doesnt close on select
+	// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+	*/
+	$.datepicker._base_selectDate = $.datepicker._selectDate;
+	$.datepicker._selectDate = function(id, dateStr) {
+		var inst = this._getInst($(id)[0]),
+			tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			tp_inst._limitMinMaxDateTime(inst, true);
+			inst.inline = inst.stay_open = true;
+			//This way the onSelect handler called from calendarpicker get the full dateTime
+			this._base_selectDate(id, dateStr);
+			inst.inline = inst.stay_open = false;
+			this._notifyChange(inst);
+			this._updateDatepicker(inst);
+		} else {
+			this._base_selectDate(id, dateStr);
+		}
+	};
+
+	/*
+	* second bad hack :/ override datepicker so it triggers an event when changing the input field
+	* and does not redraw the datepicker on every selectDate event
+	*/
+	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+	$.datepicker._updateDatepicker = function(inst) {
+
+		// don't popup the datepicker if there is another instance already opened
+		var input = inst.input[0];
+		if ($.datepicker._curInst && $.datepicker._curInst != inst && $.datepicker._datepickerShowing && $.datepicker._lastInput != input) {
+			return;
+		}
+
+		if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+			this._base_updateDatepicker(inst);
+
+			// Reload the time control when changing something in the input text field.
+			var tp_inst = this._get(inst, 'timepicker');
+			if (tp_inst) {
+				tp_inst._addTimePicker(inst);
+
+//				if (tp_inst._defaults.useLocalTimezone) { //checks daylight saving with the new date.
+//					var date = new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay, 12);
+//					selectLocalTimeZone(tp_inst, date);
+//					tp_inst._onTimeChange();
+//				}
+			}
+		}
+	};
+
+	/*
+	* third bad hack :/ override datepicker so it allows spaces and colon in the input field
+	*/
+	$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+	$.datepicker._doKeyPress = function(event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			if ($.datepicker._get(inst, 'constrainInput')) {
+				var ampm = useAmpm(tp_inst._defaults.timeFormat),
+					dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+					datetimeChars = tp_inst._defaults.timeFormat.toString()
+											.replace(/[hms]/g, '')
+											.replace(/TT/g, ampm ? 'APM' : '')
+											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+											.replace(/tT/g, ampm ? 'AaPpMm' : '')
+											.replace(/T/g, ampm ? 'AP' : '')
+											.replace(/tt/g, ampm ? 'apm' : '')
+											.replace(/t/g, ampm ? 'ap' : '') + 
+											" " + tp_inst._defaults.separator + 
+											tp_inst._defaults.timeSuffix + 
+											(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') + 
+											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) + 
+											dateChars,
+					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+			}
+		}
+
+		return $.datepicker._base_doKeyPress(event);
+	};
+
+	/*
+	* Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
+	*/
+	$.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
+	/* Update any alternate field to synchronise with the main field. */
+	$.datepicker._updateAlternate = function(inst) {
 		var tp_inst = this._get(inst, 'timepicker');
-		if(tp_inst) tp_inst._addTimePicker(inst);
-	}
-};
-
-//#######################################################################################
-// third bad hack :/ override datepicker so it allows spaces and colon in the input field
-//#######################################################################################
-$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
-$.datepicker._doKeyPress = function(event) {
-	var inst = $.datepicker._getInst(event.target),
-		tp_inst = $.datepicker._get(inst, 'timepicker');
-
-	if (tp_inst) {
-		if ($.datepicker._get(inst, 'constrainInput')) {
-			var ampm = tp_inst._defaults.ampm,
-				dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
-				datetimeChars = tp_inst._defaults.timeFormat.toString()
-								.replace(/[hms]/g, '')
-								.replace(/TT/g, ampm ? 'APM' : '')
-								.replace(/Tt/g, ampm ? 'AaPpMm' : '')
-								.replace(/tT/g, ampm ? 'AaPpMm' : '')
-								.replace(/T/g, ampm ? 'AP' : '')
-								.replace(/tt/g, ampm ? 'apm' : '')
-								.replace(/t/g, ampm ? 'ap' : '') +
-								" " +
-								tp_inst._defaults.separator +
-								tp_inst._defaults.timeSuffix +
-								(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
-								(tp_inst._defaults.amNames.join('')) +
-								(tp_inst._defaults.pmNames.join('')) +
-								dateChars,
-				chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
-			return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
-		}
-	}
-	
-	return $.datepicker._base_doKeyPress(event);
-};
-
-//#######################################################################################
-// Override key up event to sync manual input changes.
-//#######################################################################################
-$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
-$.datepicker._doKeyUp = function (event) {
-	var inst = $.datepicker._getInst(event.target),
-		tp_inst = $.datepicker._get(inst, 'timepicker');
-
-	if (tp_inst) {
-		if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
-			try {
-				$.datepicker._updateDatepicker(inst);
-			}
-			catch (err) {
-				$.datepicker.log(err);
+		if(tp_inst){
+			var altField = tp_inst._defaults.altField;
+			if (altField) { // update alternate field too
+				var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
+					date = this._getDate(inst),
+					formatCfg = $.datepicker._getFormatConfig(inst),
+					altFormattedDateTime = '', 
+					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator, 
+					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
+					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
+				
+				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
+				if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null){
+					if(tp_inst._defaults.altFormat)
+						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
+					else altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
+				}
+				$(altField).val(altFormattedDateTime);
 			}
 		}
-	}
+		else{
+			$.datepicker._base_updateAlternate(inst);
+		}
+	};
 
-	return $.datepicker._base_doKeyUp(event);
-};
+	/*
+	* Override key up event to sync manual input changes.
+	*/
+	$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+	$.datepicker._doKeyUp = function(event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
 
-//#######################################################################################
-// override "Today" button to also grab the time.
-//#######################################################################################
-$.datepicker._base_gotoToday = $.datepicker._gotoToday;
-$.datepicker._gotoToday = function(id) {
-	var inst = this._getInst($(id)[0]),
-		$dp = inst.dpDiv;
-	this._base_gotoToday(id);
-	var now = new Date();
-	var tp_inst = this._get(inst, 'timepicker');
-	if (tp_inst && tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
-		var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60
-		var tzsign = tzoffset > 0 ? '-' : '+';
-		tzoffset = Math.abs(tzoffset);
-		var tzmin = tzoffset % 60;
-		tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
-		if (tp_inst._defaults.timezoneIso8609)
-			tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
-		tp_inst.timezone_select.val(tzoffset);
-	}
-	this._setTime(inst, now);
-	$( '.ui-datepicker-today', $dp).click(); 
-};
+		if (tp_inst) {
+			if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+				try {
+					$.datepicker._updateDatepicker(inst);
+				} catch (err) {
+					$.datepicker.log(err);
+				}
+			}
+		}
 
-//#######################################################################################
-// Disable & enable the Time in the datetimepicker
-//#######################################################################################
-$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
-	var inst = this._getInst(target),
-	tp_inst = this._get(inst, 'timepicker');
-	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-	if (tp_inst) {
-		tp_inst._defaults.showTimepicker = false;
-		tp_inst._updateDateTime(inst);
-	}
-};
+		return $.datepicker._base_doKeyUp(event);
+	};
 
-$.datepicker._enableTimepickerDatepicker = function(target, date, withDate) {
-	var inst = this._getInst(target),
-	tp_inst = this._get(inst, 'timepicker');
-	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-	if (tp_inst) {
-		tp_inst._defaults.showTimepicker = true;
-		tp_inst._addTimePicker(inst); // Could be disabled on page load
-		tp_inst._updateDateTime(inst);
-	}
-};
+	/*
+	* override "Today" button to also grab the time.
+	*/
+	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+	$.datepicker._gotoToday = function(id) {
+		var inst = this._getInst($(id)[0]),
+			$dp = inst.dpDiv;
+		this._base_gotoToday(id);
+		var tp_inst = this._get(inst, 'timepicker');
+		selectLocalTimeZone(tp_inst);
+		var now = new Date();
+		this._setTime(inst, now);
+		$('.ui-datepicker-today', $dp).click();
+	};
+
+	/*
+	* Disable & enable the Time in the datetimepicker
+	*/
+	$.datepicker._disableTimepickerDatepicker = function(target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			tp_inst._defaults.showTimepicker = false;
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	$.datepicker._enableTimepickerDatepicker = function(target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			tp_inst._defaults.showTimepicker = true;
+			tp_inst._addTimePicker(inst); // Could be disabled on page load
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create our own set time function
+	*/
+	$.datepicker._setTime = function(inst, date) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var defaults = tp_inst._defaults;
 
-//#######################################################################################
-// Create our own set time function
-//#######################################################################################
-$.datepicker._setTime = function(inst, date) {
-	var tp_inst = this._get(inst, 'timepicker');
-	if (tp_inst) {
-		var defaults = tp_inst._defaults,
 			// calling _setTime with no date sets time to defaults
-			hour = date ? date.getHours() : defaults.hour,
-			minute = date ? date.getMinutes() : defaults.minute,
-			second = date ? date.getSeconds() : defaults.second,
-			millisec = date ? date.getMilliseconds() : defaults.millisec;
+			tp_inst.hour = date ? date.getHours() : defaults.hour;
+			tp_inst.minute = date ? date.getMinutes() : defaults.minute;
+			tp_inst.second = date ? date.getSeconds() : defaults.second;
+			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
 
-		//check if within min/max times..
-		if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax) || (millisec < defaults.millisecMin || millisec > defaults.millisecMax)) {
-			hour = defaults.hourMin;
-			minute = defaults.minuteMin;
-			second = defaults.secondMin;
-			millisec = defaults.millisecMin;
+			//check if within min/max times.. 
+			tp_inst._limitMinMaxDateTime(inst, true);
+
+			tp_inst._onTimeChange();
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create new public method to set only time, callable as $().datepicker('setTime', date)
+	*/
+	$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
 		}
 
-		tp_inst.hour = hour;
-		tp_inst.minute = minute;
-		tp_inst.second = second;
-		tp_inst.millisec = millisec;
+		var tp_inst = this._get(inst, 'timepicker');
 
-		if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
-		if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
-		if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
-		if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
-
-		tp_inst._onTimeChange();
-		tp_inst._updateDateTime(inst);
-	}
-};
-
-//#######################################################################################
-// Create new public method to set only time, callable as $().datepicker('setTime', date)
-//#######################################################################################
-$.datepicker._setTimeDatepicker = function(target, date, withDate) {
-	var inst = this._getInst(target),
-		tp_inst = this._get(inst, 'timepicker');
-
-	if (tp_inst) {
-		this._setDateFromField(inst);
-		var tp_date;
-		if (date) {
-			if (typeof date == "string") {
-				tp_inst._parseTime(date, withDate);
-				tp_date = new Date();
-				tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+		if (tp_inst) {
+			this._setDateFromField(inst);
+			var tp_date;
+			if (date) {
+				if (typeof date == "string") {
+					tp_inst._parseTime(date, withDate);
+					tp_date = new Date();
+					tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+				} else {
+					tp_date = new Date(date.getTime());
+				}
+				if (tp_date.toString() == 'Invalid Date') {
+					tp_date = undefined;
+				}
+				this._setTime(inst, tp_date);
 			}
-			else tp_date = new Date(date.getTime());
-			if (tp_date.toString() == 'Invalid Date') tp_date = undefined;
-			this._setTime(inst, tp_date);
 		}
-	}
 
-};
+	};
 
-//#######################################################################################
-// override setDate() to allow setting time too within Date object
-//#######################################################################################
-$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
-$.datepicker._setDateDatepicker = function(target, date) {
-	var inst = this._getInst(target),
-	tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+	/*
+	* override setDate() to allow setting time too within Date object
+	*/
+	$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+	$.datepicker._setDateDatepicker = function(target, date) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
 
-	this._updateDatepicker(inst);
-	this._base_setDateDatepicker.apply(this, arguments);
-	this._setTimeDatepicker(target, tp_date, true);
-};
+		var tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
 
-//#######################################################################################
-// override getDate() to allow getting time too within Date object
-//#######################################################################################
-$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
-$.datepicker._getDateDatepicker = function(target, noDefault) {
-	var inst = this._getInst(target),
-		tp_inst = this._get(inst, 'timepicker');
+		this._updateDatepicker(inst);
+		this._base_setDateDatepicker.apply(this, arguments);
+		this._setTimeDatepicker(target, tp_date, true);
+	};
 
-	if (tp_inst) {
-		this._setDateFromField(inst, noDefault);
-		var date = this._getDate(inst);
-		if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-		return date;
-	}
-	return this._base_getDateDatepicker(target, noDefault);
-};
+	/*
+	* override getDate() to allow getting time too within Date object
+	*/
+	$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+	$.datepicker._getDateDatepicker = function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
 
-//#######################################################################################
-// override parseDate() because UI 1.8.14 throws an error about "Extra characters"
-// An option in datapicker to ignore extra format characters would be nicer.
-//#######################################################################################
-$.datepicker._base_parseDate = $.datepicker.parseDate;
-$.datepicker.parseDate = function(format, value, settings) {
-	var date;
-	try {
-		date = this._base_parseDate(format, value, settings);
-	} catch (err) {
-		if (err.indexOf(":") >= 0) {
+		var tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			// if it hasn't yet been defined, grab from field
+			if(inst.lastVal === undefined){
+				this._setDateFromField(inst, noDefault);
+			}
+
+			var date = this._getDate(inst);
+			if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
+				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+			}
+			return date;
+		}
+		return this._base_getDateDatepicker(target, noDefault);
+	};
+
+	/*
+	* override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+	* An option in datapicker to ignore extra format characters would be nicer.
+	*/
+	$.datepicker._base_parseDate = $.datepicker.parseDate;
+	$.datepicker.parseDate = function(format, value, settings) {
+		var date;
+		try {
+			date = this._base_parseDate(format, value, settings);
+		} catch (err) {
 			// Hack!  The error message ends with a colon, a space, and
 			// the "extra" characters.  We rely on that instead of
 			// attempting to perfectly reproduce the parsing algorithm.
 			date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
+			$.datepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
+		}
+		return date;
+	};
+
+	/*
+	* override formatDate to set date with time to the input
+	*/
+	$.datepicker._base_formatDate = $.datepicker._formatDate;
+	$.datepicker._formatDate = function(inst, day, month, year) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			tp_inst._updateDateTime(inst);
+			return tp_inst.$input.val();
+		}
+		return this._base_formatDate(inst);
+	};
+
+	/*
+	* override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+	*/
+	$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+	$.datepicker._optionDatepicker = function(target, name, value) {
+		var inst = this._getInst(target),
+	        name_clone;
+		if (!inst) {
+			return null;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var min = null,
+				max = null,
+				onselect = null,
+				overrides = tp_inst._defaults.evnts,
+				fns = {},
+				prop;
+		    if (typeof name == 'string') { // if min/max was set with the string
+		        if (name === 'minDate' || name === 'minDateTime') {
+		            min = value;
+		        } else if (name === 'maxDate' || name === 'maxDateTime') {
+		            max = value;
+		        } else if (name === 'onSelect') {
+		            onselect = value;
+		        } else if (overrides.hasOwnProperty(name)) {
+		            if (typeof (value) === 'undefined') {
+		                return overrides[name];
+		            }
+		            fns[name] = value;
+		            name_clone = {}; //empty results in exiting function after overrides updated
+		        }
+		    } else if (typeof name == 'object') { //if min/max was set with the JSON
+		        if (name.minDate) {
+		            min = name.minDate;
+		        } else if (name.minDateTime) {
+		            min = name.minDateTime;
+		        } else if (name.maxDate) {
+		            max = name.maxDate;
+		        } else if (name.maxDateTime) {
+		            max = name.maxDateTime;
+		        }
+		        for (prop in overrides) {
+		            if (overrides.hasOwnProperty(prop) && name[prop]) {
+		                fns[prop] = name[prop];
+		            }
+		        }
+		    }
+		    for (prop in fns) {
+		        if (fns.hasOwnProperty(prop)) {
+		            overrides[prop] = fns[prop];
+		            if (!name_clone) { name_clone = $.extend({}, name);}
+		            delete name_clone[prop];
+		        }
+		    }
+		    if (name_clone && isEmptyObject(name_clone)) { return; }
+		    if (min) { //if min was set
+		        if (min === 0) {
+		            min = new Date();
+		        } else {
+		            min = new Date(min);
+		        }
+		        tp_inst._defaults.minDate = min;
+		        tp_inst._defaults.minDateTime = min;
+		    } else if (max) { //if max was set
+		        if (max === 0) {
+		            max = new Date();
+		        } else {
+		            max = new Date(max);
+		        }
+		        tp_inst._defaults.maxDate = max;
+		        tp_inst._defaults.maxDateTime = max;
+		    } else if (onselect) {
+		        tp_inst._defaults.onSelect = onselect;
+		    }
+		}
+		if (value === undefined) {
+			return this._base_optionDatepicker.call($.datepicker, target, name);
+		}
+		return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+	};
+	/*
+	* jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
+	* it will return false for all objects
+	*/
+	var isEmptyObject = function(obj) {
+		var prop;
+		for (prop in obj) {
+			if (obj.hasOwnProperty(obj)) {
+				return false;
+			}
+		}
+		return true;
+	};
+
+	/*
+	* jQuery extend now ignores nulls!
+	*/
+	var extendRemove = function(target, props) {
+		$.extend(target, props);
+		for (var name in props) {
+			if (props[name] === null || props[name] === undefined) {
+				target[name] = props[name];
+			}
+		}
+		return target;
+	};
+
+	/*
+	* Determine by the time format if should use ampm
+	* Returns true if should use ampm, false if not
+	*/
+	var useAmpm = function(timeFormat){
+		return (timeFormat.indexOf('t') !== -1 && timeFormat.indexOf('h') !== -1);
+	};
+
+	/*
+	* Converts 24 hour format into 12 hour
+	* Returns 12 hour without leading 0
+	*/
+	var convert24to12 = function(hour) {
+		if (hour > 12) {
+			hour = hour - 12;
+		}
+
+		if (hour == 0) {
+			hour = 12;
+		}
+
+		return String(hour);
+	};
+
+	/*
+	* Splits datetime string into date ans time substrings.
+	* Throws exception when date can't be parsed
+	* Returns [dateString, timeString]
+	*/
+	var splitDateTime = function(dateFormat, dateTimeString, dateSettings, timeSettings) {
+		try {
+			// The idea is to get the number separator occurances in datetime and the time format requested (since time has 
+			// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
+			var separator = timeSettings && timeSettings.separator ? timeSettings.separator : $.timepicker._defaults.separator,
+				format = timeSettings && timeSettings.timeFormat ? timeSettings.timeFormat : $.timepicker._defaults.timeFormat,
+				timeParts = format.split(separator), // how many occurances of separator may be in our format?
+				timePartsLen = timeParts.length,
+				allParts = dateTimeString.split(separator),
+				allPartsLen = allParts.length;
+
+			if (allPartsLen > 1) {
+				return [
+						allParts.splice(0,allPartsLen-timePartsLen).join(separator),
+						allParts.splice(0,timePartsLen).join(separator)
+					];
+			}
+
+		} catch (err) {
+			$.datepicker.log('Could not split the date from the time. Please check the following datetimepicker options' +
+					"\nthrown error: " + err +
+					"\ndateTimeString" + dateTimeString +
+					"\ndateFormat = " + dateFormat +
+					"\nseparator = " + timeSettings.separator +
+					"\ntimeFormat = " + timeSettings.timeFormat);
+
+			if (err.indexOf(":") >= 0) {
+				// Hack!  The error message ends with a colon, a space, and
+				// the "extra" characters.  We rely on that instead of
+				// attempting to perfectly reproduce the parsing algorithm.
+				var dateStringLength = dateTimeString.length - (err.length - err.indexOf(':') - 2),
+					timeString = dateTimeString.substring(dateStringLength);
+
+				return [$.trim(dateTimeString.substring(0, dateStringLength)), $.trim(dateTimeString.substring(dateStringLength))];
+
+			} else {
+				throw err;
+			}
+		}
+		return [dateTimeString, ''];
+	};
+
+	/*
+	* Internal function to parse datetime interval
+	* Returns: {date: Date, timeObj: Object}, where
+	*   date - parsed date without time (type Date)
+	*   timeObj = {hour: , minute: , second: , millisec: } - parsed time. Optional
+	*/
+	var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var date;
+		var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings);
+		date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
+		if (splitRes[1] !== '') {
+			var timeString = splitRes[1],
+				parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
+
+			if (parsedTime === null) {
+				throw 'Wrong time format';
+			}
+			return {
+				date: date,
+				timeObj: parsedTime
+			};
 		} else {
-			// The underlying error was not related to the time
-			throw err;
+			return {
+				date: date
+			};
 		}
-	}
-	return date;
-};
+	};
 
-//#######################################################################################
-// override formatDate to set date with time to the input
-//#######################################################################################
-$.datepicker._base_formatDate=$.datepicker._formatDate;
-$.datepicker._formatDate = function(inst, day, month, year){
-	var tp_inst = this._get(inst, 'timepicker');
-	if(tp_inst)
-	{
-		if(day)
-			var b = this._base_formatDate(inst, day, month, year);
-		tp_inst._updateDateTime(inst);	
-		return tp_inst.$input.val();
-	}
-	return this._base_formatDate(inst);
-};
-
-//#######################################################################################
-// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
-//#######################################################################################
-$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
-$.datepicker._optionDatepicker = function(target, name, value) {
-	var inst = this._getInst(target),
-		tp_inst = this._get(inst, 'timepicker');
-	if (tp_inst) {
-		var min,max,onselect;
-		if (typeof name == 'string') { // if min/max was set with the string
-			if (name==='minDate' || name==='minDateTime' )
-				min = value;
-			else if (name==='maxDate' || name==='maxDateTime')
-				max = value;
-			else if (name==='onSelect')
-				onselect=value;
-		} else if (typeof name == 'object') { //if min/max was set with the JSON
-			if(name.minDate)
-				min = name.minDate;
-			else if (name.minDateTime)
-				min = name.minDateTime;
-			else if (name.maxDate)
-				max = name.maxDate;
-			else if (name.maxDateTime)
-				max = name.maxDateTime;
+	/*
+	* Internal function to set timezone_select to the local timezone
+	*/
+	var selectLocalTimeZone = function(tp_inst, date) {
+		if (tp_inst && tp_inst.timezone_select) {
+			tp_inst._defaults.useLocalTimezone = true;
+			var now = typeof date !== 'undefined' ? date : new Date();
+			var tzoffset = $.timepicker.timeZoneOffsetString(now);
+			if (tp_inst._defaults.timezoneIso8601) {
+				tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+			}
+			tp_inst.timezone_select.val(tzoffset);
 		}
-		if(min){ //if min was set
-			if(min==0)
-				min=new Date();
-			else
-				min= new Date(min);
-			
-			tp_inst._defaults.minDate = min;
-			tp_inst._defaults.minDateTime = min;
-		} else if (max){ //if max was set
-			if(max==0)
-				max=new Date();
-			else
-				max= new Date(max);
-			tp_inst._defaults.maxDate = max;
-			tp_inst._defaults.maxDateTime = max;
+	};
+
+	/*
+	* Create a Singleton Insance
+	*/
+	$.timepicker = new Timepicker();
+
+	/**
+	 * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
+	 * @param  date
+	 * @return string
+	 */
+	$.timepicker.timeZoneOffsetString = function(date) {
+		var off = date.getTimezoneOffset() * -1,
+			minutes = off % 60,
+			hours = (off - minutes) / 60;
+		return (off >= 0 ? '+' : '-') + ('0' + (hours * 101).toString()).slice(-2) + ('0' + (minutes * 101).toString()).slice(-2);
+	};
+
+	/**
+	 * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * n.b. The input value must be correctly formatted (reformatting is not supported)
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the timepicker() call
+	 * @return jQuery
+	 */
+	$.timepicker.timeRange = function(startTime, endTime, options) {
+		return $.timepicker.handleRange('timepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @param  string method Can be used to specify the type of picker to be added
+	 * @return jQuery
+	 */
+	$.timepicker.dateTimeRange = function(startTime, endTime, options) {
+		$.timepicker.dateRange(startTime, endTime, options, 'datetimepicker');
+	};
+
+	/**
+	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @param  string method Can be used to specify the type of picker to be added
+	 * @return jQuery
+	 */
+	$.timepicker.dateRange = function(startTime, endTime, options, method) {
+		method = method || 'datepicker';
+		$.timepicker.handleRange(method, startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  string method Can be used to specify the type of picker to be added
+	 * @param  Element startTime
+	 * @param  Element endTime
+	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @return jQuery
+	 */
+	$.timepicker.handleRange = function(method, startTime, endTime, options) {
+		$.fn[method].call(startTime, $.extend({
+			onClose: function(dateText, inst) {
+				checkDates(this, endTime, dateText);
+			},
+			onSelect: function(selectedDateTime) {
+				selected(this, endTime, 'minDate');
+			}
+		}, options, options.start));
+		$.fn[method].call(endTime, $.extend({
+			onClose: function(dateText, inst) {
+				checkDates(this, startTime, dateText);
+			},
+			onSelect: function(selectedDateTime) {
+				selected(this, startTime, 'maxDate');
+			}
+		}, options, options.end));
+		// timepicker doesn't provide access to its 'timeFormat' option, 
+		// nor could I get datepicker.formatTime() to behave with times, so I
+		// have disabled reformatting for timepicker
+		if (method != 'timepicker' && options.reformat) {
+			$([startTime, endTime]).each(function() {
+				var format = $(this)[method].call($(this), 'option', 'dateFormat'),
+					date = new Date($(this).val());
+				if ($(this).val() && date) {
+					$(this).val($.datepicker.formatDate(format, date));
+				}
+			});
 		}
-		else if (onselect)
-			tp_inst._defaults.onSelect=onselect;
-	}
-	if (value === undefined)
-		return this._base_optionDatepicker(target, name);
-	return this._base_optionDatepicker(target, name, value);
-};
+		checkDates(startTime, endTime, startTime.val());
 
-//#######################################################################################
-// jQuery extend now ignores nulls!
-//#######################################################################################
-function extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props)
-		if (props[name] === null || props[name] === undefined)
-			target[name] = props[name];
-	return target;
-};
+		function checkDates(changed, other, dateText) {
+			if (other.val() && (new Date(startTime.val()) > new Date(endTime.val()))) {
+				other.val(dateText);
+			}
+		}
+		selected(startTime, endTime, 'minDate');
+		selected(endTime, startTime, 'maxDate');
 
-$.timepicker = new Timepicker(); // singleton instance
-$.timepicker.version = "0.9.9";
+		function selected(changed, other, option) {
+			if (!$(changed).val()) {
+				return;
+			}
+			var date = $(changed)[method].call($(changed), 'getDate');
+			// timepicker doesn't implement 'getDate' and returns a jQuery
+			if (date.getTime) {
+				$(other)[method].call($(other), 'option', option, date);
+			}
+		}
+		return $([startTime.get(0), endTime.get(0)]);
+	};
+
+	/*
+	* Keep up with the version
+	*/
+	$.timepicker.version = "1.1.2";
 
 })(jQuery);
-
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 01d4bf6dd33..cc9f4520891 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2386,20 +2386,26 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
         this._super(parent);
         this.name = parent.name;
     },
-    start: function() {
-        var self = this;
-        this.$input = this.$el.find('input.oe_datepicker_master');
-        this.$input_picker = this.$el.find('input.oe_datepicker_container');
-
-        this.picker({
+    config_plugin: function(){
+        var value = _.indexOf(['select','slider'], this.getParent().options.time) === -1
+                        ? 'select' : this.getParent().options.time;
+        return {
             onClose: this.on_picker_select,
             onSelect: this.on_picker_select,
             changeMonth: true,
             changeYear: true,
             showWeek: true,
             showButtonPanel: true,
-            firstDay: Date.CultureInfo.firstDayOfWeek
-        });
+            firstDay: Date.CultureInfo.firstDayOfWeek,
+            controlType:  value,
+        };
+    },
+    start: function() {
+        var self = this;
+        this.$input = this.$el.find('input.oe_datepicker_master');
+        this.$input_picker = this.$el.find('input.oe_datepicker_container');
+
+        this.picker(this.config_plugin());
         this.$el.find('img.oe_datepicker_trigger').click(function() {
             if (self.get("effective_readonly") || self.picker('widget').is(':visible')) {
                 self.$input.focus();

From d80edf0da259141ca91a070e8f5ced8a27c29cc7 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Tue, 29 Jan 2013 11:02:43 +0530
Subject: [PATCH 002/547] [IMP]AM/PM format for time.

bzr revid: vme@tinyerp.com-20130129053243-i0g24lzu9bpmdawm
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index cc9f4520891..da1eaf90501 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2398,6 +2398,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
             showButtonPanel: true,
             firstDay: Date.CultureInfo.firstDayOfWeek,
             controlType:  value,
+            timeFormat: 'hh:mm tt'
         };
     },
     start: function() {

From 4bb436b7bfb1aa3b936099d2e5af3e4de629ff29 Mon Sep 17 00:00:00 2001
From: "Anand Patel (OpenERP)" <pan@tinyerp.com>
Date: Thu, 31 Jan 2013 18:57:37 +0530
Subject: [PATCH 003/547] [IMP] Set the position of the unfollow button + icons
 when there is no description

bzr revid: pan@tinyerp.com-20130131132737-qfsv0js2pyzvqy2g
---
 addons/web/static/src/css/base.css  | 1 +
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6cfee50d6a4..2a44db4faad 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -522,6 +522,7 @@
 }
 .openerp .oe_grey {
   color: #aaaaaa;
+  height: 30px;
 }
 .openerp .oe_tag {
   border: 1px solid #afafb6;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b4665808caf..713f8548980 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -461,6 +461,7 @@ $sheet-padding: 16px
         max-width: 650px
     .oe_grey
         color: #aaa
+        height: 30px
 
     // }}}
 

From 68ff3ed164c4b9716ef17982addee6a5ff0d550f Mon Sep 17 00:00:00 2001
From: "Anand Patel (OpenERP)" <pan@tinyerp.com>
Date: Thu, 31 Jan 2013 19:01:35 +0530
Subject: [PATCH 004/547] [IMP]removed the 'DO you really want to remove these
 record?'for many2many and add 'Are you Sure?' for normal list

bzr revid: pan@tinyerp.com-20130131133135-t36zbgo3rhylhmy4
---
 addons/web/static/src/js/view_list.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index fbbfabcacca..2ff9b9eb35a 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -587,8 +587,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      * @param {Array} ids the ids of the records to delete
      */
     do_delete: function (ids) {
-        if (!(ids.length && confirm(_t("Do you really want to remove these records?")))) {
-            return;
+        if (!this.m2m_field){
+            if (!(ids.length && confirm(_t("Are you sure?"))) && (this.m2m_field)) {
+                return;
+            }
         }
         var self = this;
         return $.when(this.dataset.unlink(ids)).done(function () {

From 911565cef6b0183ade6a2fe8c1371154f3fb6039 Mon Sep 17 00:00:00 2001
From: "Anand Patel (OpenERP)" <pan@tinyerp.com>
Date: Thu, 31 Jan 2013 19:05:39 +0530
Subject: [PATCH 005/547] [IMP]Added missing code in the sass file

bzr revid: pan@tinyerp.com-20130131133539-5n3s8kb2dn15di0k
---
 addons/web_kanban/static/src/css/kanban.css  |  6 +++---
 addons/web_kanban/static/src/css/kanban.sass | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 3083a9e30a5..fa01485bb30 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -73,6 +73,9 @@
 .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban > span {
   visibility: visible;
 }
+.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
+  display: none;
+}
 .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_menu {
   font-weight: normal;
   font-size: 13px;
@@ -99,9 +102,6 @@
   text-align: center;
   float: right;
 }
-.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
-  display: none;
-}
 .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
   width: 185px;
   min-width: 185px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 988dee01051..b5c1e656243 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -102,6 +102,8 @@
         &:hover
             .oe_dropdown_kanban > span
                 visibility: visible
+            .oe_kanban_group_length
+                display: none
         .oe_dropdown_menu
             font-weight: normal
             font-size: 13px
@@ -119,11 +121,11 @@
             overflow: hidden
             text-overflow: ellipsis
         .oe_kanban_group_length
-          position: absolute
-          top: -1px
-          right: -14px
-          text-align: center
-          float: right
+            position: absolute
+            top: -1px
+            right: -14px
+            text-align: center
+            float: right
     &.oe_kanban_grouped
         .oe_kanban_column, .oe_kanban_group_header
             width: 185px

From a3a2e4c3964c29b41664d1acb92b48667794dafd Mon Sep 17 00:00:00 2001
From: "Anand Patel (OpenERP)" <pan@tinyerp.com>
Date: Thu, 31 Jan 2013 19:11:21 +0530
Subject: [PATCH 006/547] [IMP]Shows the no of cards in folded column of kanban

bzr revid: pan@tinyerp.com-20130131134121-5hacrmek8sh6xrxt
---
 addons/web_kanban/static/src/css/kanban.css     | 6 +++++-
 addons/web_kanban/static/src/css/kanban.sass    | 5 ++++-
 addons/web_kanban/static/src/xml/web_kanban.xml | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index fa01485bb30..402cabb1796 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -163,7 +163,7 @@
   display: none;
   position: relative;
   opacity: 0.75;
-  top: 20px;
+  top: 26px;
 }
 .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
   margin-left: 4px;
@@ -176,6 +176,10 @@
 .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
   top: -2px;
 }
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle .oe_kanban_group_length {
+  margin: 7px 1px -15px 2px;
+  font-weight: bold;
+}
 .openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {
   cursor: pointer;
   display: inline-block;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index b5c1e656243..ac2ea4b4c53 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -180,7 +180,7 @@
         display: none
         position: relative
         opacity: 0.75
-        top: 20px
+        top: 26px
     // }}}
     // KanbanQuickCreate {{{
     .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
@@ -191,6 +191,9 @@
         top: -8px
     .oe_kanban_header .oe_dropdown_toggle
         top: -2px
+        .oe_kanban_group_length
+            margin: 7px 1px -15px 2px
+            font-weight: bold
     .oe_kanban_card, .oe_dropdown_toggle
         cursor: pointer
         display: inline-block
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 67ee563c14d..e644950fa8b 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -35,6 +35,9 @@
                     <div class="oe_kanban_add oe_e" title="Quick create">]</div>
                 </t>
                     <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                        <div class="oe_kanban_group_length oe_tag">
+                            <t t-if="widget.group.get('length') &gt; 99"> 99+ </t><t t-if="widget.group.get('length') &lt;= 99"> <t t-esc="widget.group.get('length')"/> </t>
+                        </div>
                         <span class="oe_e">í</span>
                         <ul class="oe_dropdown_menu oe_kanban_group_dropdown">
                             <li><a data-action="toggle_fold" href="#">Fold</a></li>

From c39bdd50061c38b322fe4e685bddb27020a471f7 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 1 Feb 2013 16:26:58 +0530
Subject: [PATCH 007/547] [IMP]Added  dummy div conatiner for record move on
 folded column

bzr revid: vme@tinyerp.com-20130201105658-ekhakhm82w9cx766
---
 addons/web_kanban/static/src/js/kanban.js     | 28 +++++++++++++++++--
 .../web_kanban/static/src/xml/web_kanban.xml  |  1 +
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 7d6f88b6def..2866c6794e2 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -325,19 +325,30 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         var self = this;
         if (this.group_by) {
             // Kanban cards drag'n'drop
-            var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards');
+            var prev_widet;
+            var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_on_fold_cards');
             $columns.sortable({
                 handle : '.oe_kanban_draghandle',
                 start: function(event, ui) {
                     self.currently_dragging.index = ui.item.parent().children('.oe_kanban_record').index(ui.item);
-                    self.currently_dragging.group = ui.item.parents('.oe_kanban_column:first').data('widget');
+                    self.currently_dragging.group = prev_widet = ui.item.parents('.oe_kanban_column:first').data('widget');
                     ui.item.find('*').on('click.prevent', function(ev) {
                         return false;
                     });
                     ui.placeholder.height(ui.item.height());
                 },
+                over: function(event, ui) {
+                    var parent = $(event.target).parent();
+                    prev_widet.highlight(false);
+                    if(parent.hasClass('oe_kanban_group_folded')){
+                        var widget = parent.data('widget');
+                        widget.highlight(true);
+                        prev_widet = widget;
+                    }
+                 },
                 revert: 150,
                 stop: function(event, ui) {
+                    prev_widet.highlight(false);
                     var record = ui.item.data('widget');
                     var old_index = self.currently_dragging.index;
                     var new_index = ui.item.parent().children('.oe_kanban_record').index(ui.item);
@@ -413,6 +424,10 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             this.dataset.write(record.id, data, {}).done(function() {
                 record.do_reload();
                 new_group.do_save_sequences();
+                if(new_group.state.folded){
+                    new_group.do_action_toggle_fold();
+                    record.prependTo(new_group.$records.find('.oe_kanban_column_cards'));
+                }
             }).fail(function(error, evt) {
                 evt.preventDefault();
                 alert(_t("An error has occured while moving the record to this group: ") + data.message);
@@ -723,6 +738,15 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
                 self.view.dataset.ids.push(id);
                 self.do_add_records(records, true);
             });
+    },
+    highlight: function(show){
+        if(show){
+            this.$el.addClass('oe_kanban_column_higlight');
+            this.$records.addClass('oe_kanban_column_higlight');
+        }else{
+            this.$el.removeClass('oe_kanban_column_higlight');
+            this.$records.removeClass('oe_kanban_column_higlight');
+        }
     }
 });
 
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 67ee563c14d..b4971ca7510 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -69,6 +69,7 @@
     <td class="oe_kanban_column">
         <div class="oe_kanban_group_list_header"/>
         <div class="oe_kanban_column_cards"/>
+        <div class="oe_kanban_folded_column_cards"/>
         <div class="oe_kanban_show_more">
             <button class="oe_button">Show more... (<span class="oe_kanban_remaining"></span> remaining)</button>
         </div>

From a253ef6c405b2b100fdafc4aeb077860739b452b Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 1 Feb 2013 16:38:44 +0530
Subject: [PATCH 008/547] [FIX]Some CSS2Sass proble in trunk.

bzr revid: vme@tinyerp.com-20130201110844-wrqx9j0o7evrd4ey
---
 addons/web_kanban/static/src/css/kanban.css  | 7 +++----
 addons/web_kanban/static/src/css/kanban.sass | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 3083a9e30a5..521d4305cc8 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 .openerp .oe_kanban_view {
   background: white;
   height: inherit;
@@ -73,6 +72,9 @@
 .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban > span {
   visibility: visible;
 }
+.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
+  display: none;
+}
 .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_menu {
   font-weight: normal;
   font-size: 13px;
@@ -99,9 +101,6 @@
   text-align: center;
   float: right;
 }
-.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
-  display: none;
-}
 .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
   width: 185px;
   min-width: 185px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 6802a257556..b5c1e656243 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -102,6 +102,8 @@
         &:hover
             .oe_dropdown_kanban > span
                 visibility: visible
+            .oe_kanban_group_length
+                display: none
         .oe_dropdown_menu
             font-weight: normal
             font-size: 13px

From 32ca8ce3da120fbeb34886abbb7e1c073de26f3e Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 1 Feb 2013 17:37:13 +0530
Subject: [PATCH 009/547] [IMP]sass2css changes

bzr revid: vme@tinyerp.com-20130201120713-pxwej4ti38vo5f37
---
 addons/web_kanban/static/src/css/kanban.css  | 11 +++++++++++
 addons/web_kanban/static/src/css/kanban.sass |  9 +++++++++
 addons/web_kanban/static/src/js/kanban.js    |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 521d4305cc8..30d93b81c10 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -2,6 +2,9 @@
   background: white;
   height: inherit;
 }
+.openerp .oe_kanban_view .oe_kanban_column_higlight {
+  background: #eeddf6 !important;
+}
 .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
   background: url(/web/static/src/img/form_sheetbg.png);
   width: 100%;
@@ -137,6 +140,9 @@
   padding: 0;
   margin: 0px;
 }
+.openerp .oe_kanban_view .oe_kanban_column .oe_kanban_folded_column_cards {
+  visibility: hidden;
+}
 .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add {
   display: none;
 }
@@ -146,6 +152,11 @@
 .openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
   left: -5px;
 }
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_folded_column_cards {
+  visibility: visible;
+  display: block !important;
+  height: 100%;
+}
 .openerp .oe_kanban_view .oe_kanban_group_title_undefined {
   color: #666666;
 }
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index b5c1e656243..0925f3f959a 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -51,6 +51,8 @@
     //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
     background: white
     height: inherit
+    .oe_kanban_column_higlight
+        background: #eeddf6 !important
     &.oe_kanban_grouped .oe_kanban_dummy_cell
         background: url(/web/static/src/img/form_sheetbg.png)
         width: 100%
@@ -158,6 +160,9 @@
     .oe_kanban_aggregates
         padding: 0
         margin: 0px
+    .oe_kanban_column
+        .oe_kanban_folded_column_cards
+            visibility: hidden
     .oe_kanban_group_folded
         .oe_kanban_group_title, &.oe_kanban_column *, .oe_kanban_aggregates, .oe_kanban_add
             display: none
@@ -165,6 +170,10 @@
             display: block
         .oe_dropdown_kanban
             left: -5px
+        .oe_kanban_folded_column_cards
+            visibility: visible
+            display: block !important
+            height: 100%
     .oe_kanban_group_title_undefined
         color: #666666
     .oe_kanban_group_title_vertical
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 2866c6794e2..3559d3862bd 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -326,7 +326,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         if (this.group_by) {
             // Kanban cards drag'n'drop
             var prev_widet;
-            var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_on_fold_cards');
+            var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_folded_column_cards');
             $columns.sortable({
                 handle : '.oe_kanban_draghandle',
                 start: function(event, ui) {

From c0a2f48869a14b6f90f47770f34b4481b53ad7bd Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 1 Feb 2013 17:42:15 +0530
Subject: [PATCH 010/547] [IMP]disable attachments on list view.

bzr revid: vme@tinyerp.com-20130201121215-6x55ww50kwjast1a
---
 addons/document/static/src/js/document.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js
index 23f1375e8c8..6ba25b58292 100644
--- a/addons/document/static/src/js/document.js
+++ b/addons/document/static/src/js/document.js
@@ -3,6 +3,7 @@ openerp.document = function (instance) {
     instance.web.Sidebar.include({
         init : function(){
             this._super.apply(this, arguments);
+            if (this.getParent().fields_view.type === "tree") return;
             this.sections.splice(1, 0, { 'name' : 'files', 'label' : _t('Attachment(s)'), });
             this.items['files'] = [];
         },

From fca9be00b0c204924d525293d8b082ef903b17ba Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 1 Feb 2013 17:47:13 +0530
Subject: [PATCH 011/547] [REM]override on_record_moved removed.not useable

bzr revid: vme@tinyerp.com-20130201121713-ux3pegin1ywd5gj9
---
 addons/project/static/src/js/project.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index ce8be146e54..a4e899a8714 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -32,12 +32,6 @@ openerp.project = function(openerp) {
             if (self.dataset.model === 'project.project') {
                 self.project_display_members_names();
             }
-        },
-        on_record_moved: function(record, old_group, old_index, new_group, new_index){
-            var self = this;
-            this._super.apply(this, arguments);
-            if(new_group.state.folded)
-                new_group.do_action_toggle_fold();
         }
     });
 

From 84ef1e2605b30ce21480d40b9c8555aa2e288426 Mon Sep 17 00:00:00 2001
From: "Anand Patel (OpenERP)" <pan@tinyerp.com>
Date: Mon, 4 Feb 2013 14:24:00 +0530
Subject: [PATCH 012/547] [IMP]Improved code when deleting the list view record
 without m2m

bzr revid: pan@tinyerp.com-20130204085400-y807cs1a8xg026qm
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 2ff9b9eb35a..4b4acac9805 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -588,7 +588,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      */
     do_delete: function (ids) {
         if (!this.m2m_field){
-            if (!(ids.length && confirm(_t("Are you sure?"))) && (this.m2m_field)) {
+            if (!(ids.length && confirm(_t("Are you sure?")))) {
                 return;
             }
         }

From 33994be6301eac575ab214536f881a8783e836f7 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Mon, 4 Feb 2013 14:45:19 +0530
Subject: [PATCH 013/547] [IMP]Remove AM/PM format for hours.

bzr revid: vme@tinyerp.com-20130204091519-8e0i2h2jdidlj248
---
 addons/web/static/src/js/view_form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4d71167df21..83afa3a9eca 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2393,7 +2393,6 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
             showButtonPanel: true,
             firstDay: Date.CultureInfo.firstDayOfWeek,
             controlType:  value,
-            timeFormat: 'hh:mm tt'
         };
     },
     start: function() {

From 067c6a7015370f951a5998bbc4cd1f8b24275f82 Mon Sep 17 00:00:00 2001
From: "Anand Patel (OpenERP)" <pan@tinyerp.com>
Date: Mon, 4 Feb 2013 18:37:28 +0530
Subject: [PATCH 014/547] [IMP]Improved pop-up message as per usability team
 suggation

bzr revid: pan@tinyerp.com-20130204130728-jd5v502ek1ld3uqc
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 4b4acac9805..4486cd61d01 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -588,7 +588,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      */
     do_delete: function (ids) {
         if (!this.m2m_field){
-            if (!(ids.length && confirm(_t("Are you sure?")))) {
+            if (!(ids.length && confirm(_t("Do you really want to remove these records?")))) {
                 return;
             }
         }

From 2b0343aa309959fdf8f7596ff00c6b1f846741f5 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Mon, 4 Feb 2013 18:56:35 +0530
Subject: [PATCH 015/547] [IMP]Hide record temprory when put on folded column.

bzr revid: vme@tinyerp.com-20130204132635-018p8vl0h4t36pwy
---
 addons/web_kanban/static/src/js/kanban.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 3559d3862bd..ce73aa725a1 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -325,31 +325,36 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         var self = this;
         if (this.group_by) {
             // Kanban cards drag'n'drop
-            var prev_widet;
+            var prev_widget,is_folded,record;
             var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_folded_column_cards');
             $columns.sortable({
                 handle : '.oe_kanban_draghandle',
                 start: function(event, ui) {
                     self.currently_dragging.index = ui.item.parent().children('.oe_kanban_record').index(ui.item);
-                    self.currently_dragging.group = prev_widet = ui.item.parents('.oe_kanban_column:first').data('widget');
+                    self.currently_dragging.group = prev_widget = ui.item.parents('.oe_kanban_column:first').data('widget');
                     ui.item.find('*').on('click.prevent', function(ev) {
                         return false;
                     });
+                    record = ui.item.data('widget');
+                    record.$el.bind('mouseup',function(ev,ui){
+                        if(is_folded)record.$el.hide();
+                        record.$el.unbind('mouseup');
+                    })
                     ui.placeholder.height(ui.item.height());
                 },
                 over: function(event, ui) {
                     var parent = $(event.target).parent();
-                    prev_widet.highlight(false);
-                    if(parent.hasClass('oe_kanban_group_folded')){
+                    prev_widget.highlight(false);
+                    is_folded = parent.hasClass('oe_kanban_group_folded'); 
+                    if(is_folded){
                         var widget = parent.data('widget');
                         widget.highlight(true);
-                        prev_widet = widget;
+                        prev_widget = widget;
                     }
                  },
                 revert: 150,
                 stop: function(event, ui) {
-                    prev_widet.highlight(false);
-                    var record = ui.item.data('widget');
+                    prev_widget.highlight(false);
                     var old_index = self.currently_dragging.index;
                     var new_index = ui.item.parent().children('.oe_kanban_record').index(ui.item);
                     var old_group = self.currently_dragging.group;

From 9778533d7ee241541deca9614cd5e8660f75607c Mon Sep 17 00:00:00 2001
From: Dhruti Shastri <dhs@tinyerp.com>
Date: Wed, 6 Feb 2013 11:48:32 +0530
Subject: [PATCH 016/547] [res_country] : Create country  without code or
 remove country code raise error

bzr revid: dhs@tinyerp.com-20130206061832-r9s9m9oco6uwdg4j
---
 openerp/addons/base/res/res_country.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index 6ed4e76fa78..29d6c8ab3b7 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -71,13 +71,13 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
     name_search = location_name_search
 
     def create(self, cursor, user, vals, context=None):
-        if vals.get('code'):
+        if vals.get('code',False):
             vals['code'] = vals['code'].upper()
         return super(Country, self).create(cursor, user, vals,
                 context=context)
 
     def write(self, cursor, user, ids, vals, context=None):
-        if 'code' in vals:
+        if vals.get('code',False):
             vals['code'] = vals['code'].upper()
         return super(Country, self).write(cursor, user, ids, vals,
                 context=context)

From c9464672dedca5697810f67235c8f07b60fffd06 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Feb 2013 09:20:38 +0100
Subject: [PATCH 017/547] [ADD] inital hr_goal files

bzr revid: mat@openerp.com-20130214082038-4b62m2rlugszfpiv
---
 addons/hr_goal/__init__.py         |   1 +
 addons/hr_goal/__openerp__.py      |  39 +++++++++
 addons/hr_goal/goal.py             | 129 +++++++++++++++++++++++++++++
 addons/hr_goal/view/criteria.xml   |  17 ++++
 addons/hr_goal/view/definition.xml |  15 ++++
 addons/hr_goal/view/instance.xml   |  13 +++
 addons/hr_goal/view/preset.xml     |  13 +++
 7 files changed, 227 insertions(+)
 create mode 100644 addons/hr_goal/__init__.py
 create mode 100644 addons/hr_goal/__openerp__.py
 create mode 100644 addons/hr_goal/goal.py
 create mode 100644 addons/hr_goal/view/criteria.xml
 create mode 100644 addons/hr_goal/view/definition.xml
 create mode 100644 addons/hr_goal/view/instance.xml
 create mode 100644 addons/hr_goal/view/preset.xml

diff --git a/addons/hr_goal/__init__.py b/addons/hr_goal/__init__.py
new file mode 100644
index 00000000000..7c0f769d0b0
--- /dev/null
+++ b/addons/hr_goal/__init__.py
@@ -0,0 +1 @@
+import goal
\ No newline at end of file
diff --git a/addons/hr_goal/__openerp__.py b/addons/hr_goal/__openerp__.py
new file mode 100644
index 00000000000..187fb15b121
--- /dev/null
+++ b/addons/hr_goal/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Goal',
+    'version': '1.0',
+    'author': 'OpenERP SA',
+    'category': 'Human Resources',
+    'depends': ['base', 'hr'],
+    'description': """HR Goal definition
+
+Defined goals to users""",
+
+    'data': [
+        'view/criteria.xml',
+        'view/definition.xml',
+        'view/instance.xml',
+        'view/preset.xml',
+    ],
+    'installable': True,
+    'application': True,
+}
diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
new file mode 100644
index 00000000000..19551b2c24c
--- /dev/null
+++ b/addons/hr_goal/goal.py
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+from datetime import date
+
+class hr_goal_criteria(osv.Model):
+	"""Goal criteria definition
+
+	A criteria defining a way to set an objective and evaluate it
+	Each module wanting to be able to set goals to the users needs to create
+	a new goal_criteria
+	"""
+	_name = 'hr.goal.criteria'
+	_description = 'Goal criteria'
+
+	def get_evaluated_field_value(self, cr, user, ids, vals, context=None):
+		"""Return the type of the 'evaluated_field' field"""
+		for item in self.browse(cr, user, ids, context=context):
+			return item.evaluated_field.ttype
+
+	_columns = {
+        'name': fields.char('Name'),
+        'description': fields.char('Description'),
+    	'evaluated_field': fields.many2one('ir.model.fields', 
+    		string='Evaluated field'),
+    }
+
+class hr_goal(osv.Model):
+	"""Goal instance for a user
+
+	An individual goal for a user on a specified time period
+	"""
+
+	_name = 'hr.goal.instance'
+	_description = 'Goal instance'
+
+	_columns = {
+		'criteria_id' : fields.many2one('hr.goal.criteria', string='Criteria'),
+		'user_id' : fields.many2one('res.users', string='User'),
+		'start_date' : fields.date('Start date'),
+		'end_date' : fields.date('End date'),
+		'to_reach' : fields.char('To reach'),
+		'current' : fields.char('Current'),
+	}
+
+	def _compute_default_end_date(self, cr, uid, ids, field_name, arg, 
+		context=None):
+		hr_goal = self.browse(cr, uid, ids, context)
+		if hr_goal.start_date:
+			return hr_goal.start_date + datetime.timedelta(days=1)
+		else:
+			return fields.date.today() + datetime.timedelta(days=1)
+
+	_defaults = {
+        'start_date': fields.date.today,
+        'end_date': _compute_default_end_date,
+        'current': "",
+    }
+
+
+
+class hr_goal_definition(osv.Model):
+	"""Goal definition
+
+	Predifined goal for 'hr_goal_preset'
+	"""
+
+	_name = 'hr.goal.definition'
+	_description = 'Goal definition'
+
+	_columns = {
+		'criteria_id' : fields.many2one('hr.goal.criteria',
+			string='Criteria'),
+		'default_to_reach' : fields.char('Default value to reach'),
+	}
+
+
+class hr_goal_preset(osv.Model):
+	"""Goal preset
+
+	Set of predifined goals to be able to automate goal settings or
+	quickly apply several goals manually
+
+	If both 'group_id' and 'period' are defined, the set will be assigned to the
+	group for each period (eg: every 1st of each month if 'monthly' is selected)
+	"""
+
+	_name = 'hr.goal.preset'
+	_description = 'Goal preset'
+
+	_columns = {
+		'name' : fields.char('Set name'),
+		'definition_id' : fields.many2many('hr.goal.definition',
+			string='Definition'),
+		'group_id' : fields.many2one('res.groups', string='Group'),
+		'period' : fields.selection(
+			(
+				('n','No automatic assigment'),
+				('d','Daily'),
+				('m','Monthly'),
+				('y', 'Yearly')
+			),
+                   string='Period',
+                   description='Period of automatic goal assigment, ignored if no group is selected'),
+		}
+
+	_defaults = {
+        'period': 'n',
+    }
\ No newline at end of file
diff --git a/addons/hr_goal/view/criteria.xml b/addons/hr_goal/view/criteria.xml
new file mode 100644
index 00000000000..8e47f656c10
--- /dev/null
+++ b/addons/hr_goal/view/criteria.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="criteria_list_action" model="ir.actions.act_window">
+            <field name="name">Criterias</field>
+            <field name="res_model">hr.goal.criteria</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem id="root_menu" name="Goals"/>
+
+        <menuitem id="goal_menu" name="Goals" parent="root_menu"/>
+
+        <menuitem id="criterias_menu" parent="goal_menu"
+            action="criteria_list_action"/>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/definition.xml b/addons/hr_goal/view/definition.xml
new file mode 100644
index 00000000000..47241f6710b
--- /dev/null
+++ b/addons/hr_goal/view/definition.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="definition_list_action" model="ir.actions.act_window">
+            <field name="name">Goal definitions</field>
+            <field name="res_model">hr.goal.definition</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem id="predifined_menu" name="Predifined" parent="root_menu"/>
+
+        <menuitem id="definitions_menu" parent="predifined_menu"
+            action="definition_list_action"/>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/instance.xml b/addons/hr_goal/view/instance.xml
new file mode 100644
index 00000000000..d89f2f1ca22
--- /dev/null
+++ b/addons/hr_goal/view/instance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="instance_list_action" model="ir.actions.act_window">
+            <field name="name">Goals</field>
+            <field name="res_model">hr.goal.instance</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem id="instances_menu" parent="goal_menu"
+            action="instance_list_action"/>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/preset.xml b/addons/hr_goal/view/preset.xml
new file mode 100644
index 00000000000..270149b812e
--- /dev/null
+++ b/addons/hr_goal/view/preset.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="preset_list_action" model="ir.actions.act_window">
+            <field name="name">Presets</field>
+            <field name="res_model">hr.goal.preset</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem id="presets_menu" parent="predifined_menu"
+            action="preset_list_action"/>
+    </data>
+</openerp>
\ No newline at end of file

From 13bef9108d6781a7936aa79ad88fe030a319ee0e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Feb 2013 10:21:51 +0100
Subject: [PATCH 018/547] [IMP] usage of float instead of char for goals

bzr revid: mat@openerp.com-20130214092151-5vn2hki2td0lirc6
---
 addons/hr_goal/goal.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 19551b2c24c..0fd5da3a16a 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -33,11 +33,6 @@ class hr_goal_criteria(osv.Model):
 	_name = 'hr.goal.criteria'
 	_description = 'Goal criteria'
 
-	def get_evaluated_field_value(self, cr, user, ids, vals, context=None):
-		"""Return the type of the 'evaluated_field' field"""
-		for item in self.browse(cr, user, ids, context=context):
-			return item.evaluated_field.ttype
-
 	_columns = {
         'name': fields.char('Name'),
         'description': fields.char('Description'),
@@ -59,8 +54,8 @@ class hr_goal(osv.Model):
 		'user_id' : fields.many2one('res.users', string='User'),
 		'start_date' : fields.date('Start date'),
 		'end_date' : fields.date('End date'),
-		'to_reach' : fields.char('To reach'),
-		'current' : fields.char('Current'),
+		'to_reach' : fields.float('To reach'),
+		'current' : fields.float('Current'),
 	}
 
 	def _compute_default_end_date(self, cr, uid, ids, field_name, arg, 
@@ -91,7 +86,7 @@ class hr_goal_definition(osv.Model):
 	_columns = {
 		'criteria_id' : fields.many2one('hr.goal.criteria',
 			string='Criteria'),
-		'default_to_reach' : fields.char('Default value to reach'),
+		'default_to_reach' : fields.float('Default value to reach'),
 	}
 
 
@@ -126,4 +121,4 @@ class hr_goal_preset(osv.Model):
 
 	_defaults = {
         'period': 'n',
-    }
\ No newline at end of file
+    }

From 759bd008b9e72b6d9cf03adc654da45bbd92c65d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Feb 2013 18:07:36 +0100
Subject: [PATCH 019/547] [IMP] match new specifications of gamification module

bzr revid: mat@openerp.com-20130214170736-rzzji6pbk24i3u25
---
 addons/hr_goal/__openerp__.py    |  16 +--
 addons/hr_goal/goal.py           | 220 ++++++++++++++++++++-----------
 addons/hr_goal/view/criteria.xml |  17 ---
 addons/hr_goal/view/type.xml     |  16 +++
 4 files changed, 164 insertions(+), 105 deletions(-)
 delete mode 100644 addons/hr_goal/view/criteria.xml
 create mode 100644 addons/hr_goal/view/type.xml

diff --git a/addons/hr_goal/__openerp__.py b/addons/hr_goal/__openerp__.py
index 187fb15b121..9d3a299a926 100644
--- a/addons/hr_goal/__openerp__.py
+++ b/addons/hr_goal/__openerp__.py
@@ -19,20 +19,18 @@
 #
 ##############################################################################
 {
-    'name': 'Goal',
+    'name': 'Gamification',
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'depends': ['base', 'hr'],
-    'description': """HR Goal definition
-
-Defined goals to users""",
+    'depends': ['mail'],
+    'description': """Gamification of goals""",
 
     'data': [
-        'view/criteria.xml',
-        'view/definition.xml',
-        'view/instance.xml',
-        'view/preset.xml',
+        'view/type.xml',
+        # 'view/definition.xml',
+        # 'view/instance.xml',
+        # 'view/preset.xml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 0fd5da3a16a..5f2c420add9 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -23,102 +23,164 @@ from openerp.osv import fields, osv
 
 from datetime import date
 
-class hr_goal_criteria(osv.Model):
-	"""Goal criteria definition
+GAMIFICATION_GOAL_STATUS = [
+    ('inprogress','In progress'),
+    ('reached','Reached'),
+    ('failed','Failed'),
+]
 
-	A criteria defining a way to set an objective and evaluate it
-	Each module wanting to be able to set goals to the users needs to create
-	a new goal_criteria
-	"""
-	_name = 'hr.goal.criteria'
-	_description = 'Goal criteria'
+# I don't see why it would be different but just in case...
+GAMIFICATION_PLAN_STATUS = GAMIFICATION_GOAL_STATUS
 
-	_columns = {
-        'name': fields.char('Name'),
+GAMIFICATION_PERIOD_STATUS = [
+    ('once','No automatic assigment'),
+    ('daily','Daily'),
+    ('weekly','Weekly'),
+    ('monthly','Monthly'),
+    ('yearly', 'Yearly')
+]
+
+class gamification_goal_type(osv.Model):
+    """Goal type definition
+
+    A goal type defining a way to set an objective and evaluate it
+    Each module wanting to be able to set goals to the users needs to create
+    a new gamification_goal_type
+    """
+    _name = 'gamification.goal.type'
+    _description = 'Gamification goal type'
+
+    _columns = {
+        'name': fields.char('Name', required=True),
         'description': fields.char('Description'),
-    	'evaluated_field': fields.many2one('ir.model.fields', 
-    		string='Evaluated field'),
+        'computation_mode': fields.selection(
+            (
+                ('s','Sum'),
+                ('c','Count'),
+                ('m','Manually'),
+            ),
+            string="Mode of computation",
+            description="""How is computed the goal value :
+- 'Sum' for the total of the values if the 'Evaluated field'
+- 'Count' for the number of entries
+- 'Manually' for user defined values""",
+            required=True),
+        'object': fields.many2one('ir.model',
+            string='Object',
+            description='The object type for the field to evaluate' ),
+        'field': fields.many2one('ir.model.fields',
+            string='Evaluated field',
+            description='The field containing the value to evaluate' ),
+        'field_date': fields.many2one('ir.model.fields',
+            string='Evaluated date field',
+            description='The date to use for the time period evaluated'),
+        'domain': fields.char("Domain"), # how to apply it ?
+        'condition' : fields.selection(
+            (
+                ('minus','<='),
+                ('plus','>=')
+            ),
+            string='Validation condition',
+            description='A goal is considered as completed when the current value is compared to the value to reach'),
+        'sequence' : fields.integer('Sequence',
+            description='Sequence number for ordering',
+            required=True),
+    }
+    
+    _defaults = {
+        'sequence': 0,
+        'condition': 'plus',
     }
 
-class hr_goal(osv.Model):
-	"""Goal instance for a user
 
-	An individual goal for a user on a specified time period
-	"""
+class gamification_goal(osv.Model):
+    """Goal instance for a user
 
-	_name = 'hr.goal.instance'
-	_description = 'Goal instance'
+    An individual goal for a user on a specified time period
+    """
 
-	_columns = {
-		'criteria_id' : fields.many2one('hr.goal.criteria', string='Criteria'),
-		'user_id' : fields.many2one('res.users', string='User'),
-		'start_date' : fields.date('Start date'),
-		'end_date' : fields.date('End date'),
-		'to_reach' : fields.float('To reach'),
-		'current' : fields.float('Current'),
-	}
+    _name = 'gamification.goal'
+    _description = 'Gamification goal instance'
+    _inherit = 'mail.thread'
 
-	def _compute_default_end_date(self, cr, uid, ids, field_name, arg, 
-		context=None):
-		hr_goal = self.browse(cr, uid, ids, context)
-		if hr_goal.start_date:
-			return hr_goal.start_date + datetime.timedelta(days=1)
-		else:
-			return fields.date.today() + datetime.timedelta(days=1)
+    _columns = {
+        'type_id' : fields.many2one('gamification.goal.type', 
+            string='Goal type',
+            required=True),
+        'user_id' : fields.many2one('res.users', string='User', required=True),
+        'plan_id' : fields.many2one('gamification.goal.plan',
+            string='Goal plan'),
+        'start_date' : fields.date('Start date'),
+        'end_date' : fields.date('End date'), # no start and end = always active
+        'target_goal' : fields.float('To reach',
+            required=True,
+            track_visibility = 'always'), # no goal = global index
+        'current' : fields.float('Current',
+            required=True,
+            track_visibility = 'always'),
+        'status': fields.selection(GAMIFICATION_GOAL_STATUS,
+            string='Status',
+            required=True,
+            track_visibility = 'always'),
+    }
 
-	_defaults = {
+    _defaults = {
         'start_date': fields.date.today,
-        'end_date': _compute_default_end_date,
-        'current': "",
+        'current': 0,
+        'status': 'inprogress',
     }
 
 
+class gamification_goal_plan(osv.Model):
+    """Ga;ification goal plan
 
-class hr_goal_definition(osv.Model):
-	"""Goal definition
+    Set of predifined goals to be able to automate goal settings or
+    quickly apply several goals manually to a group of users
 
-	Predifined goal for 'hr_goal_preset'
-	"""
+    If 'user_ids' is defined and 'period' is different than 'one', the set will
+    be assigned to the users for each period (eg: every 1st of each month if 
+        'monthly' is selected)
+    """
 
-	_name = 'hr.goal.definition'
-	_description = 'Goal definition'
+    _name = 'gamification.goal.plan'
+    _description = 'Gamification goal plan'
 
-	_columns = {
-		'criteria_id' : fields.many2one('hr.goal.criteria',
-			string='Criteria'),
-		'default_to_reach' : fields.float('Default value to reach'),
-	}
+    _columns = {
+        'name' : fields.char('Plan name', required=True),
+        'user_ids' : fields.many2many('res.users',
+            string='Definition',
+            description="list of users to which the goal will be set"),
+        'group_id' : fields.many2one('res.groups', string='Group'),
+        'period' : fields.selection(GAMIFICATION_PERIOD_STATUS,
+            string='Period',
+            description='Period of automatic goal assigment, will be done manually if none is selected',
+            required=True),
+        'status': fields.selection(GAMIFICATION_PLAN_STATUS,
+            string='Status',
+            required=True),
+        }
 
-
-class hr_goal_preset(osv.Model):
-	"""Goal preset
-
-	Set of predifined goals to be able to automate goal settings or
-	quickly apply several goals manually
-
-	If both 'group_id' and 'period' are defined, the set will be assigned to the
-	group for each period (eg: every 1st of each month if 'monthly' is selected)
-	"""
-
-	_name = 'hr.goal.preset'
-	_description = 'Goal preset'
-
-	_columns = {
-		'name' : fields.char('Set name'),
-		'definition_id' : fields.many2many('hr.goal.definition',
-			string='Definition'),
-		'group_id' : fields.many2one('res.groups', string='Group'),
-		'period' : fields.selection(
-			(
-				('n','No automatic assigment'),
-				('d','Daily'),
-				('m','Monthly'),
-				('y', 'Yearly')
-			),
-                   string='Period',
-                   description='Period of automatic goal assigment, ignored if no group is selected'),
-		}
-
-	_defaults = {
-        'period': 'n',
+    _defaults = {
+        'period': 'once',
+        'status': 'inprogress',
+    }
+
+
+class gamification_goal_planline(osv.Model):
+    """Gamification goal planline
+
+    Predifined goal for 'gamification_goal_plan'
+    These are generic list of goals with only the target goal defined
+    Should only be created for the gamification_goal_plan object
+    """
+
+    _name = 'gamification.goal.planline'
+    _description = 'Gamification generic goal for plan'
+
+    _columns = {
+        'plan_id' : fields.many2one('gamification.goal.plan',
+            string='Plan'),
+        'type_id' : fields.many2one('gamification.goal.type',
+            string='Goal type'),
+        'target_goal' : fields.float('Target value to reach'),
     }
diff --git a/addons/hr_goal/view/criteria.xml b/addons/hr_goal/view/criteria.xml
deleted file mode 100644
index 8e47f656c10..00000000000
--- a/addons/hr_goal/view/criteria.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="criteria_list_action" model="ir.actions.act_window">
-            <field name="name">Criterias</field>
-            <field name="res_model">hr.goal.criteria</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="root_menu" name="Goals"/>
-
-        <menuitem id="goal_menu" name="Goals" parent="root_menu"/>
-
-        <menuitem id="criterias_menu" parent="goal_menu"
-            action="criteria_list_action"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/type.xml b/addons/hr_goal/view/type.xml
new file mode 100644
index 00000000000..5f33de1761e
--- /dev/null
+++ b/addons/hr_goal/view/type.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="goal_list_action" model="ir.actions.act_window">
+            <field name="name">Gamification</field>
+            <field name="res_model">gamification.goal.type</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <!-- <menuitem id="root_menu" name="Gamification"/> -->
+        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
+        <menuitem id="courses_menu" parent="gamification_menu" action="goal_list_action"/>
+
+    </data>
+</openerp>
\ No newline at end of file

From bad8fff69c61d1b6e5759865de6b9a500b8cffba Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 10:16:38 +0100
Subject: [PATCH 020/547] [REF] better definition of gamification models

bzr revid: mat@openerp.com-20130215091638-f1ipm1p9cp2s88p9
---
 addons/hr_goal/goal.py | 49 +++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 5f2c420add9..59cdc7c5f72 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -40,6 +40,18 @@ GAMIFICATION_PERIOD_STATUS = [
     ('yearly', 'Yearly')
 ]
 
+GAMIFICATION_COMPUTATION_MODE = [
+    ('sum','Sum'),
+    ('count','Count'),
+    ('manually','Manually')
+]
+
+GAMIFICATION_VALIDATION_CONDITION = [
+    ('minus','<='),
+    ('plus','>=')
+]
+
+
 class gamification_goal_type(osv.Model):
     """Goal type definition
 
@@ -52,44 +64,37 @@ class gamification_goal_type(osv.Model):
 
     _columns = {
         'name': fields.char('Name', required=True),
-        'description': fields.char('Description'),
-        'computation_mode': fields.selection(
-            (
-                ('s','Sum'),
-                ('c','Count'),
-                ('m','Manually'),
-            ),
+        'description': fields.text('Description'),
+        'computation_mode': fields.selection(GAMIFICATION_COMPUTATION_MODE,
             string="Mode of computation",
-            description="""How is computed the goal value :
-- 'Sum' for the total of the values if the 'Evaluated field'
-- 'Count' for the number of entries
+            help="""How is computed the goal value :\n
+- 'Sum' for the total of the values if the 'Evaluated field'\n
+- 'Count' for the number of entries\n
 - 'Manually' for user defined values""",
             required=True),
         'object': fields.many2one('ir.model',
             string='Object',
-            description='The object type for the field to evaluate' ),
+            help='The object type for the field to evaluate' ),
         'field': fields.many2one('ir.model.fields',
             string='Evaluated field',
-            description='The field containing the value to evaluate' ),
+            help='The field containing the value to evaluate' ),
         'field_date': fields.many2one('ir.model.fields',
             string='Evaluated date field',
-            description='The date to use for the time period evaluated'),
+            help='The date to use for the time period evaluated'),
         'domain': fields.char("Domain"), # how to apply it ?
-        'condition' : fields.selection(
-            (
-                ('minus','<='),
-                ('plus','>=')
-            ),
+        'condition' : fields.selection(GAMIFICATION_VALIDATION_CONDITION,
             string='Validation condition',
-            description='A goal is considered as completed when the current value is compared to the value to reach'),
+            help='A goal is considered as completed when the current value is compared to the value to reach',
+            required=True),
         'sequence' : fields.integer('Sequence',
-            description='Sequence number for ordering',
+            help='Sequence number for ordering',
             required=True),
     }
     
     _defaults = {
         'sequence': 0,
         'condition': 'plus',
+        'computation_mode':'manually',
     }
 
 
@@ -149,11 +154,11 @@ class gamification_goal_plan(osv.Model):
         'name' : fields.char('Plan name', required=True),
         'user_ids' : fields.many2many('res.users',
             string='Definition',
-            description="list of users to which the goal will be set"),
+            help="list of users to which the goal will be set"),
         'group_id' : fields.many2one('res.groups', string='Group'),
         'period' : fields.selection(GAMIFICATION_PERIOD_STATUS,
             string='Period',
-            description='Period of automatic goal assigment, will be done manually if none is selected',
+            help='Period of automatic goal assigment, will be done manually if none is selected',
             required=True),
         'status': fields.selection(GAMIFICATION_PLAN_STATUS,
             string='Status',

From 77a3ff7ca7d63874dcad3106b83ce620031e0a8c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 10:24:07 +0100
Subject: [PATCH 021/547] [IMP] views for gamification goal types in Settings
 menu

bzr revid: mat@openerp.com-20130215092407-gyu3112u4kkpf980
---
 addons/hr_goal/__openerp__.py |  1 +
 addons/hr_goal/view/type.xml  | 46 ++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/addons/hr_goal/__openerp__.py b/addons/hr_goal/__openerp__.py
index 9d3a299a926..08854e9cf23 100644
--- a/addons/hr_goal/__openerp__.py
+++ b/addons/hr_goal/__openerp__.py
@@ -27,6 +27,7 @@
     'description': """Gamification of goals""",
 
     'data': [
+        'view/menu.xml',
         'view/type.xml',
         # 'view/definition.xml',
         # 'view/instance.xml',
diff --git a/addons/hr_goal/view/type.xml b/addons/hr_goal/view/type.xml
index 5f33de1761e..bfcf7c93b62 100644
--- a/addons/hr_goal/view/type.xml
+++ b/addons/hr_goal/view/type.xml
@@ -3,14 +3,52 @@
     <data>
 
         <record id="goal_list_action" model="ir.actions.act_window">
-            <field name="name">Gamification</field>
+            <field name="name">Goal types</field>
             <field name="res_model">gamification.goal.type</field>
             <field name="view_mode">tree,form</field>
         </record>
 
-        <!-- <menuitem id="root_menu" name="Gamification"/> -->
-        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
-        <menuitem id="courses_menu" parent="gamification_menu" action="goal_list_action"/>
+        <record id="goal_type_list_view" model="ir.ui.view">
+            <field name="name">Goal types list</field>
+            <field name="model">gamification.goal.type</field>
+            <field name="arch" type="xml">
+                <tree string="Goal types">
+                    <field name="name"/>
+                    <field name="computation_mode"/>
+                    <field name="field"/>
+                    <field name="domain"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="goal_type_form_view" model="ir.ui.view">
+            <field name="name">Goal types form</field>
+            <field name="model">gamification.goal.type</field>
+            <field name="arch" type="xml">
+                <form string="Goal types" version="7.0">
+                    <sheet>
+                        <h1>
+                            <field name="name" placeholder="Goal type name"/>
+                        </h1>
+                        <group>
+                            <group string="General">
+                                <field name="description"/>
+                                <field name="sequence"/>
+                                <field name="condition"/>
+                            </group>
+                            <group string="Computation">
+                                <field name="computation_mode"/>
+                                <field name="object"/>
+                                <field name="field"/>
+                                <field name="field_date"/>
+                                <field name="domain"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
 
     </data>
 </openerp>
\ No newline at end of file

From e14c3a95d8424ccc01754ec3e9d84fa6180e52be Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 11:42:14 +0100
Subject: [PATCH 022/547] [ADD] gamification:view for the goal object

bzr revid: mat@openerp.com-20130215104214-ebpw2uglqg7h4byc
---
 addons/hr_goal/__openerp__.py    |  8 ++--
 addons/hr_goal/goal.py           |  1 -
 addons/hr_goal/view/goal.xml     | 67 ++++++++++++++++++++++++++++++++
 addons/hr_goal/view/instance.xml | 13 -------
 addons/hr_goal/view/type.xml     |  2 +-
 5 files changed, 71 insertions(+), 20 deletions(-)
 create mode 100644 addons/hr_goal/view/goal.xml
 delete mode 100644 addons/hr_goal/view/instance.xml

diff --git a/addons/hr_goal/__openerp__.py b/addons/hr_goal/__openerp__.py
index 08854e9cf23..cc2a70dffbb 100644
--- a/addons/hr_goal/__openerp__.py
+++ b/addons/hr_goal/__openerp__.py
@@ -27,12 +27,10 @@
     'description': """Gamification of goals""",
 
     'data': [
-        'view/menu.xml',
         'view/type.xml',
-        # 'view/definition.xml',
-        # 'view/instance.xml',
-        # 'view/preset.xml',
-    ],
+        'view/goal.xml',
+        'view/menu.xml',
+        ],
     'installable': True,
     'application': True,
 }
diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 59cdc7c5f72..88c26a1767c 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -130,7 +130,6 @@ class gamification_goal(osv.Model):
     }
 
     _defaults = {
-        'start_date': fields.date.today,
         'current': 0,
         'status': 'inprogress',
     }
diff --git a/addons/hr_goal/view/goal.xml b/addons/hr_goal/view/goal.xml
new file mode 100644
index 00000000000..3b60aac1976
--- /dev/null
+++ b/addons/hr_goal/view/goal.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="goal_list_action" model="ir.actions.act_window">
+            <field name="name">Goals</field>
+            <field name="res_model">gamification.goal</field>
+            <field name="view_mode">tree,form,calendar</field>
+        </record>
+
+        <record id="goal_list_view" model="ir.ui.view">
+            <field name="name">Goal list</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <tree string="Goal list" colors="red:status == 'failed';green:status == 'reached'"> 
+                    <field name="type_id"/>
+                    <field name="user_id"/>
+                    <field name="current"/>
+                    <field name="target_goal"/>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="status" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+		
+		<record id="goal_form_view" model="ir.ui.view">
+            <field name="name">Goal form</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <form string="Goal" version="7.0">
+                    <sheet>
+                        <group>
+                            <group string="Reference">
+                                <field name="type_id"/>
+                                <field name="user_id"/>
+                                <field name="plan_id"/>
+                            </group>
+                            <group string="Schedule">
+                                <field name="start_date"/>
+                                <field name="end_date"/>
+                            </group>
+                            <group string="Data">
+                                <field name="target_goal"/>
+                                <field name="current"/>
+                                <field name="status"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="goal_calendar_view" model="ir.ui.view">
+            <field name="name">Goal calendar</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <calendar string="Goal"
+                        date_start="start_date"
+                        date_stop="end_date"
+                        color="type_id">
+                    <field name="type_id"/>
+                </calendar>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/instance.xml b/addons/hr_goal/view/instance.xml
deleted file mode 100644
index d89f2f1ca22..00000000000
--- a/addons/hr_goal/view/instance.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="instance_list_action" model="ir.actions.act_window">
-            <field name="name">Goals</field>
-            <field name="res_model">hr.goal.instance</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="instances_menu" parent="goal_menu"
-            action="instance_list_action"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/type.xml b/addons/hr_goal/view/type.xml
index bfcf7c93b62..c189685e4e2 100644
--- a/addons/hr_goal/view/type.xml
+++ b/addons/hr_goal/view/type.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="goal_list_action" model="ir.actions.act_window">
+        <record id="goal_type_list_action" model="ir.actions.act_window">
             <field name="name">Goal types</field>
             <field name="res_model">gamification.goal.type</field>
             <field name="view_mode">tree,form</field>

From 357c08da1704fd83f6638088b55710161cc2a6bf Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 11:44:17 +0100
Subject: [PATCH 023/547] [FIX] add gamification menu view

bzr revid: mat@openerp.com-20130215104417-zisq806feo4l45hy
---
 addons/hr_goal/view/menu.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 addons/hr_goal/view/menu.xml

diff --git a/addons/hr_goal/view/menu.xml b/addons/hr_goal/view/menu.xml
new file mode 100644
index 00000000000..e699f445591
--- /dev/null
+++ b/addons/hr_goal/view/menu.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <!-- <menuitem id="root_menu" name="Gamification"/> -->
+        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
+        <!-- Goal types -->
+        <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action"/>
+        <!-- Goals -->
+        <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action"/>
+
+    </data>
+</openerp>
\ No newline at end of file

From 5dfd8de04dd3cf3de4e4ffc84fb0407036c9c232 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 12:03:58 +0100
Subject: [PATCH 024/547] [REF] changing gamification goal plan status
 possibilities

bzr revid: mat@openerp.com-20130215110358-o52snkry52mtdm3z
---
 addons/hr_goal/goal.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 88c26a1767c..ae2c773fff9 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -29,8 +29,11 @@ GAMIFICATION_GOAL_STATUS = [
     ('failed','Failed'),
 ]
 
-# I don't see why it would be different but just in case...
-GAMIFICATION_PLAN_STATUS = GAMIFICATION_GOAL_STATUS
+GAMIFICATION_PLAN_STATUS = [
+    ('draft','Draft'),
+    ('inprogress','In progress'),
+    ('done','Done'),
+]
 
 GAMIFICATION_PERIOD_STATUS = [
     ('once','No automatic assigment'),

From ca712230e2b0cf2927971ce3a8715e9ae8a015e7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 14:09:21 +0100
Subject: [PATCH 025/547] [ADD] plan views for gamification moduel

bzr revid: mat@openerp.com-20130215130921-ca64o47syxn6vob1
---
 addons/hr_goal/__openerp__.py      |  1 +
 addons/hr_goal/goal.py             |  6 ++-
 addons/hr_goal/view/definition.xml | 15 ------
 addons/hr_goal/view/menu.xml       | 12 ++---
 addons/hr_goal/view/plan.xml       | 73 ++++++++++++++++++++++++++++++
 addons/hr_goal/view/preset.xml     | 13 ------
 6 files changed, 85 insertions(+), 35 deletions(-)
 delete mode 100644 addons/hr_goal/view/definition.xml
 create mode 100644 addons/hr_goal/view/plan.xml
 delete mode 100644 addons/hr_goal/view/preset.xml

diff --git a/addons/hr_goal/__openerp__.py b/addons/hr_goal/__openerp__.py
index cc2a70dffbb..896a5b4eb01 100644
--- a/addons/hr_goal/__openerp__.py
+++ b/addons/hr_goal/__openerp__.py
@@ -29,6 +29,7 @@
     'data': [
         'view/type.xml',
         'view/goal.xml',
+        'view/plan.xml',
         'view/menu.xml',
         ],
     'installable': True,
diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index ae2c773fff9..03a1f741440 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -155,8 +155,12 @@ class gamification_goal_plan(osv.Model):
     _columns = {
         'name' : fields.char('Plan name', required=True),
         'user_ids' : fields.many2many('res.users',
-            string='Definition',
+            string='Users',
             help="list of users to which the goal will be set"),
+        'planline_ids' : fields.one2many('gamification.goal.planline',
+            'plan_id',
+            string='Planline',
+            help="list of goals that will be set"),
         'group_id' : fields.many2one('res.groups', string='Group'),
         'period' : fields.selection(GAMIFICATION_PERIOD_STATUS,
             string='Period',
diff --git a/addons/hr_goal/view/definition.xml b/addons/hr_goal/view/definition.xml
deleted file mode 100644
index 47241f6710b..00000000000
--- a/addons/hr_goal/view/definition.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="definition_list_action" model="ir.actions.act_window">
-            <field name="name">Goal definitions</field>
-            <field name="res_model">hr.goal.definition</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="predifined_menu" name="Predifined" parent="root_menu"/>
-
-        <menuitem id="definitions_menu" parent="predifined_menu"
-            action="definition_list_action"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/menu.xml b/addons/hr_goal/view/menu.xml
index e699f445591..f26feb1ffef 100644
--- a/addons/hr_goal/view/menu.xml
+++ b/addons/hr_goal/view/menu.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-
         <!-- <menuitem id="root_menu" name="Gamification"/> -->
         <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
-        <!-- Goal types -->
-        <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action"/>
-        <!-- Goals -->
-        <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action"/>
-
+        	<!-- Goals -->
+        	<menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
+			<!-- Goal plans -->
+        	<menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
+        	<!-- Goal types -->
+        	<menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml
new file mode 100644
index 00000000000..3d9760bd37d
--- /dev/null
+++ b/addons/hr_goal/view/plan.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="goal_plan_list_action" model="ir.actions.act_window">
+            <field name="name">Goal plans</field>
+            <field name="res_model">gamification.goal.plan</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="goal_plan_list_view" model="ir.ui.view">
+            <field name="name">Goal plans list</field>
+            <field name="model">gamification.goal.plan</field>
+            <field name="arch" type="xml">
+                <tree string="Goal types" colors="blue:status == 'inprogress';grey:status == 'done'">
+                    <field name="name"/>
+                    <field name="period"/>
+                    <field name="status" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="goal_type_form_view" model="ir.ui.view">
+            <field name="name">Goal plan form</field>
+            <field name="model">gamification.goal.plan</field>
+            <field name="arch" type="xml">
+                <form string="Goal types" version="7.0">
+                    <sheet>
+                        <h1>
+                            <field name="name" placeholder="Goal plan name"/>
+                        </h1>
+                        <group>
+                            <group string="General">
+                                <field name="period"/>
+                                <field name="status"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Goals">
+                                <field name="planline_ids"/>
+                            </page>
+                            <page string="Subscription">
+                                <group>
+                                    <field name="group_id" string="Group" />
+                                </group>
+                                <group>
+                                <field colspan="4" name="user_ids" widget="many2many_kanban">
+                                    <kanban quick_create="false" create="true">
+                                        <field name="name"/>
+                                        <templates>
+                                            <t t-name="kanban-box">
+                                                <div style="position: relative">
+                                                    <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
+                                                    <div class="oe_module_vignette">
+                                                        <div class="oe_module_desc">
+                                                            <field name="name"/>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </t>
+                                        </templates>
+                                    </kanban>
+                                </field>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_goal/view/preset.xml b/addons/hr_goal/view/preset.xml
deleted file mode 100644
index 270149b812e..00000000000
--- a/addons/hr_goal/view/preset.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="preset_list_action" model="ir.actions.act_window">
-            <field name="name">Presets</field>
-            <field name="res_model">hr.goal.preset</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="presets_menu" parent="predifined_menu"
-            action="preset_list_action"/>
-    </data>
-</openerp>
\ No newline at end of file

From 92c03ea75cd87381b09d01ac0dd7bafa922dfe9a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 14:32:34 +0100
Subject: [PATCH 026/547] [ADD] report for goal plans

bzr revid: mat@openerp.com-20130215133234-kp49lzfd5tjj1o7c
---
 addons/hr_goal/goal.py       | 30 +++++++++++++++++++++++++++++-
 addons/hr_goal/view/plan.xml | 10 ++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 03a1f741440..259b483583b 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -54,6 +54,19 @@ GAMIFICATION_VALIDATION_CONDITION = [
     ('plus','>=')
 ]
 
+GAMIFICATION_REPORT_MODE = [
+    ('board','Leader board'),
+    ('progressbar','Personal progressbar')
+]
+
+GAMIFICATION_REPORT_FREQ = [
+    ('onchange','On change'),
+    ('daily','Daily'),
+    ('weekly','Weekly'),
+    ('monthly','Monthly'),
+    ('yearly', 'Yearly')
+]
+
 
 class gamification_goal_type(osv.Model):
     """Goal type definition
@@ -161,7 +174,9 @@ class gamification_goal_plan(osv.Model):
             'plan_id',
             string='Planline',
             help="list of goals that will be set"),
-        'group_id' : fields.many2one('res.groups', string='Group'),
+        'autojoin_group_id' : fields.many2one('res.groups',
+            string='Group',
+            help='Group of users whose members will automatically be added to the users'),
         'period' : fields.selection(GAMIFICATION_PERIOD_STATUS,
             string='Period',
             help='Period of automatic goal assigment, will be done manually if none is selected',
@@ -169,11 +184,24 @@ class gamification_goal_plan(osv.Model):
         'status': fields.selection(GAMIFICATION_PLAN_STATUS,
             string='Status',
             required=True),
+        'report_mode':fields.selection(GAMIFICATION_REPORT_MODE,
+            string="Mode",
+            help='How is displayed the results, shared or in a signle progressbar',
+            required=True),
+        'report_message_frequency':fields.selection(GAMIFICATION_REPORT_FREQ,
+            string="Frequency",
+            required=True),
+        'report_message_group_id' : fields.many2one('mail.group',
+            string='Group',
+            help='Group that will receive the report in addition to the user'),
+        'report_header' : fields.text('Report header'),
         }
 
     _defaults = {
         'period': 'once',
         'status': 'inprogress',
+        'report_mode' : 'progressbar',
+        'report_message_frequency' : 'onchange',
     }
 
 
diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml
index 3d9760bd37d..8d177c5201b 100644
--- a/addons/hr_goal/view/plan.xml
+++ b/addons/hr_goal/view/plan.xml
@@ -30,10 +30,16 @@
                             <field name="name" placeholder="Goal plan name"/>
                         </h1>
                         <group>
-                            <group string="General">
+                            <group colspan="4">
                                 <field name="period"/>
                                 <field name="status"/>
                             </group>
+                            <group string="Report">
+                                <field name="report_mode"/>
+                                <field name="report_message_frequency"/>
+                                <field name="report_message_group_id"/>
+                                <field name="report_header"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Goals">
@@ -41,7 +47,7 @@
                             </page>
                             <page string="Subscription">
                                 <group>
-                                    <field name="group_id" string="Group" />
+                                    <field name="autojoin_group_id" string="Group" />
                                 </group>
                                 <group>
                                 <field colspan="4" name="user_ids" widget="many2many_kanban">

From 2004f2bcd7dcaebfcac66ded0f24530a00b1b67e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 14:59:40 +0100
Subject: [PATCH 027/547] [IMP] editable planline for gaming module

bzr revid: mat@openerp.com-20130215135940-mji5ype1wsteduob
---
 addons/hr_goal/view/plan.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml
index 8d177c5201b..d8e392020f1 100644
--- a/addons/hr_goal/view/plan.xml
+++ b/addons/hr_goal/view/plan.xml
@@ -43,7 +43,12 @@
                         </group>
                         <notebook>
                             <page string="Goals">
-                                <field name="planline_ids"/>
+                                <field name="planline_ids">
+                                    <tree string="planline list" version="7.0" editable="top" >
+                                        <field name="type_id"/>
+                                        <field name="target_goal"/>
+                                    </tree>
+                                </field>
                             </page>
                             <page string="Subscription">
                                 <group>
@@ -75,5 +80,18 @@
             </field>
         </record>
 
+
+        <!-- Planline -->
+        <record id="goal_planline_list_view" model="ir.ui.view">
+            <field name="name">Goal planline list</field>
+            <field name="model">gamification.goal.planline</field>
+            <field name="arch" type="xml">
+                <tree string="planline list" >
+                    <field name="type_id"/>
+                    <field name="target_goal"/>
+                </tree>
+            </field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file

From 8768bd81501adbda8bbe697eb74007333a78fa5e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 15:16:51 +0100
Subject: [PATCH 028/547] [IMP] gamification: use state instead of status

bzr revid: mat@openerp.com-20130215141651-5ktcyekk9subj6ji
---
 addons/hr_goal/goal.py       | 20 ++++++++++----------
 addons/hr_goal/view/goal.xml | 12 +++++++++---
 addons/hr_goal/view/plan.xml |  6 +++---
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 259b483583b..1808f0a9ec8 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -23,19 +23,19 @@ from openerp.osv import fields, osv
 
 from datetime import date
 
-GAMIFICATION_GOAL_STATUS = [
+GAMIFICATION_GOAL_STATE = [
     ('inprogress','In progress'),
     ('reached','Reached'),
     ('failed','Failed'),
 ]
 
-GAMIFICATION_PLAN_STATUS = [
+GAMIFICATION_PLAN_STATE = [
     ('draft','Draft'),
     ('inprogress','In progress'),
     ('done','Done'),
 ]
 
-GAMIFICATION_PERIOD_STATUS = [
+GAMIFICATION_PERIOD_STATE = [
     ('once','No automatic assigment'),
     ('daily','Daily'),
     ('weekly','Weekly'),
@@ -139,15 +139,15 @@ class gamification_goal(osv.Model):
         'current' : fields.float('Current',
             required=True,
             track_visibility = 'always'),
-        'status': fields.selection(GAMIFICATION_GOAL_STATUS,
-            string='Status',
+        'state': fields.selection(GAMIFICATION_GOAL_STATE,
+            string='State',
             required=True,
             track_visibility = 'always'),
     }
 
     _defaults = {
         'current': 0,
-        'status': 'inprogress',
+        'state': 'inprogress',
     }
 
 
@@ -177,12 +177,12 @@ class gamification_goal_plan(osv.Model):
         'autojoin_group_id' : fields.many2one('res.groups',
             string='Group',
             help='Group of users whose members will automatically be added to the users'),
-        'period' : fields.selection(GAMIFICATION_PERIOD_STATUS,
+        'period' : fields.selection(GAMIFICATION_PERIOD_STATE,
             string='Period',
             help='Period of automatic goal assigment, will be done manually if none is selected',
             required=True),
-        'status': fields.selection(GAMIFICATION_PLAN_STATUS,
-            string='Status',
+        'state': fields.selection(GAMIFICATION_PLAN_STATE,
+            string='State',
             required=True),
         'report_mode':fields.selection(GAMIFICATION_REPORT_MODE,
             string="Mode",
@@ -199,7 +199,7 @@ class gamification_goal_plan(osv.Model):
 
     _defaults = {
         'period': 'once',
-        'status': 'inprogress',
+        'state': 'inprogress',
         'report_mode' : 'progressbar',
         'report_message_frequency' : 'onchange',
     }
diff --git a/addons/hr_goal/view/goal.xml b/addons/hr_goal/view/goal.xml
index 3b60aac1976..84ecbc7b0a5 100644
--- a/addons/hr_goal/view/goal.xml
+++ b/addons/hr_goal/view/goal.xml
@@ -11,14 +11,14 @@
             <field name="name">Goal list</field>
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
-                <tree string="Goal list" colors="red:status == 'failed';green:status == 'reached'"> 
+                <tree string="Goal list" colors="red:state == 'failed';green:state == 'reached'"> 
                     <field name="type_id"/>
                     <field name="user_id"/>
                     <field name="current"/>
                     <field name="target_goal"/>
                     <field name="start_date"/>
                     <field name="end_date"/>
-                    <field name="status" invisible="1"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -28,6 +28,12 @@
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
+                    <header>
+                        <button string="Mark as reached" type="workflow" name="signal_reached" states="inprogress"/>
+                        <button string="Mark as failed" type="workflow" name="signal_failed" states="inprogress"/>
+                        <!-- <button string="Cancel completion" type="workflow" name="signal_cancel" states="failed,reached"/> -->
+                        <field name="state" widget="statusbar"/>
+                    </header>
                     <sheet>
                         <group>
                             <group string="Reference">
@@ -42,7 +48,7 @@
                             <group string="Data">
                                 <field name="target_goal"/>
                                 <field name="current"/>
-                                <field name="status"/>
+                                <field name="state"/>
                             </group>
                         </group>
                     </sheet>
diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml
index d8e392020f1..a4ab2148f1b 100644
--- a/addons/hr_goal/view/plan.xml
+++ b/addons/hr_goal/view/plan.xml
@@ -12,10 +12,10 @@
             <field name="name">Goal plans list</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
-                <tree string="Goal types" colors="blue:status == 'inprogress';grey:status == 'done'">
+                <tree string="Goal types" colors="blue:state == 'inprogress';grey:state == 'done'">
                     <field name="name"/>
                     <field name="period"/>
-                    <field name="status" invisible="1"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -32,7 +32,7 @@
                         <group>
                             <group colspan="4">
                                 <field name="period"/>
-                                <field name="status"/>
+                                <field name="state"/>
                             </group>
                             <group string="Report">
                                 <field name="report_mode"/>

From beefb1ef740977536e98cdb66df1ee60ffdc9db6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 15:29:41 +0100
Subject: [PATCH 029/547] [IMP] gamification: workflow buttons

bzr revid: mat@openerp.com-20130215142941-laoi71wkjlychxy1
---
 addons/hr_goal/view/plan.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml
index a4ab2148f1b..6a23f5c42bc 100644
--- a/addons/hr_goal/view/plan.xml
+++ b/addons/hr_goal/view/plan.xml
@@ -25,6 +25,12 @@
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
+                    <header>
+                        <button string="Start plan" type="workflow" name="signal_start" states="draft"/>
+                        <button string="Close plan" type="workflow" name="signal_close" states="inprogress"/>
+                        <button string="Cancel plan" type="workflow" name="signal_cancel" states="inprogress"/>
+                        <field name="state" widget="statusbar"/>
+                    </header>
                     <sheet>
                         <h1>
                             <field name="name" placeholder="Goal plan name"/>

From 44fa903585bc95a881bb50eab8a1e0fb3c3cc7ba Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 15:37:35 +0100
Subject: [PATCH 030/547] [IMP] gamification: no state field in forms

bzr revid: mat@openerp.com-20130215143735-l92r0s1bc51nopx8
---
 addons/hr_goal/view/goal.xml | 1 -
 addons/hr_goal/view/plan.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/addons/hr_goal/view/goal.xml b/addons/hr_goal/view/goal.xml
index 84ecbc7b0a5..ab4ee3f8b3d 100644
--- a/addons/hr_goal/view/goal.xml
+++ b/addons/hr_goal/view/goal.xml
@@ -48,7 +48,6 @@
                             <group string="Data">
                                 <field name="target_goal"/>
                                 <field name="current"/>
-                                <field name="state"/>
                             </group>
                         </group>
                     </sheet>
diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml
index 6a23f5c42bc..8618f64c37a 100644
--- a/addons/hr_goal/view/plan.xml
+++ b/addons/hr_goal/view/plan.xml
@@ -38,7 +38,6 @@
                         <group>
                             <group colspan="4">
                                 <field name="period"/>
-                                <field name="state"/>
                             </group>
                             <group string="Report">
                                 <field name="report_mode"/>

From aeb3ea30b3652ce7abba287347875e45e7cfe255 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 15:53:48 +0100
Subject: [PATCH 031/547] [FIX] gamification: fix form id for plan

bzr revid: mat@openerp.com-20130215145348-kfrh6eaj3z2k65bh
---
 addons/hr_goal/view/plan.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml
index 8618f64c37a..dca2c545354 100644
--- a/addons/hr_goal/view/plan.xml
+++ b/addons/hr_goal/view/plan.xml
@@ -20,7 +20,7 @@
             </field>
         </record>
 
-        <record id="goal_type_form_view" model="ir.ui.view">
+        <record id="goal_plan_form_view" model="ir.ui.view">
             <field name="name">Goal plan form</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">

From 2e0186dab07363220f75f91fa8b5236d142587a7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 15:54:15 +0100
Subject: [PATCH 032/547] [ADD] gamification: add completeness progressbar

bzr revid: mat@openerp.com-20130215145415-39cx5v3pf8mn5ye7
---
 addons/hr_goal/goal.py       | 14 ++++++++++++++
 addons/hr_goal/view/goal.xml |  1 +
 2 files changed, 15 insertions(+)

diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py
index 1808f0a9ec8..cc4c525deae 100644
--- a/addons/hr_goal/goal.py
+++ b/addons/hr_goal/goal.py
@@ -107,6 +107,7 @@ class gamification_goal_type(osv.Model):
             required=True),
     }
     
+    _order = 'sequence'
     _defaults = {
         'sequence': 0,
         'condition': 'plus',
@@ -124,6 +125,16 @@ class gamification_goal(osv.Model):
     _description = 'Gamification goal instance'
     _inherit = 'mail.thread'
 
+    def _get_completeness(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for goal in self.browse(cr, uid, ids, context):
+            # more 100% ?
+            if goal.target_goal > 0:
+                res[goal.id] = 100.0 * goal.current / goal.target_goal
+            else:
+                res[goal.id] = 0.0
+        return res
+
     _columns = {
         'type_id' : fields.many2one('gamification.goal.type', 
             string='Goal type',
@@ -139,6 +150,9 @@ class gamification_goal(osv.Model):
         'current' : fields.float('Current',
             required=True,
             track_visibility = 'always'),
+        'completeness': fields.function(_get_completeness,
+            type='float',
+            string='Occupation'),
         'state': fields.selection(GAMIFICATION_GOAL_STATE,
             string='State',
             required=True,
diff --git a/addons/hr_goal/view/goal.xml b/addons/hr_goal/view/goal.xml
index ab4ee3f8b3d..c711927044c 100644
--- a/addons/hr_goal/view/goal.xml
+++ b/addons/hr_goal/view/goal.xml
@@ -18,6 +18,7 @@
                     <field name="target_goal"/>
                     <field name="start_date"/>
                     <field name="end_date"/>
+                    <field name="completeness" widget="progressbar"/>
                     <field name="state" invisible="1"/>
                 </tree>
             </field>

From 73b558e3c37a5d74815937feb8309bf0ef334b8c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 16:05:20 +0100
Subject: [PATCH 033/547] [REF] gamification: change name of folder

bzr revid: mat@openerp.com-20130215150520-50fnb7rx690t8yq9
---
 addons/{hr_goal => gamification}/__init__.py    | 0
 addons/{hr_goal => gamification}/__openerp__.py | 0
 addons/{hr_goal => gamification}/goal.py        | 0
 addons/{hr_goal => gamification}/view/goal.xml  | 0
 addons/{hr_goal => gamification}/view/menu.xml  | 0
 addons/{hr_goal => gamification}/view/plan.xml  | 0
 addons/{hr_goal => gamification}/view/type.xml  | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename addons/{hr_goal => gamification}/__init__.py (100%)
 rename addons/{hr_goal => gamification}/__openerp__.py (100%)
 rename addons/{hr_goal => gamification}/goal.py (100%)
 rename addons/{hr_goal => gamification}/view/goal.xml (100%)
 rename addons/{hr_goal => gamification}/view/menu.xml (100%)
 rename addons/{hr_goal => gamification}/view/plan.xml (100%)
 rename addons/{hr_goal => gamification}/view/type.xml (100%)

diff --git a/addons/hr_goal/__init__.py b/addons/gamification/__init__.py
similarity index 100%
rename from addons/hr_goal/__init__.py
rename to addons/gamification/__init__.py
diff --git a/addons/hr_goal/__openerp__.py b/addons/gamification/__openerp__.py
similarity index 100%
rename from addons/hr_goal/__openerp__.py
rename to addons/gamification/__openerp__.py
diff --git a/addons/hr_goal/goal.py b/addons/gamification/goal.py
similarity index 100%
rename from addons/hr_goal/goal.py
rename to addons/gamification/goal.py
diff --git a/addons/hr_goal/view/goal.xml b/addons/gamification/view/goal.xml
similarity index 100%
rename from addons/hr_goal/view/goal.xml
rename to addons/gamification/view/goal.xml
diff --git a/addons/hr_goal/view/menu.xml b/addons/gamification/view/menu.xml
similarity index 100%
rename from addons/hr_goal/view/menu.xml
rename to addons/gamification/view/menu.xml
diff --git a/addons/hr_goal/view/plan.xml b/addons/gamification/view/plan.xml
similarity index 100%
rename from addons/hr_goal/view/plan.xml
rename to addons/gamification/view/plan.xml
diff --git a/addons/hr_goal/view/type.xml b/addons/gamification/view/type.xml
similarity index 100%
rename from addons/hr_goal/view/type.xml
rename to addons/gamification/view/type.xml

From 33be2c1b8aff3f5d631b824686a802ba423f48f3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 17:02:04 +0100
Subject: [PATCH 034/547] [IMP] gamification: change of state when using
 buttons

bzr revid: mat@openerp.com-20130215160204-0jt6yw01lytjgyto
---
 addons/gamification/goal.py       | 24 ++++++++++++++++++++++--
 addons/gamification/view/goal.xml |  6 +++---
 addons/gamification/view/plan.xml |  6 +++---
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index cc4c525deae..e77eb5ff922 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -164,6 +164,16 @@ class gamification_goal(osv.Model):
         'state': 'inprogress',
     }
 
+    def action_reach(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'reached'}, context=context)
+
+    def action_fail(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'failed'}, context=context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+
+
 
 class gamification_goal_plan(osv.Model):
     """Ga;ification goal plan
@@ -206,18 +216,28 @@ class gamification_goal_plan(osv.Model):
             string="Frequency",
             required=True),
         'report_message_group_id' : fields.many2one('mail.group',
-            string='Group',
+            string='Report to',
             help='Group that will receive the report in addition to the user'),
         'report_header' : fields.text('Report header'),
         }
 
     _defaults = {
         'period': 'once',
-        'state': 'inprogress',
+        'state': 'draft',
         'report_mode' : 'progressbar',
         'report_message_frequency' : 'onchange',
     }
 
+    def action_start(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+
+    def action_close(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+
+
 
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index c711927044c..80a44e92c2d 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -30,9 +30,9 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Mark as reached" type="workflow" name="signal_reached" states="inprogress"/>
-                        <button string="Mark as failed" type="workflow" name="signal_failed" states="inprogress"/>
-                        <!-- <button string="Cancel completion" type="workflow" name="signal_cancel" states="failed,reached"/> -->
+                        <button string="Mark as reached" type="object" name="action_reach" states="inprogress"/>
+                        <button string="Mark as failed" type="object" name="action_fail" states="inprogress"/>
+                        <button string="Cancel completion" type="object" name="action_cancel" states="failed,reached"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index dca2c545354..f29ca2f7c62 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -26,9 +26,9 @@
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <header>
-                        <button string="Start plan" type="workflow" name="signal_start" states="draft"/>
-                        <button string="Close plan" type="workflow" name="signal_close" states="inprogress"/>
-                        <button string="Cancel plan" type="workflow" name="signal_cancel" states="inprogress"/>
+                        <button string="Start plan" type="object" name="action_start" states="draft"/>
+                        <button string="Close plan" type="object" name="action_close" states="inprogress"/>
+                        <button string="Cancel plan" type="object" name="action_cancel" states="inprogress"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>

From 974d4b6af08e12e28323829b2231677eb7840c72 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Feb 2013 17:07:18 +0100
Subject: [PATCH 035/547] [IMP] gamification: hide done-fail state for goals

bzr revid: mat@openerp.com-20130215160718-4n10mbzaxdaabp6e
---
 addons/gamification/view/goal.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 80a44e92c2d..560e7d51c3f 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -33,7 +33,7 @@
                         <button string="Mark as reached" type="object" name="action_reach" states="inprogress"/>
                         <button string="Mark as failed" type="object" name="action_fail" states="inprogress"/>
                         <button string="Cancel completion" type="object" name="action_cancel" states="failed,reached"/>
-                        <field name="state" widget="statusbar"/>
+                        <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
                         <group>

From b4e3848695b29015e1dac460bab26c61fbb457d3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 10:56:44 +0100
Subject: [PATCH 036/547] [IMP] gamification: domain is mandatory

bzr revid: mat@openerp.com-20130218095644-blecbe9pspwqx022
---
 addons/gamification/goal.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index e77eb5ff922..c84ad647214 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -97,7 +97,9 @@ class gamification_goal_type(osv.Model):
         'field_date': fields.many2one('ir.model.fields',
             string='Evaluated date field',
             help='The date to use for the time period evaluated'),
-        'domain': fields.char("Domain"), # how to apply it ?
+        'domain': fields.char("Domain",
+            help="Technical filters rules to apply",
+            required=True), # how to apply it ?
         'condition' : fields.selection(GAMIFICATION_VALIDATION_CONDITION,
             string='Validation condition',
             help='A goal is considered as completed when the current value is compared to the value to reach',
@@ -112,6 +114,7 @@ class gamification_goal_type(osv.Model):
         'sequence': 0,
         'condition': 'plus',
         'computation_mode':'manually',
+        'domain':"[]",
     }
 
 

From 34b154cba003f3be5ab2a795a063858a9c2bd68a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 13:44:03 +0100
Subject: [PATCH 037/547] [IMP] gamification: sort goals based on type sequence

bzr revid: mat@openerp.com-20130218124403-9qe49o072r8bnx16
---
 addons/gamification/goal.py       | 25 +++++++++++++++++++++++--
 addons/gamification/view/type.xml |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index c84ad647214..f9b1f072151 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -77,6 +77,7 @@ class gamification_goal_type(osv.Model):
     """
     _name = 'gamification.goal.type'
     _description = 'Gamification goal type'
+    _order = "sequence"
 
     _columns = {
         'name': fields.char('Name', required=True),
@@ -111,13 +112,12 @@ class gamification_goal_type(osv.Model):
     
     _order = 'sequence'
     _defaults = {
-        'sequence': 0,
+        'sequence': 1,
         'condition': 'plus',
         'computation_mode':'manually',
         'domain':"[]",
     }
 
-
 class gamification_goal(osv.Model):
     """Goal instance for a user
 
@@ -252,6 +252,20 @@ class gamification_goal_planline(osv.Model):
 
     _name = 'gamification.goal.planline'
     _description = 'Gamification generic goal for plan'
+    _order = "sequence_type"
+
+
+    def _get_planline_types(self, cr, uid, ids, context=None):
+        """Return the ids of planline items related to the gamification.goal.type
+        objects in 'ids (used to update the value of 'sequence_type')'"""
+
+        result = {}
+        for goal_type in self.pool.get('gamification.goal.type').browse(cr, uid, ids, context=context):
+            domain = [('type_id', '=', goal_type.id)]
+            planline_ids = self.pool.get('gamification.goal.planline').search(cr, uid, domain, context=context)
+            for p_id in planline_ids:
+                result[p_id] = True
+        return result.keys()
 
     _columns = {
         'plan_id' : fields.many2one('gamification.goal.plan',
@@ -259,4 +273,11 @@ class gamification_goal_planline(osv.Model):
         'type_id' : fields.many2one('gamification.goal.type',
             string='Goal type'),
         'target_goal' : fields.float('Target value to reach'),
+        'sequence_type' : fields.related('type_id','sequence',
+            type='integer',
+            string='Sequence',
+            readonly=True,
+            store={
+                'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
+                }),
     }
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index c189685e4e2..0c0003301aa 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -13,6 +13,7 @@
             <field name="model">gamification.goal.type</field>
             <field name="arch" type="xml">
                 <tree string="Goal types">
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="computation_mode"/>
                     <field name="field"/>
@@ -34,7 +35,6 @@
                         <group>
                             <group string="General">
                                 <field name="description"/>
-                                <field name="sequence"/>
                                 <field name="condition"/>
                             </group>
                             <group string="Computation">

From c1dc0578c15f2a8f74a4eaa499cb9069767b60d7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 14:06:56 +0100
Subject: [PATCH 038/547] [IMP] gamification: minor layout corrections
 (uppercase)

bzr revid: mat@openerp.com-20130218130656-emzxy335nr2irsl4
---
 addons/gamification/goal.py       | 30 ++++++++++++++++--------------
 addons/gamification/view/goal.xml | 14 +++++++-------
 addons/gamification/view/plan.xml | 19 +++++++++++--------
 addons/gamification/view/type.xml | 11 +++++++----
 4 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index f9b1f072151..8cd4cc44cb2 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -80,10 +80,10 @@ class gamification_goal_type(osv.Model):
     _order = "sequence"
 
     _columns = {
-        'name': fields.char('Name', required=True),
+        'name': fields.char('Type Name', required=True),
         'description': fields.text('Description'),
         'computation_mode': fields.selection(GAMIFICATION_COMPUTATION_MODE,
-            string="Mode of computation",
+            string="Mode of Computation",
             help="""How is computed the goal value :\n
 - 'Sum' for the total of the values if the 'Evaluated field'\n
 - 'Count' for the number of entries\n
@@ -93,16 +93,16 @@ class gamification_goal_type(osv.Model):
             string='Object',
             help='The object type for the field to evaluate' ),
         'field': fields.many2one('ir.model.fields',
-            string='Evaluated field',
+            string='Evaluated Field',
             help='The field containing the value to evaluate' ),
         'field_date': fields.many2one('ir.model.fields',
-            string='Evaluated date field',
+            string='Evaluated Date Field',
             help='The date to use for the time period evaluated'),
         'domain': fields.char("Domain",
             help="Technical filters rules to apply",
             required=True), # how to apply it ?
         'condition' : fields.selection(GAMIFICATION_VALIDATION_CONDITION,
-            string='Validation condition',
+            string='Validation Condition',
             help='A goal is considered as completed when the current value is compared to the value to reach',
             required=True),
         'sequence' : fields.integer('Sequence',
@@ -140,14 +140,14 @@ class gamification_goal(osv.Model):
 
     _columns = {
         'type_id' : fields.many2one('gamification.goal.type', 
-            string='Goal type',
+            string='Goal Type',
             required=True),
         'user_id' : fields.many2one('res.users', string='User', required=True),
         'plan_id' : fields.many2one('gamification.goal.plan',
-            string='Goal plan'),
-        'start_date' : fields.date('Start date'),
-        'end_date' : fields.date('End date'), # no start and end = always active
-        'target_goal' : fields.float('To reach',
+            string='Goal Plan'),
+        'start_date' : fields.date('Start Date'),
+        'end_date' : fields.date('End Date'), # no start and end = always active
+        'target_goal' : fields.float('To Reach',
             required=True,
             track_visibility = 'always'), # no goal = global index
         'current' : fields.float('Current',
@@ -193,7 +193,7 @@ class gamification_goal_plan(osv.Model):
     _description = 'Gamification goal plan'
 
     _columns = {
-        'name' : fields.char('Plan name', required=True),
+        'name' : fields.char('Plan Name', required=True),
         'user_ids' : fields.many2many('res.users',
             string='Users',
             help="list of users to which the goal will be set"),
@@ -221,7 +221,7 @@ class gamification_goal_plan(osv.Model):
         'report_message_group_id' : fields.many2one('mail.group',
             string='Report to',
             help='Group that will receive the report in addition to the user'),
-        'report_header' : fields.text('Report header'),
+        'report_header' : fields.text('Report Header'),
         }
 
     _defaults = {
@@ -271,8 +271,10 @@ class gamification_goal_planline(osv.Model):
         'plan_id' : fields.many2one('gamification.goal.plan',
             string='Plan'),
         'type_id' : fields.many2one('gamification.goal.type',
-            string='Goal type'),
-        'target_goal' : fields.float('Target value to reach'),
+            string='Goal Type',
+            required=True),
+        'target_goal' : fields.float('Target Value to Reach',
+            required=True),
         'sequence_type' : fields.related('type_id','sequence',
             type='integer',
             string='Sequence',
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 560e7d51c3f..a6bf1222636 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -8,10 +8,10 @@
         </record>
 
         <record id="goal_list_view" model="ir.ui.view">
-            <field name="name">Goal list</field>
+            <field name="name">Goal List</field>
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
-                <tree string="Goal list" colors="red:state == 'failed';green:state == 'reached'"> 
+                <tree string="Goal List" colors="red:state == 'failed';green:state == 'reached'"> 
                     <field name="type_id"/>
                     <field name="user_id"/>
                     <field name="current"/>
@@ -25,14 +25,14 @@
         </record>
 		
 		<record id="goal_form_view" model="ir.ui.view">
-            <field name="name">Goal form</field>
+            <field name="name">Goal Form</field>
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Mark as reached" type="object" name="action_reach" states="inprogress"/>
-                        <button string="Mark as failed" type="object" name="action_fail" states="inprogress"/>
-                        <button string="Cancel completion" type="object" name="action_cancel" states="failed,reached"/>
+                        <button string="Mark as Reached" type="object" name="action_reach" states="inprogress"/>
+                        <button string="Mark as Failed" type="object" name="action_fail" states="inprogress"/>
+                        <button string="Cancel Completion" type="object" name="action_cancel" states="failed,reached"/>
                         <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
@@ -57,7 +57,7 @@
         </record>
 
         <record id="goal_calendar_view" model="ir.ui.view">
-            <field name="name">Goal calendar</field>
+            <field name="name">Goal Calendar</field>
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <calendar string="Goal"
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index f29ca2f7c62..39332c5374d 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -3,13 +3,13 @@
     <data>
 
         <record id="goal_plan_list_action" model="ir.actions.act_window">
-            <field name="name">Goal plans</field>
+            <field name="name">Goal Plans</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">tree,form</field>
         </record>
 
         <record id="goal_plan_list_view" model="ir.ui.view">
-            <field name="name">Goal plans list</field>
+            <field name="name">Goal Plans List</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <tree string="Goal types" colors="blue:state == 'inprogress';grey:state == 'done'">
@@ -21,19 +21,22 @@
         </record>
 
         <record id="goal_plan_form_view" model="ir.ui.view">
-            <field name="name">Goal plan form</field>
+            <field name="name">Goal Plan Form</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <header>
-                        <button string="Start plan" type="object" name="action_start" states="draft"/>
-                        <button string="Close plan" type="object" name="action_close" states="inprogress"/>
-                        <button string="Cancel plan" type="object" name="action_cancel" states="inprogress"/>
+                        <button string="Start Plan" type="object" name="action_start" states="draft"/>
+                        <button string="Close Plan" type="object" name="action_close" states="inprogress"/>
+                        <button string="Cancel Plan" type="object" name="action_cancel" states="inprogress"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
                         <h1>
-                            <field name="name" placeholder="Goal plan name"/>
+                            <div class="oe_edit_only">
+                                <label for="name"/>
+                            </div>
+                            <field name="name"/>
                         </h1>
                         <group>
                             <group colspan="4">
@@ -49,7 +52,7 @@
                         <notebook>
                             <page string="Goals">
                                 <field name="planline_ids">
-                                    <tree string="planline list" version="7.0" editable="top" >
+                                    <tree string="Planline List" version="7.0" editable="bottom" >
                                         <field name="type_id"/>
                                         <field name="target_goal"/>
                                     </tree>
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index 0c0003301aa..46d7722fd53 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -3,13 +3,13 @@
     <data>
 
         <record id="goal_type_list_action" model="ir.actions.act_window">
-            <field name="name">Goal types</field>
+            <field name="name">Goal Types</field>
             <field name="res_model">gamification.goal.type</field>
             <field name="view_mode">tree,form</field>
         </record>
 
         <record id="goal_type_list_view" model="ir.ui.view">
-            <field name="name">Goal types list</field>
+            <field name="name">Goal Types List</field>
             <field name="model">gamification.goal.type</field>
             <field name="arch" type="xml">
                 <tree string="Goal types">
@@ -24,13 +24,16 @@
 
 
         <record id="goal_type_form_view" model="ir.ui.view">
-            <field name="name">Goal types form</field>
+            <field name="name">Goal Types Form</field>
             <field name="model">gamification.goal.type</field>
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <sheet>
                         <h1>
-                            <field name="name" placeholder="Goal type name"/>
+                            <div class="oe_edit_only">
+                                <label for="name"/>
+                            </div>
+                            <field name="name"/>
                         </h1>
                         <group>
                             <group string="General">

From c4e48dbd02d7e3949fe10989afbea518345a122c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 14:48:03 +0100
Subject: [PATCH 039/547] [ADD] gamification: add search views

bzr revid: mat@openerp.com-20130218134803-3qp98ce1aaxjs6al
---
 addons/gamification/goal.py       |  1 +
 addons/gamification/view/goal.xml | 18 ++++++++++++++++++
 addons/gamification/view/plan.xml | 17 +++++++++++++++++
 addons/gamification/view/type.xml | 13 +++++++++++++
 4 files changed, 49 insertions(+)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 8cd4cc44cb2..62c3f71410c 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -165,6 +165,7 @@ class gamification_goal(osv.Model):
     _defaults = {
         'current': 0,
         'state': 'inprogress',
+        'start_date': fields.date.today,
     }
 
     def action_reach(self, cr, uid, ids, context=None):
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index a6bf1222636..bcb5ee22ac5 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -5,6 +5,7 @@
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
             <field name="view_mode">tree,form,calendar</field>
+            <field name="context">{'search_default_my_in_progress': 1}</field>
         </record>
 
         <record id="goal_list_view" model="ir.ui.view">
@@ -69,5 +70,22 @@
             </field>
         </record>
 
+        <record id="goal_search_view" model="ir.ui.view">
+            <field name="name">Goal Search</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <search string="Search Goals">
+                    <filter name="my_in_progress" string="My Goals in Progress"
+                        domain="[('user_id', '=', uid),('state', '=', 'inprogress')]"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Goal Type" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="End Date" domain="[]" context="{'group_by':'end_date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index 39332c5374d..7cab0622bef 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -6,6 +6,7 @@
             <field name="name">Goal Plans</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_in_progress': 1}</field>
         </record>
 
         <record id="goal_plan_list_view" model="ir.ui.view">
@@ -101,5 +102,21 @@
             </field>
         </record>
 
+
+        <record id="goal_plan_search_view" model="ir.ui.view">
+            <field name="name">Goal Plan Search</field>
+            <field name="model">gamification.goal.plan</field>
+            <field name="arch" type="xml">
+                <search string="Search Goal Plans">
+                    <filter name="in_progress" string="Plans in Progress"
+                        domain="[('state', '=', 'inprogress')]"/>
+                     <group expand="0" string="Group By...">
+                        <filter string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Period" domain="[]" context="{'group_by':'period'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index 46d7722fd53..c95c72998c5 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -53,5 +53,18 @@
             </field>
         </record>
 
+        <record id="goal_type_search_view" model="ir.ui.view">
+            <field name="name">Goal Type Search</field>
+            <field name="model">gamification.goal.type</field>
+            <field name="arch" type="xml">
+                <search string="Search Goal Types">
+                     <group expand="0" string="Group By...">
+                        <filter string="Object" domain="[]" context="{'group_by':'object'}"/>
+                        <filter string="Computation Mode" domain="[]" context="{'group_by':'computation_mode'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file

From d80e4909e4e4f3a688a7d9545ab8356ca06a9391 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 16:16:07 +0100
Subject: [PATCH 040/547] [IMP] gamification: domain for type form

bzr revid: mat@openerp.com-20130218151607-22gv890c1adecpql
---
 addons/gamification/goal.py       | 10 +++++-----
 addons/gamification/view/type.xml | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 62c3f71410c..c6f8f32799e 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -89,13 +89,13 @@ class gamification_goal_type(osv.Model):
 - 'Count' for the number of entries\n
 - 'Manually' for user defined values""",
             required=True),
-        'object': fields.many2one('ir.model',
-            string='Object',
-            help='The object type for the field to evaluate' ),
-        'field': fields.many2one('ir.model.fields',
+        'model_id': fields.many2one('ir.model',
+            string='Modeel',
+            help='The model object for the field to evaluate' ),
+        'field_id': fields.many2one('ir.model.fields',
             string='Evaluated Field',
             help='The field containing the value to evaluate' ),
-        'field_date': fields.many2one('ir.model.fields',
+        'field_date_id': fields.many2one('ir.model.fields',
             string='Evaluated Date Field',
             help='The date to use for the time period evaluated'),
         'domain': fields.char("Domain",
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index c95c72998c5..8c3ec05f7f1 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -16,8 +16,6 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="computation_mode"/>
-                    <field name="field"/>
-                    <field name="domain"/>
                 </tree>
             </field>
         </record>
@@ -42,10 +40,12 @@
                             </group>
                             <group string="Computation">
                                 <field name="computation_mode"/>
-                                <field name="object"/>
-                                <field name="field"/>
-                                <field name="field_date"/>
-                                <field name="domain"/>
+
+                                <!-- Hide the fields beloz if manually -->
+                                <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
+                                <field name="field_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" domain="[('model_id','=',model_id)]" />
+                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
+                                <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
                             </group>
                         </group>
                     </sheet>
@@ -59,7 +59,7 @@
             <field name="arch" type="xml">
                 <search string="Search Goal Types">
                      <group expand="0" string="Group By...">
-                        <filter string="Object" domain="[]" context="{'group_by':'object'}"/>
+                        <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/>
                         <filter string="Computation Mode" domain="[]" context="{'group_by':'computation_mode'}"/>
                     </group>
                 </search>

From 11e61f6ec941bacf795d5f3dbefa2a3f0ba15b93 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 16:49:15 +0100
Subject: [PATCH 041/547] [IMP] gamification: better selection choice

bzr revid: mat@openerp.com-20130218154915-r5hfx5dr5np5ivkq
---
 addons/gamification/goal.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index c6f8f32799e..924fe2dcee5 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -36,7 +36,7 @@ GAMIFICATION_PLAN_STATE = [
 ]
 
 GAMIFICATION_PERIOD_STATE = [
-    ('once','No automatic assigment'),
+    ('once','Manual'),
     ('daily','Daily'),
     ('weekly','Weekly'),
     ('monthly','Monthly'),
@@ -60,6 +60,7 @@ GAMIFICATION_REPORT_MODE = [
 ]
 
 GAMIFICATION_REPORT_FREQ = [
+    ('never','Never'),
     ('onchange','On change'),
     ('daily','Daily'),
     ('weekly','Weekly'),
@@ -131,7 +132,7 @@ class gamification_goal(osv.Model):
     def _get_completeness(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for goal in self.browse(cr, uid, ids, context):
-            # more 100% ?
+            # more than 100% case is handled by the widget
             if goal.target_goal > 0:
                 res[goal.id] = 100.0 * goal.current / goal.target_goal
             else:
@@ -201,7 +202,8 @@ class gamification_goal_plan(osv.Model):
         'planline_ids' : fields.one2many('gamification.goal.planline',
             'plan_id',
             string='Planline',
-            help="list of goals that will be set"),
+            help="list of goals that will be set",
+            required=True),
         'autojoin_group_id' : fields.many2one('res.groups',
             string='Group',
             help='Group of users whose members will automatically be added to the users'),

From 1d3f9e41f40067d14e4b5b6e6beb3ff32a6f8c8b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 16:51:17 +0100
Subject: [PATCH 042/547] [IMP] gamification: consistency, draft is in blue

bzr revid: mat@openerp.com-20130218155117-iym3umdj47ec7sd7
---
 addons/gamification/view/plan.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index 7cab0622bef..c89e71f6ab4 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -13,7 +13,7 @@
             <field name="name">Goal Plans List</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
-                <tree string="Goal types" colors="blue:state == 'inprogress';grey:state == 'done'">
+                <tree string="Goal types" colors="blue:state == 'draft';grey:state == 'done'">
                     <field name="name"/>
                     <field name="period"/>
                     <field name="state" invisible="1"/>

From 7d3ec211575b04a858114b6425bc09a2d491b6e1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Feb 2013 16:59:33 +0100
Subject: [PATCH 043/547] [IMP] gamification: at least one user and planline is
 required

bzr revid: mat@openerp.com-20130218155933-p1nqmmppdts1wuik
---
 addons/gamification/goal.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 924fe2dcee5..e713ce57854 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -234,6 +234,25 @@ class gamification_goal_plan(osv.Model):
         'report_message_frequency' : 'onchange',
     }
 
+    def _check_nonzero_planline(self, cr, uid, ids, context=None):
+        "checks that there is at least one planline set"
+        for plan in self.browse(cr, uid, ids, context):
+            if len(plan.planline_ids) < 1:
+                return False
+        return True
+
+    def _check_nonzero_users(self, cr, uid, ids, context=None):
+        "checks that there is at least one user set"
+        for plan in self.browse(cr, uid, ids, context):
+            if len(plan.user_ids) < 1:
+                return False
+        return True
+
+    _constraints = [
+        (_check_nonzero_planline, "At least one planline is required to create a goal plan", ['planline_ids']),
+        (_check_nonzero_users, "At least one user is required to create a goal plan", ['user_ids']),
+    ]
+
     def action_start(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 

From e5e05470c8d18957f19500514c7939d2eeb7a8d4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 10:08:26 +0100
Subject: [PATCH 044/547] [IMP] gamification: chatter box in goal form

bzr revid: mat@openerp.com-20130219090826-qyiqiwwfzvsxdpze
---
 addons/gamification/view/goal.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index bcb5ee22ac5..76db7c82a4e 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -53,6 +53,10 @@
                             </group>
                         </group>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" help="Follow this goal to automatically track the events associated." groups="base.group_user"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>

From dfa76a9a305cf0be0adbfd27624b53cd1d5995c2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 10:56:00 +0100
Subject: [PATCH 045/547] [IMP] gamification: remove notebook in plan view

bzr revid: mat@openerp.com-20130219095600-728uohdeyvmo6zoc
---
 addons/gamification/view/plan.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index c89e71f6ab4..06b783d3785 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -50,21 +50,22 @@
                                 <field name="report_header"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="Goals">
-                                <field name="planline_ids">
+                        
+                        <group string="Planlines">
+                                <field name="planline_ids" nolabel="1">
                                     <tree string="Planline List" version="7.0" editable="bottom" >
                                         <field name="type_id"/>
                                         <field name="target_goal"/>
                                     </tree>
                                 </field>
-                            </page>
-                            <page string="Subscription">
-                                <group>
-                                    <field name="autojoin_group_id" string="Group" />
-                                </group>
-                                <group>
-                                <field colspan="4" name="user_ids" widget="many2many_kanban">
+                        </group>
+                        
+                        <group string="Subscription">
+                            <group colspan="4">
+                                <field name="autojoin_group_id" string="Group" />
+                            </group>
+                            <group colspan="4">
+                                <field name="user_ids" widget="many2many_kanban">
                                     <kanban quick_create="false" create="true">
                                         <field name="name"/>
                                         <templates>
@@ -81,9 +82,8 @@
                                         </templates>
                                     </kanban>
                                 </field>
-                                </group>
-                            </page>
-                        </notebook>
+                            </group>
+                        </group>
                     </sheet>
                 </form>
             </field>

From 0f042d442ed90fc7c55b234c2a99de80d291203c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 11:14:13 +0100
Subject: [PATCH 046/547] [IMP] gamification: can not modify plan if not in
 draft

bzr revid: mat@openerp.com-20130219101413-4l0zkfniwoyj64cs
---
 addons/gamification/view/plan.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index 06b783d3785..a89ef258599 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -52,7 +52,7 @@
                         </group>
                         
                         <group string="Planlines">
-                                <field name="planline_ids" nolabel="1">
+                                <field name="planline_ids" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
                                     <tree string="Planline List" version="7.0" editable="bottom" >
                                         <field name="type_id"/>
                                         <field name="target_goal"/>

From f6ddf40705640efa098156cf7b09050db263b248 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 11:33:51 +0100
Subject: [PATCH 047/547] [IMP] gamification: better buttons for change of
 states

bzr revid: mat@openerp.com-20130219103351-m9ni2hntv6miz4nu
---
 addons/gamification/goal.py       | 2 ++
 addons/gamification/view/goal.xml | 6 +++---
 addons/gamification/view/plan.xml | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index e713ce57854..b78f59a1de0 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -262,6 +262,8 @@ class gamification_goal_plan(osv.Model):
     def action_cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
+    def action_reset(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
 
 class gamification_goal_planline(osv.Model):
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 76db7c82a4e..fe2ba27bca3 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -31,9 +31,9 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Mark as Reached" type="object" name="action_reach" states="inprogress"/>
-                        <button string="Mark as Failed" type="object" name="action_fail" states="inprogress"/>
-                        <button string="Cancel Completion" type="object" name="action_cancel" states="failed,reached"/>
+                        <button string="Goal Reached" type="object" name="action_reach" states="inprogress" class="oe_highlight"/>
+                        <button string="Goal Failed" type="object" name="action_fail" states="inprogress"/>
+                        <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
                         <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index a89ef258599..bbc5c1b34e9 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -27,9 +27,10 @@
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <header>
-                        <button string="Start Plan" type="object" name="action_start" states="draft"/>
-                        <button string="Close Plan" type="object" name="action_close" states="inprogress"/>
+                        <button string="Start Plan" type="object" name="action_start" states="draft" class="oe_highlight"/>
+                        <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Cancel Plan" type="object" name="action_cancel" states="inprogress"/>
+                        <button string="Reset Plan" type="object" name="action_reset" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>

From 6ae4387f65481eeb3ac17abc6afa2667901bf494 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 14:23:06 +0100
Subject: [PATCH 048/547] [IMP] gamification: better search views and shortcut
 button

bzr revid: mat@openerp.com-20130219132306-tbdaf5wc9aavyx2h
---
 addons/gamification/goal.py       | 18 +++++++++++++++++-
 addons/gamification/view/goal.xml |  5 +++++
 addons/gamification/view/plan.xml | 17 ++++++++++++++++-
 addons/gamification/view/type.xml |  5 ++++-
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index b78f59a1de0..0986ceaa731 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -91,7 +91,7 @@ class gamification_goal_type(osv.Model):
 - 'Manually' for user defined values""",
             required=True),
         'model_id': fields.many2one('ir.model',
-            string='Modeel',
+            string='Model',
             help='The model object for the field to evaluate' ),
         'field_id': fields.many2one('ir.model.fields',
             string='Evaluated Field',
@@ -254,15 +254,31 @@ class gamification_goal_plan(osv.Model):
     ]
 
     def action_start(self, cr, uid, ids, context=None):
+        """Start a draft goal plan
+
+        Change the state of the plan to in progress
+        TODO: generate related goals"""
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def action_close(self, cr, uid, ids, context=None):
+        """Close a plan in progress
+
+        Change the state of the plan to in done
+        TODO: close the related goals"""
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def action_cancel(self, cr, uid, ids, context=None):
+        """Cancel a plan in progress
+
+        Change the state of the plan to draft
+        TODO: close the related goals ?"""
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def action_reset(self, cr, uid, ids, context=None):
+        """Reset a closed goal plan
+
+        Change the state of the plan to in progress
+        TODO: reopen unfinished goals ?"""
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
 
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index fe2ba27bca3..e582ff853f0 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -21,6 +21,7 @@
                     <field name="end_date"/>
                     <field name="completeness" widget="progressbar"/>
                     <field name="state" invisible="1"/>
+                    <field name="plan_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -81,11 +82,15 @@
                 <search string="Search Goals">
                     <filter name="my_in_progress" string="My Goals in Progress"
                         domain="[('user_id', '=', uid),('state', '=', 'inprogress')]"/>
+                    <field name="plan_id"/>
+                    <field name="user_id"/>
+                    <field name="type_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Goal Type" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="End Date" domain="[]" context="{'group_by':'end_date'}"/>
+                        <filter string="Plan" domain="[]" context="{'group_by':'plan_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index bbc5c1b34e9..dc79a6b44fc 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -21,6 +21,14 @@
             </field>
         </record>
 
+        <record id="act_show_goals_from_plan" model="ir.actions.act_window">
+            <field name="res_model">gamification.goal</field>
+            <field name="view_type">form</field>
+            <field name="name">Related Goals</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_plan_id': [active_id], 'default_plan_id': active_id}</field>
+        </record>
+
         <record id="goal_plan_form_view" model="ir.ui.view">
             <field name="name">Goal Plan Form</field>
             <field name="model">gamification.goal.plan</field>
@@ -40,6 +48,12 @@
                             </div>
                             <field name="name"/>
                         </h1>
+
+                        <!-- action buttons -->
+                        <div class="oe_right oe_button_box">
+                            <button name="%(act_show_goals_from_plan)d" type="action" string="Related Goals" help="show all the generated goals for this plan"/>
+                        </div>
+
                         <group>
                             <group colspan="4">
                                 <field name="period"/>
@@ -111,7 +125,8 @@
                 <search string="Search Goal Plans">
                     <filter name="in_progress" string="Plans in Progress"
                         domain="[('state', '=', 'inprogress')]"/>
-                     <group expand="0" string="Group By...">
+                    <field name="name"/>
+                    <group expand="0" string="Group By...">
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Period" domain="[]" context="{'group_by':'period'}"/>
                     </group>
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index 8c3ec05f7f1..0740e5735cc 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -58,7 +58,10 @@
             <field name="model">gamification.goal.type</field>
             <field name="arch" type="xml">
                 <search string="Search Goal Types">
-                     <group expand="0" string="Group By...">
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="field_id"/>
+                    <group expand="0" string="Group By...">
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/>
                         <filter string="Computation Mode" domain="[]" context="{'group_by':'computation_mode'}"/>
                     </group>

From 0e23b01ffe921486273dc018e54ca22d170f9853 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 15:37:22 +0100
Subject: [PATCH 049/547] [IMP] gamification: ondelete rules and better
 constraint

bzr revid: mat@openerp.com-20130219143722-om96otvoemmfryyh
---
 addons/gamification/goal.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 0986ceaa731..e823e529e62 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -142,10 +142,12 @@ class gamification_goal(osv.Model):
     _columns = {
         'type_id' : fields.many2one('gamification.goal.type', 
             string='Goal Type',
-            required=True),
+            required=True,
+            ondelete="cascade"),
         'user_id' : fields.many2one('res.users', string='User', required=True),
         'plan_id' : fields.many2one('gamification.goal.plan',
-            string='Goal Plan'),
+            string='Goal Plan',
+            ondelete="cascade"),
         'start_date' : fields.date('Start Date'),
         'end_date' : fields.date('End Date'), # no start and end = always active
         'target_goal' : fields.float('To Reach',
@@ -244,13 +246,13 @@ class gamification_goal_plan(osv.Model):
     def _check_nonzero_users(self, cr, uid, ids, context=None):
         "checks that there is at least one user set"
         for plan in self.browse(cr, uid, ids, context):
-            if len(plan.user_ids) < 1:
+            if len(plan.user_ids) < 1 and plan.state != 'draft':
                 return False
         return True
 
     _constraints = [
         (_check_nonzero_planline, "At least one planline is required to create a goal plan", ['planline_ids']),
-        (_check_nonzero_users, "At least one user is required to create a goal plan", ['user_ids']),
+        (_check_nonzero_users, "At least one user is required to create a non-draft goal plan", ['user_ids']),
     ]
 
     def action_start(self, cr, uid, ids, context=None):
@@ -309,10 +311,12 @@ class gamification_goal_planline(osv.Model):
 
     _columns = {
         'plan_id' : fields.many2one('gamification.goal.plan',
-            string='Plan'),
+            string='Plan',
+            ondelete="cascade"),
         'type_id' : fields.many2one('gamification.goal.type',
             string='Goal Type',
-            required=True),
+            required=True,
+            ondelete="cascade"),
         'target_goal' : fields.float('Target Value to Reach',
             required=True),
         'sequence_type' : fields.related('type_id','sequence',

From d3750e5a8a43ad8b3eb49702fe74801f881776b7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 17:30:48 +0100
Subject: [PATCH 050/547] [IMP] gamification: default help messages and better
 default filter

bzr revid: mat@openerp.com-20130219163048-d6cb69034nzbmj86
---
 addons/gamification/goal.py       | 22 ++++++++++------------
 addons/gamification/view/goal.xml |  9 +++++++++
 addons/gamification/view/plan.xml | 17 ++++++++++++++---
 addons/gamification/view/type.xml |  9 +++++++++
 4 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index e823e529e62..8fb9c4d7091 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -21,25 +21,23 @@
 
 from openerp.osv import fields, osv
 
-from datetime import date
-
 GAMIFICATION_GOAL_STATE = [
-    ('inprogress','In progress'),
-    ('reached','Reached'),
-    ('failed','Failed'),
+    ('inprogress', 'In progress'),
+    ('reached', 'Reached'),
+    ('failed', 'Failed'),
 ]
 
 GAMIFICATION_PLAN_STATE = [
-    ('draft','Draft'),
-    ('inprogress','In progress'),
-    ('done','Done'),
+    ('draft', 'Draft'),
+    ('inprogress', 'In progress'),
+    ('done', 'Done'),
 ]
 
 GAMIFICATION_PERIOD_STATE = [
-    ('once','Manual'),
-    ('daily','Daily'),
-    ('weekly','Weekly'),
-    ('monthly','Monthly'),
+    ('once', 'Manual'),
+    ('daily', 'Daily'),
+    ('weekly', 'Weekly'),
+    ('monthly', 'Monthly'),
     ('yearly', 'Yearly')
 ]
 
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index e582ff853f0..a788fdecd87 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -6,6 +6,15 @@
             <field name="res_model">gamification.goal</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="context">{'search_default_my_in_progress': 1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal. 
+                </p>
+                <p>
+                    A goal is defined by a user and a goal type.
+                    Goals can be created automatically by using goal plans.
+                </p>
+            </field>
         </record>
 
         <record id="goal_list_view" model="ir.ui.view">
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index dc79a6b44fc..109b8ef3319 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -6,7 +6,18 @@
             <field name="name">Goal Plans</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_in_progress': 1}</field>
+            <field name="context">{'search_default_draft_active': 1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal plan. 
+                </p>
+                <p>
+                    Goal plans allow to create and assign to users easily a list of goals.
+                    A goal plan is a predifined list of goals types with a target value.
+                    The plan can use a period (weekly, monthly...) for automatic creation of goals.
+                    The goals are created for the specified users or memeber of the group.
+                </p>
+            </field>
         </record>
 
         <record id="goal_plan_list_view" model="ir.ui.view">
@@ -123,8 +134,8 @@
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <search string="Search Goal Plans">
-                    <filter name="in_progress" string="Plans in Progress"
-                        domain="[('state', '=', 'inprogress')]"/>
+                    <filter name="draft_active" string="Draft or Active Plans"
+                        domain="[('state', 'in', ('inprogress', 'draft'))]"/>
                     <field name="name"/>
                     <group expand="0" string="Group By...">
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index 0740e5735cc..9a6f1029ef2 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -6,6 +6,15 @@
             <field name="name">Goal Types</field>
             <field name="res_model">gamification.goal.type</field>
             <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal type. 
+                </p>
+                <p>
+                    A goal type is a technical model of goal defining a condition to reach.
+                    The dates, values to reach or users are defined in goal instance.
+                </p>
+            </field>
         </record>
 
         <record id="goal_type_list_view" model="ir.ui.view">

From 6313de4dc8f86a19f92ea737e7d2df9f91066fb2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 17:52:15 +0100
Subject: [PATCH 051/547] [ADD] gamification: add remind and last update value

bzr revid: mat@openerp.com-20130219165215-kscj3kpld3h8rz41
---
 addons/gamification/goal.py       | 4 ++++
 addons/gamification/view/plan.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 8fb9c4d7091..bc0057a6613 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -161,6 +161,8 @@ class gamification_goal(osv.Model):
             string='State',
             required=True,
             track_visibility = 'always'),
+        'last_update' : fields.date('Last Update',
+            help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."), #
     }
 
     _defaults = {
@@ -225,6 +227,8 @@ class gamification_goal_plan(osv.Model):
             string='Report to',
             help='Group that will receive the report in addition to the user'),
         'report_header' : fields.text('Report Header'),
+        'remind_update_delays' : fields.integer('Remind delays',
+            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified.")
         }
 
     _defaults = {
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index 109b8ef3319..123513fe9f6 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -74,6 +74,7 @@
                                 <field name="report_message_frequency"/>
                                 <field name="report_message_group_id"/>
                                 <field name="report_header"/>
+                                <field name="remind_update_delays"/>
                             </group>
                         </group>
                         

From 48fed40b103544200e041749f5b1519a7db795c6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Feb 2013 17:56:09 +0100
Subject: [PATCH 052/547] [IMP] gamification: differenciate inprogress and
 inprogress to update

bzr revid: mat@openerp.com-20130219165609-q7gqbuf0wm7v8egl
---
 addons/gamification/goal.py       | 1 +
 addons/gamification/view/goal.xml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index bc0057a6613..0ffb77da3b3 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -23,6 +23,7 @@ from openerp.osv import fields, osv
 
 GAMIFICATION_GOAL_STATE = [
     ('inprogress', 'In progress'),
+    ('inprogress_update', 'In progress (to update)'),
     ('reached', 'Reached'),
     ('failed', 'Failed'),
 ]
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index a788fdecd87..8c695d68d53 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -41,10 +41,10 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Goal Reached" type="object" name="action_reach" states="inprogress" class="oe_highlight"/>
-                        <button string="Goal Failed" type="object" name="action_fail" states="inprogress"/>
+                        <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" class="oe_highlight"/>
+                        <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
-                        <field name="state" widget="statusbar" statusbar_visible="inprogress" />
+                        <field name="state" widget="statusbar" statusbar_visible="inprogress,inprogress_update" />
                     </header>
                     <sheet>
                         <group>
@@ -90,7 +90,7 @@
             <field name="arch" type="xml">
                 <search string="Search Goals">
                     <filter name="my_in_progress" string="My Goals in Progress"
-                        domain="[('user_id', '=', uid),('state', '=', 'inprogress')]"/>
+                        domain="[('user_id', '=', uid),('state', 'in', ('inprogress', 'inprogress_update'))]"/>
                     <field name="plan_id"/>
                     <field name="user_id"/>
                     <field name="type_id"/>

From 55541a3d3b4984a80b45e40ce06b5af5e86366dc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Feb 2013 13:33:28 +0100
Subject: [PATCH 053/547] [REF] gamification: minor changes for better
 consistency

bzr revid: mat@openerp.com-20130220123328-n13psgprp4ci14vn
---
 addons/gamification/goal.py       | 139 ++++++++++++++++--------------
 addons/gamification/view/goal.xml |  13 ++-
 addons/gamification/view/plan.xml |  29 +++----
 addons/gamification/view/type.xml |   6 +-
 4 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 0ffb77da3b3..ba452d7636f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -20,52 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-
-GAMIFICATION_GOAL_STATE = [
-    ('inprogress', 'In progress'),
-    ('inprogress_update', 'In progress (to update)'),
-    ('reached', 'Reached'),
-    ('failed', 'Failed'),
-]
-
-GAMIFICATION_PLAN_STATE = [
-    ('draft', 'Draft'),
-    ('inprogress', 'In progress'),
-    ('done', 'Done'),
-]
-
-GAMIFICATION_PERIOD_STATE = [
-    ('once', 'Manual'),
-    ('daily', 'Daily'),
-    ('weekly', 'Weekly'),
-    ('monthly', 'Monthly'),
-    ('yearly', 'Yearly')
-]
-
-GAMIFICATION_COMPUTATION_MODE = [
-    ('sum','Sum'),
-    ('count','Count'),
-    ('manually','Manually')
-]
-
-GAMIFICATION_VALIDATION_CONDITION = [
-    ('minus','<='),
-    ('plus','>=')
-]
-
-GAMIFICATION_REPORT_MODE = [
-    ('board','Leader board'),
-    ('progressbar','Personal progressbar')
-]
-
-GAMIFICATION_REPORT_FREQ = [
-    ('never','Never'),
-    ('onchange','On change'),
-    ('daily','Daily'),
-    ('weekly','Weekly'),
-    ('monthly','Monthly'),
-    ('yearly', 'Yearly')
-]
+from openerp.tools.safe_eval import safe_eval
 
 
 class gamification_goal_type(osv.Model):
@@ -82,7 +37,11 @@ class gamification_goal_type(osv.Model):
     _columns = {
         'name': fields.char('Type Name', required=True),
         'description': fields.text('Description'),
-        'computation_mode': fields.selection(GAMIFICATION_COMPUTATION_MODE,
+        'computation_mode': fields.selection([
+                ('sum','Sum'),
+                ('count','Count'),
+                ('manually','Manually')
+            ],
             string="Mode of Computation",
             help="""How is computed the goal value :\n
 - 'Sum' for the total of the values if the 'Evaluated field'\n
@@ -101,7 +60,10 @@ class gamification_goal_type(osv.Model):
         'domain': fields.char("Domain",
             help="Technical filters rules to apply",
             required=True), # how to apply it ?
-        'condition' : fields.selection(GAMIFICATION_VALIDATION_CONDITION,
+        'condition' : fields.selection([
+                ('minus','<='),
+                ('plus','>=')
+            ],
             string='Validation Condition',
             help='A goal is considered as completed when the current value is compared to the value to reach',
             required=True),
@@ -118,6 +80,15 @@ class gamification_goal_type(osv.Model):
         'domain':"[]",
     }
 
+
+
+def compute_goal_completeness(current, target_goal):
+    # more than 100% case is handled by the widget
+    if target_goal > 0:
+        return 100.0 * current / target_goal
+    else:
+        return 0.0
+
 class gamification_goal(osv.Model):
     """Goal instance for a user
 
@@ -131,11 +102,7 @@ class gamification_goal(osv.Model):
     def _get_completeness(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for goal in self.browse(cr, uid, ids, context):
-            # more than 100% case is handled by the widget
-            if goal.target_goal > 0:
-                res[goal.id] = 100.0 * goal.current / goal.target_goal
-            else:
-                res[goal.id] = 0.0
+            res[goal.id] = compute_goal_completeness(goal.current, goal.target_goal)
         return res
 
     _columns = {
@@ -144,7 +111,7 @@ class gamification_goal(osv.Model):
             required=True,
             ondelete="cascade"),
         'user_id' : fields.many2one('res.users', string='User', required=True),
-        'plan_id' : fields.many2one('gamification.goal.plan',
+        'planline_id' : fields.many2one('gamification.goal.planline',
             string='Goal Plan',
             ondelete="cascade"),
         'start_date' : fields.date('Start Date'),
@@ -157,8 +124,14 @@ class gamification_goal(osv.Model):
             track_visibility = 'always'),
         'completeness': fields.function(_get_completeness,
             type='float',
-            string='Occupation'),
-        'state': fields.selection(GAMIFICATION_GOAL_STATE,
+            string='Completeness'),
+        'state': fields.selection([
+                ('inprogress', 'In progress'),
+                ('inprogress_update', 'In progress (to update)'),
+                ('reached', 'Reached'),
+                ('failed', 'Failed'),
+                ('canceled', 'Canceled'),
+            ],
             string='State',
             required=True,
             track_visibility = 'always'),
@@ -210,18 +183,38 @@ class gamification_goal_plan(osv.Model):
         'autojoin_group_id' : fields.many2one('res.groups',
             string='Group',
             help='Group of users whose members will automatically be added to the users'),
-        'period' : fields.selection(GAMIFICATION_PERIOD_STATE,
-            string='Period',
+        'period' : fields.selection([
+                ('once', 'Manual'),
+                ('daily', 'Daily'),
+                ('weekly', 'Weekly'),
+                ('monthly', 'Monthly'),
+                ('yearly', 'Yearly')
+            ],
+            string='Periodicity',
             help='Period of automatic goal assigment, will be done manually if none is selected',
             required=True),
-        'state': fields.selection(GAMIFICATION_PLAN_STATE,
+        'state': fields.selection([
+                ('draft', 'Draft'),
+                ('inprogress', 'In progress'),
+                ('done', 'Done'),
+            ],
             string='State',
             required=True),
-        'report_mode':fields.selection(GAMIFICATION_REPORT_MODE,
-            string="Mode",
-            help='How is displayed the results, shared or in a signle progressbar',
+        'visibility_mode':fields.selection([
+                ('board','Leader board'),
+                ('progressbar','Personal progressbar')
+            ],
+            string="Visibility",
+            help='How are displayed the results, shared or in a single progressbar',
             required=True),
-        'report_message_frequency':fields.selection(GAMIFICATION_REPORT_FREQ,
+        'report_message_frequency':fields.selection([
+                ('never','Never'),
+                ('onchange','On change'),
+                ('daily','Daily'),
+                ('weekly','Weekly'),
+                ('monthly','Monthly'),
+                ('yearly', 'Yearly')
+            ],
             string="Frequency",
             required=True),
         'report_message_group_id' : fields.many2one('mail.group',
@@ -235,7 +228,7 @@ class gamification_goal_plan(osv.Model):
     _defaults = {
         'period': 'once',
         'state': 'draft',
-        'report_mode' : 'progressbar',
+        'visibility_mode' : 'progressbar',
         'report_message_frequency' : 'onchange',
     }
 
@@ -287,6 +280,24 @@ class gamification_goal_plan(osv.Model):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
 
+    def generate_goals_from_plan(self, cr, uid, ids, context=None):
+        """Generate the lsit of goals fron a plan"""
+        for plan in self.browse(cr, uid, ids, context):
+            for planline in plan.planline_ids:
+                for user in plan.user_ids:
+                    goal_obj = self.pool.get('gamification.goal')
+                    current = compute_current_value(planline.type_id, user_id)
+                    goal_id = goal_obj.create(cr, uid, {
+                        'type_id': planline.type_id,
+                        'user_id': user.id,
+                        'start_date':0,
+                        'end_date':0,
+                        'target_goal':planline.target_goal,
+                        'state':'inprogress',
+                        'last_update':fields.date.today,
+                    }, context=context)
+
+
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
 
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 8c695d68d53..20a30607359 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -5,7 +5,6 @@
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
             <field name="view_mode">tree,form,calendar</field>
-            <field name="context">{'search_default_my_in_progress': 1}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal. 
@@ -30,7 +29,7 @@
                     <field name="end_date"/>
                     <field name="completeness" widget="progressbar"/>
                     <field name="state" invisible="1"/>
-                    <field name="plan_id" invisible="1"/>
+                    <field name="planline_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -41,7 +40,8 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" class="oe_highlight"/>
+                        <button string="Refresh state" type="object" name="action_refresh" states="inprogress,inprogress_update" class="oe_highlight"/>
+                        <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
                         <field name="state" widget="statusbar" statusbar_visible="inprogress,inprogress_update" />
@@ -51,7 +51,7 @@
                             <group string="Reference">
                                 <field name="type_id"/>
                                 <field name="user_id"/>
-                                <field name="plan_id"/>
+                                <field name="planline_id"/>
                             </group>
                             <group string="Schedule">
                                 <field name="start_date"/>
@@ -89,9 +89,9 @@
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <search string="Search Goals">
-                    <filter name="my_in_progress" string="My Goals in Progress"
+                    <filter name="my_inprogress" string="My Goals in Progress"
                         domain="[('user_id', '=', uid),('state', 'in', ('inprogress', 'inprogress_update'))]"/>
-                    <field name="plan_id"/>
+                    <field name="planline_id"/>
                     <field name="user_id"/>
                     <field name="type_id"/>
                     <group expand="0" string="Group By...">
@@ -99,7 +99,6 @@
                         <filter string="Goal Type" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="End Date" domain="[]" context="{'group_by':'end_date'}"/>
-                        <filter string="Plan" domain="[]" context="{'group_by':'plan_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index 123513fe9f6..b10c346922d 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -6,7 +6,6 @@
             <field name="name">Goal Plans</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_draft_active': 1}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal plan. 
@@ -57,7 +56,7 @@
                             <div class="oe_edit_only">
                                 <label for="name"/>
                             </div>
-                            <field name="name"/>
+                            <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
                         </h1>
 
                         <!-- action buttons -->
@@ -67,24 +66,24 @@
 
                         <group>
                             <group colspan="4">
-                                <field name="period"/>
+                                <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="remind_update_delays"/>
+                                <field name="visibility_mode"/>
                             </group>
                             <group string="Report">
-                                <field name="report_mode"/>
-                                <field name="report_message_frequency"/>
-                                <field name="report_message_group_id"/>
-                                <field name="report_header"/>
-                                <field name="remind_update_delays"/>
+                                <field name="report_message_group_id" />
+                                <field name="report_message_frequency" attrs="{'invisible':[('report_message_group_id','!=', False)], 'required':[('report_message_group_id','!=', False)]}"/>
+                                <field name="report_header" attrs="{'invisible':[('report_message_group_id','!=', False)]}"/>
                             </group>
                         </group>
                         
                         <group string="Planlines">
-                                <field name="planline_ids" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
-                                    <tree string="Planline List" version="7.0" editable="bottom" >
-                                        <field name="type_id"/>
-                                        <field name="target_goal"/>
-                                    </tree>
-                                </field>
+                            <field name="planline_ids" nolabel="1">
+                                <tree string="Planline List" version="7.0" editable="bottom" >
+                                    <field name="type_id"/>
+                                    <field name="target_goal"/>
+                                </tree>
+                            </field>
                         </group>
                         
                         <group string="Subscription">
@@ -135,7 +134,7 @@
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <search string="Search Goal Plans">
-                    <filter name="draft_active" string="Draft or Active Plans"
+                    <filter name="draft_inprogress" string="Non-closed Plans"
                         domain="[('state', 'in', ('inprogress', 'draft'))]"/>
                     <field name="name"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
index 9a6f1029ef2..8593148430b 100644
--- a/addons/gamification/view/type.xml
+++ b/addons/gamification/view/type.xml
@@ -50,10 +50,10 @@
                             <group string="Computation">
                                 <field name="computation_mode"/>
 
-                                <!-- Hide the fields beloz if manually -->
+                                <!-- Hide the fields below if manually -->
                                 <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
-                                <field name="field_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" domain="[('model_id','=',model_id)]" />
-                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
+                                <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]" />
+                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
                                 <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
                             </group>
                         </group>

From 24480eefa9c94f15ad109306ac739c87cbd7f4dd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Feb 2013 15:22:48 +0100
Subject: [PATCH 054/547] [ADD] gamification: add update function checking the
 completeness of the goal

bzr revid: mat@openerp.com-20130220142248-q2vut3ys31umd5ob
---
 addons/gamification/goal.py | 54 +++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index ba452d7636f..be753ed87a2 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -145,6 +145,58 @@ class gamification_goal(osv.Model):
         'start_date': fields.date.today,
     }
 
+    def update(self, cr, uid, ids, context=None):
+        """Update the goals to recomputes values and change of states"""
+
+        for goal in self.browse(cr, uid, ids, context=context or {}):
+            if goal.state not in ('inprogress','inprogress_update'): # reached ?
+                continue
+
+            if goal.type_id.computation_mode == 'sum':
+                obj = self.pool.get(goal.type_id.model_id.model)
+                field_name = goal.type_id.field_id.name
+                field_date_name = goal.type_id.field_date_id.name
+                
+                domain = safe_eval(goal.type_id.domain)
+                domain.append(('user_id', '=', goal.user_id.id))
+                if goal.start_date:
+                    domain.append((field_date_name, '>=', goal.start_date))
+                if goal.end_date:
+                    domain.append((field_date_name, '<=', goal.end_date))
+
+                res = obj.read_group(cr, uid, domain, [field_name],
+                    [''], context=context)
+                print("domain", domain, "res", res)
+                current = res[0][field_name]
+                
+            elif goal.type_id.computation_mode == 'count':
+                obj = self.pool.get(goal.type_id.model_id.model)
+                field_date_name = goal.type_id.field_date_id.name
+                
+                domain = safe_eval(goal.type_id.domain)
+                domain.append(('user_id', '=', goal.user_id.id))
+                if goal.start_date:
+                    domain.append((field_date_name, '>=', goal.start_date))
+                if goal.end_date:
+                    domain.append((field_date_name, '<=', goal.end_date))
+
+                res = obj.search(cr, uid, domain, context=context)
+                print("domain", domain, "res", len(res), res)
+                current = len(res)
+            
+            # else computation_mode == 'manually', nothing to compute
+
+            towrite = {'current': current}
+            if (goal.type_id.condition == 'plus' and current >= goal.target_goal) \
+            or (goal.type_id.condition == 'minus' and current <= goal.target_goal):
+                towrite['state'] = 'reached'
+
+            elif goal.end_date and fields.date.today > goal.end_date:
+                towrite['state'] = 'failed'
+
+            self.write(cr, uid, [goal.id], towrite, context=context)
+        return True
+
     def action_reach(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'reached'}, context=context)
 
@@ -154,6 +206,8 @@ class gamification_goal(osv.Model):
     def action_cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
+    def action_refresh(self, cr, uid, ids, context=None):
+        return self.update(cr, uid, ids, context=context)
 
 
 class gamification_goal_plan(osv.Model):

From e6fddc4d9f97116161a960eb0f9efed238e3b65e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Feb 2013 17:05:17 +0100
Subject: [PATCH 055/547] [IMP] gamification: update process for manual goals

bzr revid: mat@openerp.com-20130220160517-12orl8h9u6tqxuq2
---
 addons/gamification/goal.py       | 54 ++++++++++++++++++++++++-------
 addons/gamification/view/goal.xml |  6 ++--
 addons/gamification/view/plan.xml |  2 +-
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index be753ed87a2..4179f30e181 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -22,6 +22,7 @@
 from openerp.osv import fields, osv
 from openerp.tools.safe_eval import safe_eval
 
+from datetime import timedelta
 
 class gamification_goal_type(osv.Model):
     """Goal type definition
@@ -104,6 +105,15 @@ class gamification_goal(osv.Model):
         for goal in self.browse(cr, uid, ids, context):
             res[goal.id] = compute_goal_completeness(goal.current, goal.target_goal)
         return res
+        
+    def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
+        goal_type = self.pool.get('gamification.goal.type')
+        if not type_id:
+            return {'value':{'type_id': False}}
+        goal_type = goal_type.browse(cr, uid, type_id, context=context)
+        ret = {'value' : {'computation_mode' : goal_type.computation_mode}}
+        print(ret)
+        return ret
 
     _columns = {
         'type_id' : fields.many2one('gamification.goal.type', 
@@ -135,6 +145,12 @@ class gamification_goal(osv.Model):
             string='State',
             required=True,
             track_visibility = 'always'),
+
+        'computation_mode': fields.related('type_id','computation_mode',
+            type='char', 
+            string="Type computation mode"),
+        'remind_update_delay' : fields.integer('Remind delay',
+            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
         'last_update' : fields.date('Last Update',
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."), #
     }
@@ -143,13 +159,20 @@ class gamification_goal(osv.Model):
         'current': 0,
         'state': 'inprogress',
         'start_date': fields.date.today,
+        'last_update': fields.date.today,
     }
 
-    def update(self, cr, uid, ids, context=None):
-        """Update the goals to recomputes values and change of states"""
+    def update(self, cr, uid, ids, context=None, force_update=False):
+        """Update the goals to recomputes values and change of states
+
+        If a goal reaches the target value, the status is set to reach
+        If the end date is passed (at least +1 day, time not considered) without
+        the target value being reached, the goal is set as failed
+        If the force_update parameter is false, only goals in progress are 
+        checked."""
 
         for goal in self.browse(cr, uid, ids, context=context or {}):
-            if goal.state not in ('inprogress','inprogress_update'): # reached ?
+            if not force_update and goal.state not in ('inprogress','inprogress_update'): # reached ?
                 continue
 
             if goal.type_id.computation_mode == 'sum':
@@ -167,7 +190,7 @@ class gamification_goal(osv.Model):
                 res = obj.read_group(cr, uid, domain, [field_name],
                     [''], context=context)
                 print("domain", domain, "res", res)
-                current = res[0][field_name]
+                towrite = {'current': res[0][field_name]}
                 
             elif goal.type_id.computation_mode == 'count':
                 obj = self.pool.get(goal.type_id.model_id.model)
@@ -182,18 +205,25 @@ class gamification_goal(osv.Model):
 
                 res = obj.search(cr, uid, domain, context=context)
                 print("domain", domain, "res", len(res), res)
-                current = len(res)
-            
-            # else computation_mode == 'manually', nothing to compute
+                towrite = {'current': len(res)}
 
-            towrite = {'current': current}
+            else:
+                current = goal.current
+                towrite = {'current': current}
+                # computation_mode == 'manually'
+                if goal.remind_update_delay and goal.last_update:
+                    delta_max = timedelta(days=goal.remind_update_delay)
+                    if fields.date.today() - goal.last_update > delta_max:
+                        towrite['state'] = 'inprogress_update'
+    
             if (goal.type_id.condition == 'plus' and current >= goal.target_goal) \
             or (goal.type_id.condition == 'minus' and current <= goal.target_goal):
                 towrite['state'] = 'reached'
 
-            elif goal.end_date and fields.date.today > goal.end_date:
+            elif goal.end_date and fields.date.today() > goal.end_date:
                 towrite['state'] = 'failed'
 
+            
             self.write(cr, uid, [goal.id], towrite, context=context)
         return True
 
@@ -207,11 +237,11 @@ class gamification_goal(osv.Model):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def action_refresh(self, cr, uid, ids, context=None):
-        return self.update(cr, uid, ids, context=context)
+        return self.update(cr, uid, ids, context=context, force_update=True)
 
 
 class gamification_goal_plan(osv.Model):
-    """Ga;ification goal plan
+    """Gamification goal plan
 
     Set of predifined goals to be able to automate goal settings or
     quickly apply several goals manually to a group of users
@@ -275,7 +305,7 @@ class gamification_goal_plan(osv.Model):
             string='Report to',
             help='Group that will receive the report in addition to the user'),
         'report_header' : fields.text('Report Header'),
-        'remind_update_delays' : fields.integer('Remind delays',
+        'remind_update_delay' : fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified.")
         }
 
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 20a30607359..81145f0cc6e 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -40,7 +40,7 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Refresh state" type="object" name="action_refresh" states="inprogress,inprogress_update" class="oe_highlight"/>
+                        <button string="Refresh state" type="object" name="action_refresh" class="oe_highlight"/>
                         <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
@@ -49,13 +49,15 @@
                     <sheet>
                         <group>
                             <group string="Reference">
-                                <field name="type_id"/>
+                                <field name="type_id" on_change="on_change_type_id(type_id)" />
                                 <field name="user_id"/>
                                 <field name="planline_id"/>
                             </group>
                             <group string="Schedule">
                                 <field name="start_date"/>
                                 <field name="end_date"/>
+                                <field name="computation_mode" invisible="1"/>
+                                <field name="remind_update_delay" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
                             </group>
                             <group string="Data">
                                 <field name="target_goal"/>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index b10c346922d..d31df0c2293 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -67,7 +67,7 @@
                         <group>
                             <group colspan="4">
                                 <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="remind_update_delays"/>
+                                <field name="remind_update_delay"/>
                                 <field name="visibility_mode"/>
                             </group>
                             <group string="Report">

From c0089ec65855fbece90bc59c63c6ae089d889f7a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Feb 2013 17:17:55 +0100
Subject: [PATCH 056/547] [REF] gamification: restructuration of update goal

bzr revid: mat@openerp.com-20130220161755-yli6nars29djgj7v
---
 addons/gamification/goal.py | 71 ++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 40 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 4179f30e181..c2e08619979 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -105,7 +105,7 @@ class gamification_goal(osv.Model):
         for goal in self.browse(cr, uid, ids, context):
             res[goal.id] = compute_goal_completeness(goal.current, goal.target_goal)
         return res
-        
+
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
         goal_type = self.pool.get('gamification.goal.type')
         if not type_id:
@@ -175,54 +175,45 @@ class gamification_goal(osv.Model):
             if not force_update and goal.state not in ('inprogress','inprogress_update'): # reached ?
                 continue
 
-            if goal.type_id.computation_mode == 'sum':
-                obj = self.pool.get(goal.type_id.model_id.model)
-                field_name = goal.type_id.field_id.name
-                field_date_name = goal.type_id.field_date_id.name
-                
-                domain = safe_eval(goal.type_id.domain)
-                domain.append(('user_id', '=', goal.user_id.id))
-                if goal.start_date:
-                    domain.append((field_date_name, '>=', goal.start_date))
-                if goal.end_date:
-                    domain.append((field_date_name, '<=', goal.end_date))
-
-                res = obj.read_group(cr, uid, domain, [field_name],
-                    [''], context=context)
-                print("domain", domain, "res", res)
-                towrite = {'current': res[0][field_name]}
-                
-            elif goal.type_id.computation_mode == 'count':
-                obj = self.pool.get(goal.type_id.model_id.model)
-                field_date_name = goal.type_id.field_date_id.name
-                
-                domain = safe_eval(goal.type_id.domain)
-                domain.append(('user_id', '=', goal.user_id.id))
-                if goal.start_date:
-                    domain.append((field_date_name, '>=', goal.start_date))
-                if goal.end_date:
-                    domain.append((field_date_name, '<=', goal.end_date))
-
-                res = obj.search(cr, uid, domain, context=context)
-                print("domain", domain, "res", len(res), res)
-                towrite = {'current': len(res)}
-
-            else:
-                current = goal.current
+            if goal.type_id.computation_mode == 'manually':
                 towrite = {'current': current}
-                # computation_mode == 'manually'
+                # check for remind to update
                 if goal.remind_update_delay and goal.last_update:
                     delta_max = timedelta(days=goal.remind_update_delay)
                     if fields.date.today() - goal.last_update > delta_max:
                         towrite['state'] = 'inprogress_update'
-    
-            if (goal.type_id.condition == 'plus' and current >= goal.target_goal) \
-            or (goal.type_id.condition == 'minus' and current <= goal.target_goal):
+
+            else: # count or sum
+                obj = self.pool.get(goal.type_id.model_id.model)
+                field_date_name = goal.type_id.field_date_id.name
+                
+                domain = safe_eval(goal.type_id.domain)
+                domain.append(('user_id', '=', goal.user_id.id))
+                if goal.start_date:
+                    domain.append((field_date_name, '>=', goal.start_date))
+                if goal.end_date:
+                    domain.append((field_date_name, '<=', goal.end_date))
+
+                if goal.type_id.computation_mode == 'sum':
+                    field_name = goal.type_id.field_id.name
+                    res = obj.read_group(cr, uid, domain, [field_name],
+                        [''], context=context)
+                    towrite = {'current': res[0][field_name]}
+                
+                else: # computation mode = count
+                    res = obj.search(cr, uid, domain, context=context)
+                    towrite = {'current': len(res)}
+
+            # check goal target reached
+            if (goal.type_id.condition == 'plus' \
+                and towrite['current'] >= goal.target_goal) \
+            or (goal.type_id.condition == 'minus' \
+                and towrite['current'] <= goal.target_goal):
                 towrite['state'] = 'reached'
 
+            # check goal failure
             elif goal.end_date and fields.date.today() > goal.end_date:
                 towrite['state'] = 'failed'
-
             
             self.write(cr, uid, [goal.id], towrite, context=context)
         return True

From aca94d473e19c2a54d1010376224776a710e1522 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Feb 2013 17:30:44 +0100
Subject: [PATCH 057/547] [FIX] gamification: plan report option displayed when
 group selected

bzr revid: mat@openerp.com-20130220163044-3362hajlk9ry1bkr
---
 addons/gamification/goal.py       | 1 +
 addons/gamification/view/plan.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index c2e08619979..297af97ce76 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -228,6 +228,7 @@ class gamification_goal(osv.Model):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def action_refresh(self, cr, uid, ids, context=None):
+        """Update the state of goal, force to recomputes values"""
         return self.update(cr, uid, ids, context=context, force_update=True)
 
 
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index d31df0c2293..fd67719044d 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -72,8 +72,8 @@
                             </group>
                             <group string="Report">
                                 <field name="report_message_group_id" />
-                                <field name="report_message_frequency" attrs="{'invisible':[('report_message_group_id','!=', False)], 'required':[('report_message_group_id','!=', False)]}"/>
-                                <field name="report_header" attrs="{'invisible':[('report_message_group_id','!=', False)]}"/>
+                                <field name="report_message_frequency" attrs="{'invisible':[('report_message_group_id','=', False)], 'required':[('report_message_group_id','=', False)]}"/>
+                                <field name="report_header" attrs="{'invisible':[('report_message_group_id','=', False)]}"/>
                             </group>
                         </group>
                         

From eb4995ac562197cd9502bbe8aff283c31c93f7c1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Feb 2013 11:46:46 +0100
Subject: [PATCH 058/547] [ADD] gamification: add creation of goals

bzr revid: mat@openerp.com-20130221104646-caspcbqasc9iqths
---
 addons/gamification/goal.py | 100 +++++++++++++++++++++++++++++-------
 1 file changed, 82 insertions(+), 18 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 297af97ce76..d2fe2e584a6 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -22,7 +22,8 @@
 from openerp.osv import fields, osv
 from openerp.tools.safe_eval import safe_eval
 
-from datetime import timedelta
+from datetime import date, timedelta
+import calendar
 
 class gamification_goal_type(osv.Model):
     """Goal type definition
@@ -218,6 +219,58 @@ class gamification_goal(osv.Model):
             self.write(cr, uid, [goal.id], towrite, context=context)
         return True
 
+    def create_goal_from_plan(self, cr, uid, ids, planline_id, user_id, start_date, context=None):
+        """If a goal for that planline and user is not already present, create it
+
+        :param planline_id: id of the planline linked to the goal
+        :param user_id: id of the user linked to the goal
+        :param start_date: first day of the plan, False for non-automatic plans
+            (where period is set to 'once')
+        If a goal matching these three parameters is already present, no goal is
+        created. In the case of manual plan (no start_date), the goal is always
+        created.
+        """
+
+        obj = self.pool.get('gamification.goal')
+        if start_date:
+            domain = [('planline_id', '=', planline_id),
+                ('user_id', '=', user_id),
+                ('start_date', '=', start_date.isoformat())]
+            res = obj.search(cr, uid, domain, context=context)
+            if len(res) > 0:
+                # already exist, skip
+                return True
+
+        planline = self.pool.get('gamification.goal.planline').browse(cr, uid, planline_id, context)
+        values = {
+            'type_id':planline.type_id.id,
+            'planline_id':planline_id,
+            'user_id':user_id,
+            'target_goal':planline.target_goal,
+        }
+
+        if start_date:
+            values['start_date'] = start_date.isoformat()
+        if planline.plan_id.period != 'once':
+            if planline.plan_id.period == 'daily':
+                values['end_date'] = start_date + timedelta(days=1)
+            elif planline.plan_id.period == 'weekly':
+                values['end_date'] = start_date + timedelta(days=7)
+            elif planline.plan_id.period == 'monthly':
+                month_range = calendar.monthrange(start_date.year, start_date.month)
+                values['end_date'] = start_date.replace(day=month_range[1])
+            elif planline.plan_id.period == 'yearly':
+                values['end_date'] = start_date.replace(month=12, day=31)
+        if planline.plan_id.remind_update_delay:
+            values['remind_update_delay'] = planline.plan_id.remind_update_delay
+        
+        obj.create(cr, uid, values, context)
+
+
+    def cancel_goal_from_plan(self, planline, user):
+        """Apply action to goals after it's plan has been canceled"""
+        pass
+
     def action_reach(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'reached'}, context=context)
 
@@ -330,48 +383,59 @@ class gamification_goal_plan(osv.Model):
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
 
-        Change the state of the plan to in progress
-        TODO: generate related goals"""
+        Change the state of the plan to in progress"""
+        self.generate_goals_from_plan(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def action_close(self, cr, uid, ids, context=None):
         """Close a plan in progress
 
         Change the state of the plan to in done
-        TODO: close the related goals"""
+        Does NOT close the related goals ?"""
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def action_cancel(self, cr, uid, ids, context=None):
         """Cancel a plan in progress
 
         Change the state of the plan to draft
-        TODO: close the related goals ?"""
-        return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        Close the related goals"""
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        for plan in self.browse(cr, uid, ids, context):
+            for planline in plan.planline_ids:
+                for user in plan.user_ids:
+                    goal_obj = self.pool.get('gamification.goal')
+                    goal_obj.cancel_goal_from_plan(planline, user)
+
+        return True
 
     def action_reset(self, cr, uid, ids, context=None):
         """Reset a closed goal plan
 
-        Change the state of the plan to in progress
-        TODO: reopen unfinished goals ?"""
+        Change the state of the plan to in progress"""
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
 
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the lsit of goals fron a plan"""
         for plan in self.browse(cr, uid, ids, context):
+            today = date.today() #fields.date.today()
+            if plan.period == 'daily':
+                start_date = today
+            elif plan.period == 'weekly':
+                delta = timedelta(days=today.weekday())
+                start_date = today - delta
+            elif plan.period == 'monthly':
+                delta = timedelta(days=today.day-1)
+                start_date = today - delta
+            elif plan.period == 'yearly':
+                start_date = today.replace(month=1, day=1)
+            elif plan.period == 'once':
+                start_date = False # for manual goal, start each time
+
             for planline in plan.planline_ids:
                 for user in plan.user_ids:
                     goal_obj = self.pool.get('gamification.goal')
-                    current = compute_current_value(planline.type_id, user_id)
-                    goal_id = goal_obj.create(cr, uid, {
-                        'type_id': planline.type_id,
-                        'user_id': user.id,
-                        'start_date':0,
-                        'end_date':0,
-                        'target_goal':planline.target_goal,
-                        'state':'inprogress',
-                        'last_update':fields.date.today,
-                    }, context=context)
+                    goal_obj.create_goal_from_plan(cr, uid, ids, planline.id, user.id, start_date, context=context)
 
 
 class gamification_goal_planline(osv.Model):

From ff783fe742055a96bce75c34d2459f318852b0da Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Feb 2013 12:15:55 +0100
Subject: [PATCH 059/547] [IMP] gamification: cancel a plan cancel the related
 goals

bzr revid: mat@openerp.com-20130221111555-tgvt52v5g9pfdggp
---
 addons/gamification/goal.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index d2fe2e584a6..866a6bcdd14 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -236,8 +236,8 @@ class gamification_goal(osv.Model):
             domain = [('planline_id', '=', planline_id),
                 ('user_id', '=', user_id),
                 ('start_date', '=', start_date.isoformat())]
-            res = obj.search(cr, uid, domain, context=context)
-            if len(res) > 0:
+            goal_ids = obj.search(cr, uid, domain, context=context)
+            if len(goal_ids) > 0:
                 # already exist, skip
                 return True
 
@@ -264,12 +264,20 @@ class gamification_goal(osv.Model):
         if planline.plan_id.remind_update_delay:
             values['remind_update_delay'] = planline.plan_id.remind_update_delay
         
-        obj.create(cr, uid, values, context)
+        new_goal_id = obj.create(cr, uid, values, context)
+        self.update(cr, uid, [new_goal_id], context=context, force_update=True)
 
 
-    def cancel_goal_from_plan(self, planline, user):
-        """Apply action to goals after it's plan has been canceled"""
-        pass
+    def cancel_goals_from_plan(self, cr, uid, ids, planline_id, context=None):
+        """Apply action to goals after it's plan has been canceled
+
+        The status of every goal related to the planline is set to 'canceled
+        :param planline_id: the id of the planline whose plan has been canceled'"""
+
+        obj = self.pool.get('gamification.goal')
+        goal_ids = obj.search(cr, uid, [('planline_id', '=', planline_id)], context=context)
+        print("cancel goals", goal_ids)
+        return self.write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
 
     def action_reach(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'reached'}, context=context)
@@ -391,20 +399,19 @@ class gamification_goal_plan(osv.Model):
         """Close a plan in progress
 
         Change the state of the plan to in done
-        Does NOT close the related goals ?"""
+        Does NOT close the related goals, this is handled by the goal itself"""
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def action_cancel(self, cr, uid, ids, context=None):
         """Cancel a plan in progress
 
         Change the state of the plan to draft
-        Close the related goals"""
+        Cancel the related goals"""
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         for plan in self.browse(cr, uid, ids, context):
             for planline in plan.planline_ids:
-                for user in plan.user_ids:
-                    goal_obj = self.pool.get('gamification.goal')
-                    goal_obj.cancel_goal_from_plan(planline, user)
+                goal_obj = self.pool.get('gamification.goal')
+                goal_obj.cancel_goals_from_plan(cr, uid, ids, planline.id, context=context)
 
         return True
 
@@ -437,6 +444,7 @@ class gamification_goal_plan(osv.Model):
                     goal_obj = self.pool.get('gamification.goal')
                     goal_obj.create_goal_from_plan(cr, uid, ids, planline.id, user.id, start_date, context=context)
 
+        return True
 
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline

From 721f5c57855e095b10f1ac7925bedaff62d5ce5f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Feb 2013 13:57:59 +0100
Subject: [PATCH 060/547] [IMP] gamification: add button to check the plan and
 related goals

bzr revid: mat@openerp.com-20130221125759-3yxmlll4iqcy504l
---
 addons/gamification/goal.py       | 35 ++++++++++++++++++++++---------
 addons/gamification/view/goal.xml |  2 +-
 addons/gamification/view/plan.xml |  1 +
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 866a6bcdd14..0c0a0af325a 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -123,7 +123,7 @@ class gamification_goal(osv.Model):
             ondelete="cascade"),
         'user_id' : fields.many2one('res.users', string='User', required=True),
         'planline_id' : fields.many2one('gamification.goal.planline',
-            string='Goal Plan',
+            string='Goal Planline',
             ondelete="cascade"),
         'start_date' : fields.date('Start Date'),
         'end_date' : fields.date('End Date'), # no start and end = always active
@@ -370,14 +370,14 @@ class gamification_goal_plan(osv.Model):
     }
 
     def _check_nonzero_planline(self, cr, uid, ids, context=None):
-        "checks that there is at least one planline set"
+        """checks that there is at least one planline set"""
         for plan in self.browse(cr, uid, ids, context):
             if len(plan.planline_ids) < 1:
                 return False
         return True
 
     def _check_nonzero_users(self, cr, uid, ids, context=None):
-        "checks that there is at least one user set"
+        """checks that there is at least one user set"""
         for plan in self.browse(cr, uid, ids, context):
             if len(plan.user_ids) < 1 and plan.state != 'draft':
                 return False
@@ -395,6 +395,21 @@ class gamification_goal_plan(osv.Model):
         self.generate_goals_from_plan(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
+    def action_check(self, cr, uid, ids, context=None):
+        """Check a goal plan in progress
+
+        Create goals that haven't been created yet (eg: if added users of planlines)
+        Recompute the current value for each goal related"""
+        self.generate_goals_from_plan(cr, uid, ids, context=context)
+        for plan in self.browse(cr, uid, ids, context):
+            for planline in plan.planline_ids:
+                goal_obj = self.pool.get('gamification.goal')
+                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
+                goal_obj.update(cr, uid, goal_ids, context=context, force_update=True)
+
+        return True
+
+
     def action_close(self, cr, uid, ids, context=None):
         """Close a plan in progress
 
@@ -402,6 +417,13 @@ class gamification_goal_plan(osv.Model):
         Does NOT close the related goals, this is handled by the goal itself"""
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
+    def action_reset(self, cr, uid, ids, context=None):
+        """Reset a closed goal plan
+
+        Change the state of the plan to in progress
+        Closing a pan does not affect the goals so reset as well"""
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+
     def action_cancel(self, cr, uid, ids, context=None):
         """Cancel a plan in progress
 
@@ -415,13 +437,6 @@ class gamification_goal_plan(osv.Model):
 
         return True
 
-    def action_reset(self, cr, uid, ids, context=None):
-        """Reset a closed goal plan
-
-        Change the state of the plan to in progress"""
-        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
-
-
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the lsit of goals fron a plan"""
         for plan in self.browse(cr, uid, ids, context):
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 81145f0cc6e..f23749b846f 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -51,7 +51,7 @@
                             <group string="Reference">
                                 <field name="type_id" on_change="on_change_type_id(type_id)" />
                                 <field name="user_id"/>
-                                <field name="planline_id"/>
+                                <field name="planline_id" groups="base.group_no_one"/>
                             </group>
                             <group string="Schedule">
                                 <field name="start_date"/>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index fd67719044d..e83ca145124 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -46,6 +46,7 @@
                 <form string="Goal types" version="7.0">
                     <header>
                         <button string="Start Plan" type="object" name="action_start" states="draft" class="oe_highlight"/>
+                        <button string="Check Plan" type="object" name="action_check" states="inprogress"/>
                         <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Cancel Plan" type="object" name="action_cancel" states="inprogress"/>
                         <button string="Reset Plan" type="object" name="action_reset" states="done"/>

From 1bc388a081d6a865bda5486d3edf338fdfe03e58 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Feb 2013 14:50:00 +0100
Subject: [PATCH 061/547] [ADD] gamification: add cron for daily check

bzr revid: mat@openerp.com-20130221135000-zlycsakfxe0q1m05
---
 addons/gamification/__openerp__.py |  1 +
 addons/gamification/cron.xml       | 31 ++++++++++++++++++++++++++++++
 addons/gamification/goal.py        | 26 ++++++++++++++++++++-----
 addons/gamification/view/goal.xml  |  3 ++-
 4 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 addons/gamification/cron.xml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 896a5b4eb01..f76d7a03c72 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -31,6 +31,7 @@
         'view/goal.xml',
         'view/plan.xml',
         'view/menu.xml',
+        'cron.xml',
         ],
     'installable': True,
     'application': True,
diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
new file mode 100644
index 00000000000..b222d0e6d8c
--- /dev/null
+++ b/addons/gamification/cron.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- Scheduler for goal checking-->
+        <record forcecreate="True" id="ir_cron_check_goal"
+            model="ir.cron">
+            <field name="name">Run Goal Checker</field>
+            <field eval="True" name="active" />
+            <field name="interval_number">1</field>
+            <field name="interval_type">day</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall" />
+            <field name="model">gamification.goal</field>
+            <field name="function">_update_all</field>
+            <field name="args">()</field>
+        </record>
+
+        <record forcecreate="True" id="ir_cron_check_goal"
+            model="ir.cron">
+            <field name="name">Run Goal Plan Checker</field>
+            <field eval="True" name="active" />
+            <field name="interval_number">1</field>
+            <field name="interval_type">day</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall" />
+            <field name="model">gamification.goal.plan</field>
+            <field name="function">_update_all</field>
+            <field name="args">()</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 0c0a0af325a..aa9bf282788 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -94,8 +94,7 @@ def compute_goal_completeness(current, target_goal):
 class gamification_goal(osv.Model):
     """Goal instance for a user
 
-    An individual goal for a user on a specified time period
-    """
+    An individual goal for a user on a specified time period"""
 
     _name = 'gamification.goal'
     _description = 'Gamification goal instance'
@@ -163,14 +162,22 @@ class gamification_goal(osv.Model):
         'last_update': fields.date.today,
     }
 
+
+
+    def _update_all(self, cr, uid, ids=False, context=None):
+        """Update every goal in progress"""
+        if not ids:
+            ids = self.search(cr, uid, [('state', 'in', ('inprogress','inprogress_update'))])
+        print("_update_all", ids)
+        return self.update(cr, uid, ids, context=context)
+
     def update(self, cr, uid, ids, context=None, force_update=False):
         """Update the goals to recomputes values and change of states
 
         If a goal reaches the target value, the status is set to reach
         If the end date is passed (at least +1 day, time not considered) without
         the target value being reached, the goal is set as failed
-        If the force_update parameter is false, only goals in progress are 
-        checked."""
+        :param force_update: if false, only goals in progress are checked."""
 
         for goal in self.browse(cr, uid, ids, context=context or {}):
             if not force_update and goal.state not in ('inprogress','inprogress_update'): # reached ?
@@ -276,7 +283,6 @@ class gamification_goal(osv.Model):
 
         obj = self.pool.get('gamification.goal')
         goal_ids = obj.search(cr, uid, [('planline_id', '=', planline_id)], context=context)
-        print("cancel goals", goal_ids)
         return self.write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
 
     def action_reach(self, cr, uid, ids, context=None):
@@ -388,6 +394,13 @@ class gamification_goal_plan(osv.Model):
         (_check_nonzero_users, "At least one user is required to create a non-draft goal plan", ['user_ids']),
     ]
 
+    def _update_all(self, cr, uid, ids=False, context=None):
+        """Update every plan in progress"""
+        if not ids:
+            ids = self.search(cr, uid, [('state', '=', 'inprogress')])
+        print("_update_all", ids)
+        return self.generate_goals_from_plan(cr, uid, ids, context=context)
+
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
 
@@ -402,6 +415,9 @@ class gamification_goal_plan(osv.Model):
         Recompute the current value for each goal related"""
         self.generate_goals_from_plan(cr, uid, ids, context=context)
         for plan in self.browse(cr, uid, ids, context):
+            if plan.state != 'improgress':
+                continue
+
             for planline in plan.planline_ids:
                 goal_obj = self.pool.get('gamification.goal')
                 goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index f23749b846f..9c641de2711 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -44,7 +44,7 @@
                         <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
-                        <field name="state" widget="statusbar" statusbar_visible="inprogress,inprogress_update" />
+                        <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
                         <group>
@@ -58,6 +58,7 @@
                                 <field name="end_date"/>
                                 <field name="computation_mode" invisible="1"/>
                                 <field name="remind_update_delay" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
+                                <field name="last_update" groups="base.group_no_one"/>
                             </group>
                             <group string="Data">
                                 <field name="target_goal"/>

From 0cc2ab390e586df29ea941cec2512e7d5cf50354 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Feb 2013 14:50:52 +0100
Subject: [PATCH 062/547] [FIX] gamification: days and not day

bzr revid: mat@openerp.com-20130221135052-yh4mu7huzjab04tt
---
 addons/gamification/cron.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index b222d0e6d8c..d1ca200111e 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -7,7 +7,7 @@
             <field name="name">Run Goal Checker</field>
             <field eval="True" name="active" />
             <field name="interval_number">1</field>
-            <field name="interval_type">day</field>
+            <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
             <field name="model">gamification.goal</field>
@@ -20,7 +20,7 @@
             <field name="name">Run Goal Plan Checker</field>
             <field eval="True" name="active" />
             <field name="interval_number">1</field>
-            <field name="interval_type">day</field>
+            <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
             <field name="model">gamification.goal.plan</field>

From 14d9a9b573ad6f76aa34fcdd8046bb3ecc15ef1e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Feb 2013 10:47:45 +0100
Subject: [PATCH 063/547] [IMP] gamification: minor improvements and fix

bzr revid: mat@openerp.com-20130222094745-jxe0m4i11qbbe1vp
---
 addons/gamification/cron.xml      |  5 ++---
 addons/gamification/goal.py       | 26 ++++++++++++++++----------
 addons/gamification/view/goal.xml |  9 +++++++--
 addons/gamification/view/plan.xml | 12 ++++++------
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index d1ca200111e..4388ac88ff9 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -5,7 +5,6 @@
         <record forcecreate="True" id="ir_cron_check_goal"
             model="ir.cron">
             <field name="name">Run Goal Checker</field>
-            <field eval="True" name="active" />
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
@@ -15,10 +14,9 @@
             <field name="args">()</field>
         </record>
 
-        <record forcecreate="True" id="ir_cron_check_goal"
+        <record forcecreate="True" id="ir_cron_check_plan"
             model="ir.cron">
             <field name="name">Run Goal Plan Checker</field>
-            <field eval="True" name="active" />
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
@@ -27,5 +25,6 @@
             <field name="function">_update_all</field>
             <field name="args">()</field>
         </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index aa9bf282788..c40a67b4eee 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -167,8 +167,7 @@ class gamification_goal(osv.Model):
     def _update_all(self, cr, uid, ids=False, context=None):
         """Update every goal in progress"""
         if not ids:
-            ids = self.search(cr, uid, [('state', 'in', ('inprogress','inprogress_update'))])
-        print("_update_all", ids)
+            ids = self.search(cr, uid, [('state', 'in', ('inprogress','inprogress_update', 'reached'))])
         return self.update(cr, uid, ids, context=context)
 
     def update(self, cr, uid, ids, context=None, force_update=False):
@@ -180,11 +179,16 @@ class gamification_goal(osv.Model):
         :param force_update: if false, only goals in progress are checked."""
 
         for goal in self.browse(cr, uid, ids, context=context or {}):
-            if not force_update and goal.state not in ('inprogress','inprogress_update'): # reached ?
+            if not force_update and goal.state not in ('inprogress','inprogress_update','reached'):
+                # skip if goal failed or canceled
+                continue
+            if goal.state == 'reached' and goal.end_date and fields.date.today() > goal.end_date:
+                # only a goal reached but not passed the end date will still be 
+                # checked (to be able to improve the score)
                 continue
 
             if goal.type_id.computation_mode == 'manually':
-                towrite = {'current': current}
+                towrite = {'current':goal.current}
                 # check for remind to update
                 if goal.remind_update_delay and goal.last_update:
                     delta_max = timedelta(days=goal.remind_update_delay)
@@ -195,8 +199,8 @@ class gamification_goal(osv.Model):
                 obj = self.pool.get(goal.type_id.model_id.model)
                 field_date_name = goal.type_id.field_date_id.name
                 
-                domain = safe_eval(goal.type_id.domain)
-                domain.append(('user_id', '=', goal.user_id.id))
+                domain = safe_eval(goal.type_id.domain, 
+                    {'user_id': goal.user_id.id})
                 if goal.start_date:
                     domain.append((field_date_name, '>=', goal.start_date))
                 if goal.end_date:
@@ -244,10 +248,11 @@ class gamification_goal(osv.Model):
                 ('user_id', '=', user_id),
                 ('start_date', '=', start_date.isoformat())]
             goal_ids = obj.search(cr, uid, domain, context=context)
+            print(domain, goal_ids)
             if len(goal_ids) > 0:
                 # already exist, skip
                 return True
-
+        print("creating goal for", planline_id, user_id, start_date)
         planline = self.pool.get('gamification.goal.planline').browse(cr, uid, planline_id, context)
         values = {
             'type_id':planline.type_id.id,
@@ -327,7 +332,7 @@ class gamification_goal_plan(osv.Model):
             string='Group',
             help='Group of users whose members will automatically be added to the users'),
         'period' : fields.selection([
-                ('once', 'Manual'),
+                ('once', 'No Periodicity'),
                 ('daily', 'Daily'),
                 ('weekly', 'Weekly'),
                 ('monthly', 'Monthly'),
@@ -397,8 +402,9 @@ class gamification_goal_plan(osv.Model):
     def _update_all(self, cr, uid, ids=False, context=None):
         """Update every plan in progress"""
         if not ids:
-            ids = self.search(cr, uid, [('state', '=', 'inprogress')])
-        print("_update_all", ids)
+            ids = self.search(cr, uid, [('state', '=', 'inprogress'),
+                ('period', '!=', 'once')])
+        print("_update_all plans", ids)
         return self.generate_goals_from_plan(cr, uid, ids, context=context)
 
     def action_start(self, cr, uid, ids, context=None):
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 9c641de2711..ed964452d9e 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -20,7 +20,7 @@
             <field name="name">Goal List</field>
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
-                <tree string="Goal List" colors="red:state == 'failed';green:state == 'reached'"> 
+                <tree string="Goal List" colors="red:state == 'failed';green:state == 'reached';grey:state == 'canceled'"> 
                     <field name="type_id"/>
                     <field name="user_id"/>
                     <field name="current"/>
@@ -57,7 +57,12 @@
                                 <field name="start_date"/>
                                 <field name="end_date"/>
                                 <field name="computation_mode" invisible="1"/>
-                                <field name="remind_update_delay" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
+
+                                <label for="remind_update_delay" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
+                                <div attrs="{'invisible':[('computation_mode','!=', 'manually')]}">
+                                    <field name="remind_update_delay" class="oe_inline"/>
+                                    days
+                                </div>
                                 <field name="last_update" groups="base.group_no_one"/>
                             </group>
                             <group string="Data">
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index e83ca145124..66af613c2fd 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -53,12 +53,12 @@
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
-                        <h1>
-                            <div class="oe_edit_only">
-                                <label for="name"/>
-                            </div>
-                            <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
-                        </h1>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>    
+                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            </h1>
+                        </div>
 
                         <!-- action buttons -->
                         <div class="oe_right oe_button_box">

From be75098490cb7b59664eaef2d299237eef231212 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Feb 2013 10:56:15 +0100
Subject: [PATCH 064/547] [REF] gamification: remove force_update parameter

bzr revid: mat@openerp.com-20130222095615-r79xrz3awc886ko6
---
 addons/gamification/goal.py       | 15 +++++----------
 addons/gamification/view/goal.xml |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index c40a67b4eee..95341d4a004 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -170,16 +170,15 @@ class gamification_goal(osv.Model):
             ids = self.search(cr, uid, [('state', 'in', ('inprogress','inprogress_update', 'reached'))])
         return self.update(cr, uid, ids, context=context)
 
-    def update(self, cr, uid, ids, context=None, force_update=False):
+    def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
 
         If a goal reaches the target value, the status is set to reach
         If the end date is passed (at least +1 day, time not considered) without
-        the target value being reached, the goal is set as failed
-        :param force_update: if false, only goals in progress are checked."""
+        the target value being reached, the goal is set as failed."""
 
         for goal in self.browse(cr, uid, ids, context=context or {}):
-            if not force_update and goal.state not in ('inprogress','inprogress_update','reached'):
+            if goal.state not in ('inprogress','inprogress_update','reached'):
                 # skip if goal failed or canceled
                 continue
             if goal.state == 'reached' and goal.end_date and fields.date.today() > goal.end_date:
@@ -277,7 +276,7 @@ class gamification_goal(osv.Model):
             values['remind_update_delay'] = planline.plan_id.remind_update_delay
         
         new_goal_id = obj.create(cr, uid, values, context)
-        self.update(cr, uid, [new_goal_id], context=context, force_update=True)
+        self.update(cr, uid, [new_goal_id], context=context)
 
 
     def cancel_goals_from_plan(self, cr, uid, ids, planline_id, context=None):
@@ -299,10 +298,6 @@ class gamification_goal(osv.Model):
     def action_cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
-    def action_refresh(self, cr, uid, ids, context=None):
-        """Update the state of goal, force to recomputes values"""
-        return self.update(cr, uid, ids, context=context, force_update=True)
-
 
 class gamification_goal_plan(osv.Model):
     """Gamification goal plan
@@ -427,7 +422,7 @@ class gamification_goal_plan(osv.Model):
             for planline in plan.planline_ids:
                 goal_obj = self.pool.get('gamification.goal')
                 goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
-                goal_obj.update(cr, uid, goal_ids, context=context, force_update=True)
+                goal_obj.update(cr, uid, goal_ids, context=context)
 
         return True
 
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index ed964452d9e..a66af16d6a9 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -40,7 +40,7 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Refresh state" type="object" name="action_refresh" class="oe_highlight"/>
+                        <button string="Refresh state" type="object" name="update" class="oe_highlight"/>
                         <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>

From 4c3ff4303a7efe8b22cd0e5817e4577f6032c830 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Feb 2013 12:44:21 +0100
Subject: [PATCH 065/547] [ADD] gamification: add autosubscription from groups

bzr revid: mat@openerp.com-20130222114421-dueg3178wdtv2gk8
---
 addons/gamification/__init__.py   |  3 ++-
 addons/gamification/goal.py       | 25 ++++++++++++++---
 addons/gamification/res_users.py  | 45 +++++++++++++++++++++++++++++++
 addons/gamification/view/goal.xml |  2 +-
 4 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 addons/gamification/res_users.py

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index 7c0f769d0b0..a406bf3a621 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -1 +1,2 @@
-import goal
\ No newline at end of file
+import goal
+import res_users
\ No newline at end of file
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 95341d4a004..8861a5b6bb8 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -24,6 +24,8 @@ from openerp.tools.safe_eval import safe_eval
 
 from datetime import date, timedelta
 import calendar
+import itertools
+
 
 class gamification_goal_type(osv.Model):
     """Goal type definition
@@ -112,7 +114,6 @@ class gamification_goal(osv.Model):
             return {'value':{'type_id': False}}
         goal_type = goal_type.browse(cr, uid, type_id, context=context)
         ret = {'value' : {'computation_mode' : goal_type.computation_mode}}
-        print(ret)
         return ret
 
     _columns = {
@@ -168,6 +169,7 @@ class gamification_goal(osv.Model):
         """Update every goal in progress"""
         if not ids:
             ids = self.search(cr, uid, [('state', 'in', ('inprogress','inprogress_update', 'reached'))])
+
         return self.update(cr, uid, ids, context=context)
 
     def update(self, cr, uid, ids, context=None):
@@ -247,11 +249,10 @@ class gamification_goal(osv.Model):
                 ('user_id', '=', user_id),
                 ('start_date', '=', start_date.isoformat())]
             goal_ids = obj.search(cr, uid, domain, context=context)
-            print(domain, goal_ids)
             if len(goal_ids) > 0:
                 # already exist, skip
                 return True
-        print("creating goal for", planline_id, user_id, start_date)
+
         planline = self.pool.get('gamification.goal.planline').browse(cr, uid, planline_id, context)
         values = {
             'type_id':planline.type_id.id,
@@ -399,7 +400,7 @@ class gamification_goal_plan(osv.Model):
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress'),
                 ('period', '!=', 'once')])
-        print("_update_all plans", ids)
+
         return self.generate_goals_from_plan(cr, uid, ids, context=context)
 
     def action_start(self, cr, uid, ids, context=None):
@@ -478,6 +479,22 @@ class gamification_goal_plan(osv.Model):
 
         return True
 
+
+    def plan_subscribe_users(self, cr, uid, ids, user_ids, context=None):
+        """ Add the following users to plans
+
+        :param ids: ids of plans to which the users will be added
+        :param user_ids: ids of the users to add"""
+
+        print("subscibe users", ids, user_ids)
+        for plan in self.browse(cr,uid, ids, context):
+            subscription = [user.id for user in plan.user_ids]
+            subscription.extend(user_ids)
+            unified_subscription = list(set(subscription))
+            self.write(cr, uid, ids, {'user_ids': [(4, uid) for uid in unified_subscription]}, context=context)
+        return True
+
+
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
 
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
new file mode 100644
index 00000000000..f2f54d9b324
--- /dev/null
+++ b/addons/gamification/res_users.py
@@ -0,0 +1,45 @@
+from openerp.osv import osv
+
+class res_users_gamification_group(osv.Model):
+    """ Update of res.users class
+        - if adding groups to an user, check gamification.goal.plan linked to 
+        this group, and the user. This is done by overriding the write method.
+    """
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    def write(self, cr, uid, ids, vals, context=None):
+        print("Overwrite res_users_gamification_group", ids)
+        write_res = super(res_users_gamification_group, self).write(cr, uid, ids, vals, context=context)
+        if vals.get('groups_id'):
+            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
+            user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4]
+            user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
+
+            goal_plan_obj = self.pool.get('gamification.goal.plan')
+            plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
+
+            goal_plan_obj.plan_subscribe_users(cr, uid, plan_ids, ids, context=context)
+        return write_res
+
+class res_groups_gamification_group(osv.Model):
+    """ Update of res.groups class
+        - if adding users from a group, check gamification.goal.plan linked to 
+        this group, and the user. This is done by overriding the write method.
+    """
+    _name = 'res.groups'
+    _inherit = 'res.groups'
+
+    def write(self, cr, uid, ids, vals, context=None):
+        print("Overwrite res_groups_gamification_group", ids)
+        write_res = super(res_groups_gamification_group, self).write(cr, uid, ids, vals, context=context)
+        if vals.get('users'):
+            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
+            user_ids = [command[1] for command in vals['users'] if command[0] == 4]
+            user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
+
+            goal_plan_obj = self.pool.get('gamification.goal.plan')
+            plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', ids)], context=context)
+
+            goal_plan_obj.plan_subscribe_users(cr, uid, plan_ids, user_ids, context=context)
+        return write_res
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index a66af16d6a9..b871fd9cbf1 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -67,7 +67,7 @@
                             </group>
                             <group string="Data">
                                 <field name="target_goal"/>
-                                <field name="current"/>
+                                <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}"/>
                             </group>
                         </group>
                     </sheet>

From aa9b855cb8f053dcf8635bb005295642e4409d80 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Feb 2013 14:40:24 +0100
Subject: [PATCH 066/547] [IMP] gamification: and draft state and readonly if
 not draft

bzr revid: mat@openerp.com-20130222134024-kbdgivricb2zwxgo
---
 addons/gamification/goal.py       |  4 +++-
 addons/gamification/view/goal.xml | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 8861a5b6bb8..5016f81a17f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -137,6 +137,7 @@ class gamification_goal(osv.Model):
             type='float',
             string='Completeness'),
         'state': fields.selection([
+                ('draft', 'Draft'),
                 ('inprogress', 'In progress'),
                 ('inprogress_update', 'In progress (to update)'),
                 ('reached', 'Reached'),
@@ -158,7 +159,7 @@ class gamification_goal(osv.Model):
 
     _defaults = {
         'current': 0,
-        'state': 'inprogress',
+        'state': 'draft',
         'start_date': fields.date.today,
         'last_update': fields.date.today,
     }
@@ -259,6 +260,7 @@ class gamification_goal(osv.Model):
             'planline_id':planline_id,
             'user_id':user_id,
             'target_goal':planline.target_goal,
+            'state':'inprogress',
         }
 
         if start_date:
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index b871fd9cbf1..926d02f9c71 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -49,13 +49,13 @@
                     <sheet>
                         <group>
                             <group string="Reference">
-                                <field name="type_id" on_change="on_change_type_id(type_id)" />
-                                <field name="user_id"/>
-                                <field name="planline_id" groups="base.group_no_one"/>
+                                <field name="type_id" on_change="on_change_type_id(type_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="planline_id" groups="base.group_no_one"  attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group string="Schedule">
-                                <field name="start_date"/>
-                                <field name="end_date"/>
+                                <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="end_date" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="computation_mode" invisible="1"/>
 
                                 <label for="remind_update_delay" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
@@ -66,7 +66,7 @@
                                 <field name="last_update" groups="base.group_no_one"/>
                             </group>
                             <group string="Data">
-                                <field name="target_goal"/>
+                                <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}"/>
                             </group>
                         </group>

From af6834a2de2453d8168bd587db04d6cebde0c1ab Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Feb 2013 15:10:16 +0100
Subject: [PATCH 067/547] [REF] gamification: simplify generate and cancel
 functions

bzr revid: mat@openerp.com-20130222141016-dpze7i6xveboaxya
---
 addons/gamification/goal.py | 101 ++++++++++++++----------------------
 1 file changed, 40 insertions(+), 61 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 5016f81a17f..8f38e718773 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -232,65 +232,6 @@ class gamification_goal(osv.Model):
             self.write(cr, uid, [goal.id], towrite, context=context)
         return True
 
-    def create_goal_from_plan(self, cr, uid, ids, planline_id, user_id, start_date, context=None):
-        """If a goal for that planline and user is not already present, create it
-
-        :param planline_id: id of the planline linked to the goal
-        :param user_id: id of the user linked to the goal
-        :param start_date: first day of the plan, False for non-automatic plans
-            (where period is set to 'once')
-        If a goal matching these three parameters is already present, no goal is
-        created. In the case of manual plan (no start_date), the goal is always
-        created.
-        """
-
-        obj = self.pool.get('gamification.goal')
-        if start_date:
-            domain = [('planline_id', '=', planline_id),
-                ('user_id', '=', user_id),
-                ('start_date', '=', start_date.isoformat())]
-            goal_ids = obj.search(cr, uid, domain, context=context)
-            if len(goal_ids) > 0:
-                # already exist, skip
-                return True
-
-        planline = self.pool.get('gamification.goal.planline').browse(cr, uid, planline_id, context)
-        values = {
-            'type_id':planline.type_id.id,
-            'planline_id':planline_id,
-            'user_id':user_id,
-            'target_goal':planline.target_goal,
-            'state':'inprogress',
-        }
-
-        if start_date:
-            values['start_date'] = start_date.isoformat()
-        if planline.plan_id.period != 'once':
-            if planline.plan_id.period == 'daily':
-                values['end_date'] = start_date + timedelta(days=1)
-            elif planline.plan_id.period == 'weekly':
-                values['end_date'] = start_date + timedelta(days=7)
-            elif planline.plan_id.period == 'monthly':
-                month_range = calendar.monthrange(start_date.year, start_date.month)
-                values['end_date'] = start_date.replace(day=month_range[1])
-            elif planline.plan_id.period == 'yearly':
-                values['end_date'] = start_date.replace(month=12, day=31)
-        if planline.plan_id.remind_update_delay:
-            values['remind_update_delay'] = planline.plan_id.remind_update_delay
-        
-        new_goal_id = obj.create(cr, uid, values, context)
-        self.update(cr, uid, [new_goal_id], context=context)
-
-
-    def cancel_goals_from_plan(self, cr, uid, ids, planline_id, context=None):
-        """Apply action to goals after it's plan has been canceled
-
-        The status of every goal related to the planline is set to 'canceled
-        :param planline_id: the id of the planline whose plan has been canceled'"""
-
-        obj = self.pool.get('gamification.goal')
-        goal_ids = obj.search(cr, uid, [('planline_id', '=', planline_id)], context=context)
-        return self.write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
 
     def action_reach(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'reached'}, context=context)
@@ -453,7 +394,9 @@ class gamification_goal_plan(osv.Model):
         for plan in self.browse(cr, uid, ids, context):
             for planline in plan.planline_ids:
                 goal_obj = self.pool.get('gamification.goal')
-                goal_obj.cancel_goals_from_plan(cr, uid, ids, planline.id, context=context)
+
+                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
+                goal_obj.write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
 
         return True
 
@@ -476,8 +419,44 @@ class gamification_goal_plan(osv.Model):
 
             for planline in plan.planline_ids:
                 for user in plan.user_ids:
+                    #self.create_goal_from_plan(cr, uid, ids, planline.id, user.id, start_date, context=context)
+
                     goal_obj = self.pool.get('gamification.goal')
-                    goal_obj.create_goal_from_plan(cr, uid, ids, planline.id, user.id, start_date, context=context)
+                    domain = [('planline_id', '=', planline.id),
+                            ('user_id', '=', user.id)]
+                    if start_date:
+                        domain.append(('start_date', '=', start_date.isoformat()))
+                    
+                    # skip if goal already exist
+                    if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
+                        continue
+
+                    values = {
+                        'type_id':planline.type_id.id,
+                        'planline_id':planline.id,
+                        'user_id':user.id,
+                        'target_goal':planline.target_goal,
+                        'state':'inprogress',
+                    }
+            
+                    if start_date:
+                        values['start_date'] = start_date.isoformat()
+
+                    if planline.plan_id.period == 'daily':
+                        values['end_date'] = start_date + timedelta(days=1)
+                    elif planline.plan_id.period == 'weekly':
+                        values['end_date'] = start_date + timedelta(days=7)
+                    elif planline.plan_id.period == 'monthly':
+                        month_range = calendar.monthrange(start_date.year, start_date.month)
+                        values['end_date'] = start_date.replace(day=month_range[1])
+                    elif planline.plan_id.period == 'yearly':
+                        values['end_date'] = start_date.replace(month=12, day=31)
+                    
+                    if planline.plan_id.remind_update_delay:
+                        values['remind_update_delay'] = planline.plan_id.remind_update_delay
+
+                    new_goal_id = goal_obj.create(cr, uid, values, context)
+                    #self.update(cr, uid, [new_goal_id], context=context)
 
         return True
 

From a5c0a338636a3ebd129e6ef36bfbf8809a4b6fd2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Feb 2013 15:22:12 +0100
Subject: [PATCH 068/547] [IMP] gamification: resume canceled goals

bzr revid: mat@openerp.com-20130222142212-ioirjxt3axxh58li
---
 addons/gamification/goal.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 8f38e718773..3c1619b26c7 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -427,8 +427,16 @@ class gamification_goal_plan(osv.Model):
                     if start_date:
                         domain.append(('start_date', '=', start_date.isoformat()))
                     
-                    # skip if goal already exist
+                    # goal existing for this planline ?
                     if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
+
+                        # resume canceled goals
+                        domain.append(('state', '=', 'canceled'))
+                        canceled_goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                        goal_obj.write(cr, uid, canceled_goal_ids, {'state': 'inprogress'}, context=context)
+                        goal_obj.update(cr, uid, canceled_goal_ids, context=context)
+                        
+                        # skip to next user
                         continue
 
                     values = {
@@ -456,7 +464,8 @@ class gamification_goal_plan(osv.Model):
                         values['remind_update_delay'] = planline.plan_id.remind_update_delay
 
                     new_goal_id = goal_obj.create(cr, uid, values, context)
-                    #self.update(cr, uid, [new_goal_id], context=context)
+                    
+                    goal_obj.update(cr, uid, [new_goal_id], context=context)
 
         return True
 

From 4d47d6288515da654e69288f587786d231b64cbf Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Feb 2013 09:45:40 +0100
Subject: [PATCH 069/547] [ADD] gamification: add basic report templates

bzr revid: mat@openerp.com-20130225084540-u6m6csrcnp4555jt
---
 addons/gamification/__openerp__.py            |  3 +-
 addons/gamification/goal.py                   | 69 ++++++++++++++++++-
 .../gamification/report/report_progress.xml   | 57 +++++++++++++++
 3 files changed, 126 insertions(+), 3 deletions(-)
 create mode 100644 addons/gamification/report/report_progress.xml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index f76d7a03c72..855a18cb749 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'depends': ['mail'],
+    'depends': ['mail', 'report_webkit'],
     'description': """Gamification of goals""",
 
     'data': [
@@ -32,6 +32,7 @@
         'view/plan.xml',
         'view/menu.xml',
         'cron.xml',
+        'report/report_progress.xml',
         ],
     'installable': True,
     'application': True,
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 3c1619b26c7..b01553ab768 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -382,7 +382,7 @@ class gamification_goal_plan(osv.Model):
         """Reset a closed goal plan
 
         Change the state of the plan to in progress
-        Closing a pan does not affect the goals so reset as well"""
+        Closing a plan does not affect the goals so neither does reset"""
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -403,7 +403,7 @@ class gamification_goal_plan(osv.Model):
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the lsit of goals fron a plan"""
         for plan in self.browse(cr, uid, ids, context):
-            today = date.today() #fields.date.today()
+            today = date.today()
             if plan.period == 'daily':
                 start_date = today
             elif plan.period == 'weekly':
@@ -485,6 +485,68 @@ class gamification_goal_plan(osv.Model):
         return True
 
 
+    def report_progress(self, cr, uid, ids, context=None):
+        """Post report about the progress of the goals"""
+        
+        goal_obj = self.pool.get('gamification.goal')
+        
+        for plan in self.browse(cr, uid, ids, context=context):
+            if plan.visibility_mode == 'board':
+                # generate a shared report
+                pass
+            else:
+                # generate individual reports
+                report_title = "Individual Report for {0} - {1}".format(plan.name, fields.date.today())
+                for user in plan.user_ids:
+                    goal_ids = self.get_current_related_user_goals(cr, uid, plan.id, user.id, context)
+
+                    for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
+                        pass
+
+            
+    def get_current_related_user_goals(self, cr, uid, plan_id, user_id, context=None):
+        """Get the ids of goals linked to a plan for the current instance
+
+        If several goals are linked to the same planline and user, only the
+        latest instance of the plan is checked (eg :if the plan is monthly,
+        return the goals started the 1st of this month).
+        """
+
+        plan in self.browse(cr, uid, plan_id, context=context)
+        today = date.today()
+        if plan.period == 'daily':
+            start_date = today
+        elif plan.period == 'weekly':
+            delta = timedelta(days=today.weekday())
+            start_date = today - delta
+        elif plan.period == 'monthly':
+            delta = timedelta(days=today.day-1)
+            start_date = today - delta
+        elif plan.period == 'yearly':
+            start_date = today.replace(month=1, day=1)
+        elif plan.period == 'once':
+            start_date = False # for manual goal, start each time
+
+        goal_obj = self.pool.get('gamification.goal')
+        related_goal_ids = []
+
+        for planline in plan.planline_ids:
+            domain = [('planline_id', '=', planline.id),
+                ('user_id', '=', user_id)]
+
+            if start_date:
+                domain.append(('start_date', '=', start_date.isoformat()))
+
+            goal_ids = goal_obj.search(cr, uid, domain, context=context)
+            if len(goal_ids) == 1:
+                related_goal_ids.append(goal_ids[0])
+            elif len(goal_ids) == 0:
+                # this goal has been deleted
+                raise osv.except_osv(_('Warning!'), _('Planline {0} has no goal present for user {1} at date {2}'.format(planline.id, user.id, start_date)))
+            else: # more than one goal ?
+                raise osv.except_osv(_('Warning!'), _('Duplicate goals for planline {0}, user {1}, date {2}'.format(planline.id, user.id, start_date)))
+                related_goal_ids.extend(goal_ids)
+
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
 
@@ -528,3 +590,6 @@ class gamification_goal_planline(osv.Model):
                 'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
                 }),
     }
+
+# class gamification_goal_report(osv.Model):
+#     _name = 'gamification.goal.report'
diff --git a/addons/gamification/report/report_progress.xml b/addons/gamification/report/report_progress.xml
new file mode 100644
index 00000000000..67d7e564098
--- /dev/null
+++ b/addons/gamification/report/report_progress.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <!-- EDI related Email Templates menu -->
+        <record model="ir.actions.act_window" id="action_email_templates">
+            <field name="name">Email Templates</field>
+            <field name="res_model">email.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_template.email_template_tree" />
+            <field name="search_view_id" ref="email_template.view_email_template_search"/>
+        </record>
+        <menuitem id="menu_email_templates" parent="gamification_menu" action="action_email_templates" sequence="30" groups="base.group_no_one"/>
+
+    </data>
+
+    <!-- Mail template are declared in a NOUPDATE block
+         so users can freely customize/delete them -->
+    <data noupdate="1">
+        <!--Email template -->
+        <record id="email_template_edi_invoice" model="email.template">
+            <field name="name">Individual Report - Send by Email</field>
+            <field name="email_from">noreply@localhost</field>
+            <field name="subject">${object.title}</field>
+            <field name="email_recipients">${object.partner_id.id}</field>
+            <field name="model_id" ref="gamification.goal.report"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="report_name">Individual_Report_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}</field>
+            <field name="body_html"><![CDATA[
+<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
+
+    <h1>${report.title}</h1>
+
+    <p>Hello ${report.user}, bellow are your latest results for the plan ${report.plan_name}.</p>
+
+    <table width="100%" border="1">
+    <tr>
+        <th>Goal</th>
+        <th>Target</th>
+        <th>Current</th>
+        <th>Completeness</th>
+    </tr>
+    % for goal in report:
+        <tr>
+            <td>${goal.type_id.name}</td>
+            <td>${goal.target_goal}</td>
+            <td>${goal.current}</td>
+            <td>${goal.completeness} %</td>
+        </tr>
+    % endfor
+    </table>
+
+</div>
+            ]]></field>
+        </record>
+    </data>
+</openerp>

From d9999731f74ef031f25b11aa893160f28ba3b4af Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Feb 2013 12:34:03 +0100
Subject: [PATCH 070/547] [ADD] gamification: send email for individual report

bzr revid: mat@openerp.com-20130226113403-2hw21ush1gw1kis0
---
 addons/gamification/__init__.py               |  3 +-
 addons/gamification/goal.py                   | 49 +++++++++++--------
 .../gamification/report/report_progress.xml   | 25 ++++------
 addons/gamification/res_users.py              |  2 -
 addons/gamification/view/plan.xml             |  1 +
 5 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index a406bf3a621..540d22424d0 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -1,2 +1,3 @@
 import goal
-import res_users
\ No newline at end of file
+import res_users
+import report
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index b01553ab768..ba9f665188c 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -2,26 +2,28 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
 from openerp.osv import fields, osv
 from openerp.tools.safe_eval import safe_eval
 
+from mako.template import Template as MakoTemplate
+
 from datetime import date, timedelta
 import calendar
 import itertools
@@ -476,7 +478,6 @@ class gamification_goal_plan(osv.Model):
         :param ids: ids of plans to which the users will be added
         :param user_ids: ids of the users to add"""
 
-        print("subscibe users", ids, user_ids)
         for plan in self.browse(cr,uid, ids, context):
             subscription = [user.id for user in plan.user_ids]
             subscription.extend(user_ids)
@@ -489,21 +490,30 @@ class gamification_goal_plan(osv.Model):
         """Post report about the progress of the goals"""
         
         goal_obj = self.pool.get('gamification.goal')
-        
+
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.visibility_mode == 'board':
                 # generate a shared report
                 pass
             else:
+                if not plan.report_message_group_id:
+                    continue
+                
                 # generate individual reports
-                report_title = "Individual Report for {0} - {1}".format(plan.name, fields.date.today())
+                template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_gamification_individual')[1]
+
                 for user in plan.user_ids:
+                    
                     goal_ids = self.get_current_related_user_goals(cr, uid, plan.id, user.id, context)
+                    if len(goal_ids) == 0:
+                        continue
+
+                    template_context = dict(context)
+                    template_context['goals'] = goal_obj.browse(cr, uid, goal_ids, context=context)
+                    template_context['user'] = user
+                    self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
 
-                    for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
-                        pass
 
-            
     def get_current_related_user_goals(self, cr, uid, plan_id, user_id, context=None):
         """Get the ids of goals linked to a plan for the current instance
 
@@ -512,7 +522,7 @@ class gamification_goal_plan(osv.Model):
         return the goals started the 1st of this month).
         """
 
-        plan in self.browse(cr, uid, plan_id, context=context)
+        plan = self.browse(cr, uid, plan_id, context=context)
         today = date.today()
         if plan.period == 'daily':
             start_date = today
@@ -542,11 +552,13 @@ class gamification_goal_plan(osv.Model):
                 related_goal_ids.append(goal_ids[0])
             elif len(goal_ids) == 0:
                 # this goal has been deleted
-                raise osv.except_osv(_('Warning!'), _('Planline {0} has no goal present for user {1} at date {2}'.format(planline.id, user.id, start_date)))
+                raise osv.except_osv('Warning!','Planline {0} has no goal present for user {1} at date {2}'.format(planline.id, user.id, start_date))
             else: # more than one goal ?
-                raise osv.except_osv(_('Warning!'), _('Duplicate goals for planline {0}, user {1}, date {2}'.format(planline.id, user.id, start_date)))
+                raise osv.except_osv('Warning!', 'Duplicate goals for planline {0}, user {1}, date {2}'.format(planline.id, user.id, start_date))
                 related_goal_ids.extend(goal_ids)
 
+        return related_goal_ids
+
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
 
@@ -589,7 +601,4 @@ class gamification_goal_planline(osv.Model):
             store={
                 'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
                 }),
-    }
-
-# class gamification_goal_report(osv.Model):
-#     _name = 'gamification.goal.report'
+    }
\ No newline at end of file
diff --git a/addons/gamification/report/report_progress.xml b/addons/gamification/report/report_progress.xml
index 67d7e564098..b8a2c3b22db 100644
--- a/addons/gamification/report/report_progress.xml
+++ b/addons/gamification/report/report_progress.xml
@@ -8,30 +8,23 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="email_template.email_template_tree" />
-            <field name="search_view_id" ref="email_template.view_email_template_search"/>
         </record>
-        <menuitem id="menu_email_templates" parent="gamification_menu" action="action_email_templates" sequence="30" groups="base.group_no_one"/>
-
     </data>
 
-    <!-- Mail template are declared in a NOUPDATE block
-         so users can freely customize/delete them -->
-    <data noupdate="1">
+    <data>
         <!--Email template -->
-        <record id="email_template_edi_invoice" model="email.template">
+        <record id="email_template_gamification_individual" model="email.template">
             <field name="name">Individual Report - Send by Email</field>
             <field name="email_from">noreply@localhost</field>
-            <field name="subject">${object.title}</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
-            <field name="model_id" ref="gamification.goal.report"/>
+            <field name="subject">Individual report - ${object.name}</field>
+            <field name="email_recipients">${object.report_message_group_id.alias_id.name_get()[0][1]}</field>
+            <field name="model_id" ref="gamification.model_gamification_goal_plan"/>
             <field name="auto_delete" eval="True"/>
-            <field name="report_name">Individual_Report_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}</field>
             <field name="body_html"><![CDATA[
-<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
+<div>
+    <h1>Individual report - ${object.name}</h1>
 
-    <h1>${report.title}</h1>
-
-    <p>Hello ${report.user}, bellow are your latest results for the plan ${report.plan_name}.</p>
+    <p>Hello ${ctx['user'].name}, bellow are your latest results for the plan ${object.name}.</p>
 
     <table width="100%" border="1">
     <tr>
@@ -40,7 +33,7 @@
         <th>Current</th>
         <th>Completeness</th>
     </tr>
-    % for goal in report:
+    % for goal in ctx['goals']:
         <tr>
             <td>${goal.type_id.name}</td>
             <td>${goal.target_goal}</td>
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index f2f54d9b324..38d4950b185 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -9,7 +9,6 @@ class res_users_gamification_group(osv.Model):
     _inherit = ['res.users']
 
     def write(self, cr, uid, ids, vals, context=None):
-        print("Overwrite res_users_gamification_group", ids)
         write_res = super(res_users_gamification_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('groups_id'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
@@ -31,7 +30,6 @@ class res_groups_gamification_group(osv.Model):
     _inherit = 'res.groups'
 
     def write(self, cr, uid, ids, vals, context=None):
-        print("Overwrite res_groups_gamification_group", ids)
         write_res = super(res_groups_gamification_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('users'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index 66af613c2fd..f4b3313c76e 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -50,6 +50,7 @@
                         <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Cancel Plan" type="object" name="action_cancel" states="inprogress"/>
                         <button string="Reset Plan" type="object" name="action_reset" states="done"/>
+                        <button string="Report Progress" type="object" name="report_progress" states="inprogress,done" groups="base.group_no_one"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>

From aba547a70a16de49cd690f693354beadf525d86e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Feb 2013 12:45:39 +0100
Subject: [PATCH 071/547] [FIX] gamification: no import of report needed

bzr revid: mat@openerp.com-20130226114539-y4ntyx9pwcor5mmv
---
 addons/gamification/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index 540d22424d0..f89b6d58063 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -1,3 +1,2 @@
 import goal
 import res_users
-import report

From 5106c4bff9001db6f2743d12b666efb0c10e2212 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Feb 2013 15:54:59 +0100
Subject: [PATCH 072/547] [ADD] gamification: send email for leaderboard report

bzr revid: mat@openerp.com-20130226145459-w6nu8jtyvtilvspx
---
 addons/gamification/goal.py                   | 119 +++++++++++-------
 .../gamification/report/report_progress.xml   |  43 ++++++-
 2 files changed, 113 insertions(+), 49 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index ba9f665188c..de7f74462b1 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -29,6 +29,33 @@ import calendar
 import itertools
 
 
+def start_end_date_for_period(period):
+    """Return the start and end date for a goal period based on today
+
+    :return (start_date, end_date), datetime.date objects, False if the period is
+    not defined or unknown"""
+    today = date.today()
+    if period == 'daily':
+        start_date = today
+        end_date = start_date # ? + timedelta(days=1)
+    elif period == 'weekly':
+        delta = timedelta(days=today.weekday())
+        start_date = today - delta
+        end_date = start_date + timedelta(days=7)
+    elif period == 'monthly':
+        month_range = calendar.monthrange(today.year, today.month)
+        start_date = today.replace(day=month_range[0])
+        end_date = today.replace(day=month_range[1])
+    elif period == 'yearly':
+        start_date = today.replace(month=1, day=1)
+        end_date = today.replace(month=12, day=31)
+    else: # period == 'once':
+        start_date = False # for manual goal, start each time
+        end_date = False
+    
+    return (start_date, end_date)
+
+
 class gamification_goal_type(osv.Model):
     """Goal type definition
 
@@ -405,19 +432,7 @@ class gamification_goal_plan(osv.Model):
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the lsit of goals fron a plan"""
         for plan in self.browse(cr, uid, ids, context):
-            today = date.today()
-            if plan.period == 'daily':
-                start_date = today
-            elif plan.period == 'weekly':
-                delta = timedelta(days=today.weekday())
-                start_date = today - delta
-            elif plan.period == 'monthly':
-                delta = timedelta(days=today.day-1)
-                start_date = today - delta
-            elif plan.period == 'yearly':
-                start_date = today.replace(month=1, day=1)
-            elif plan.period == 'once':
-                start_date = False # for manual goal, start each time
+            (start_date, end_date) = start_end_date_for_period(plan.period)
 
             for planline in plan.planline_ids:
                 for user in plan.user_ids:
@@ -427,7 +442,7 @@ class gamification_goal_plan(osv.Model):
                     domain = [('planline_id', '=', planline.id),
                             ('user_id', '=', user.id)]
                     if start_date:
-                        domain.append(('start_date', '=', start_date.isoformat()))
+                        domain.append(('start_date', '=', start_date))
                     
                     # goal existing for this planline ?
                     if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
@@ -451,17 +466,9 @@ class gamification_goal_plan(osv.Model):
             
                     if start_date:
                         values['start_date'] = start_date.isoformat()
+                    if end_date:
+                        values['end_date'] = end_date.isoformat()
 
-                    if planline.plan_id.period == 'daily':
-                        values['end_date'] = start_date + timedelta(days=1)
-                    elif planline.plan_id.period == 'weekly':
-                        values['end_date'] = start_date + timedelta(days=7)
-                    elif planline.plan_id.period == 'monthly':
-                        month_range = calendar.monthrange(start_date.year, start_date.month)
-                        values['end_date'] = start_date.replace(day=month_range[1])
-                    elif planline.plan_id.period == 'yearly':
-                        values['end_date'] = start_date.replace(month=12, day=31)
-                    
                     if planline.plan_id.remind_update_delay:
                         values['remind_update_delay'] = planline.plan_id.remind_update_delay
 
@@ -492,50 +499,70 @@ class gamification_goal_plan(osv.Model):
         goal_obj = self.pool.get('gamification.goal')
 
         for plan in self.browse(cr, uid, ids, context=context):
+            if not plan.report_message_group_id:
+                # no report group, skipping
+                continue
+
+            # copy of context to access more variables in templates
+            template_context = dict(context)
             if plan.visibility_mode == 'board':
                 # generate a shared report
-                pass
+                template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_gamification_leaderboard')[1]
+
+                # unsorted list of planline                
+                template_context['planlines'] = []
+                for planline in plan.planline_ids:
+
+                    (start_date, end_date) = start_end_date_for_period(plan.period)
+                    domain = [
+                        ('planline_id', '=', planline.id),
+                        ('state', 'in', ('inprogress', 'inprogress_update',
+                            'reached', 'failed')),
+                    ]
+                    if start_date:
+                        domain.append(('start_date', '=', start_date.isoformat()))
+ 
+                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                    
+                    planlines_stats = []
+                    for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
+                        planlines_stats.append({
+                            'user': goal.user_id,
+                            'current':goal.current,
+                            'target_goal':goal.target_goal,
+                            'completeness':goal.completeness,
+                        })
+
+                    # most complete first, current if same percentage (eg: if several 100%)
+                    sorted_planline_goals = enumerate(sorted(planlines_stats, key=lambda k: (k['completeness'], k['current']), reverse=True))
+                    template_context['planlines'].append({'goal_type':planline.type_id.name, 'list':sorted_planline_goals})
+                    
+                self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
+
             else:
-                if not plan.report_message_group_id:
-                    continue
-                
                 # generate individual reports
                 template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_gamification_individual')[1]
-
                 for user in plan.user_ids:
                     
                     goal_ids = self.get_current_related_user_goals(cr, uid, plan.id, user.id, context)
                     if len(goal_ids) == 0:
                         continue
 
-                    template_context = dict(context)
                     template_context['goals'] = goal_obj.browse(cr, uid, goal_ids, context=context)
                     template_context['user'] = user
                     self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
+        return True
 
-
-    def get_current_related_user_goals(self, cr, uid, plan_id, user_id, context=None):
+    def get_current_related_goals(self, cr, uid, plan_id, user_id, context=None):
         """Get the ids of goals linked to a plan for the current instance
 
         If several goals are linked to the same planline and user, only the
-        latest instance of the plan is checked (eg :if the plan is monthly,
+        latest instance of the plan is checked (eg: if the plan is monthly,
         return the goals started the 1st of this month).
         """
 
         plan = self.browse(cr, uid, plan_id, context=context)
-        today = date.today()
-        if plan.period == 'daily':
-            start_date = today
-        elif plan.period == 'weekly':
-            delta = timedelta(days=today.weekday())
-            start_date = today - delta
-        elif plan.period == 'monthly':
-            delta = timedelta(days=today.day-1)
-            start_date = today - delta
-        elif plan.period == 'yearly':
-            start_date = today.replace(month=1, day=1)
-        elif plan.period == 'once':
-            start_date = False # for manual goal, start each time
+        (start_date, end_date) = start_end_date_for_period(plan.period)
 
         goal_obj = self.pool.get('gamification.goal')
         related_goal_ids = []
diff --git a/addons/gamification/report/report_progress.xml b/addons/gamification/report/report_progress.xml
index b8a2c3b22db..5027cf5e877 100644
--- a/addons/gamification/report/report_progress.xml
+++ b/addons/gamification/report/report_progress.xml
@@ -12,9 +12,9 @@
     </data>
 
     <data>
-        <!--Email template -->
+        <!--Email template for individual report -->
         <record id="email_template_gamification_individual" model="email.template">
-            <field name="name">Individual Report - Send by Email</field>
+            <field name="name">Individual Goal Report - Send by Email</field>
             <field name="email_from">noreply@localhost</field>
             <field name="subject">Individual report - ${object.name}</field>
             <field name="email_recipients">${object.report_message_group_id.alias_id.name_get()[0][1]}</field>
@@ -24,7 +24,7 @@
 <div>
     <h1>Individual report - ${object.name}</h1>
 
-    <p>Hello ${ctx['user'].name}, bellow are your latest results for the plan ${object.name}.</p>
+    <p>Hello, bellow are the latest results for the plan ${object.name} for ${ctx['user'].name}.</p>
 
     <table width="100%" border="1">
     <tr>
@@ -43,6 +43,43 @@
     % endfor
     </table>
 
+</div>
+            ]]></field>
+        </record>
+
+        <!-- Email template for leaderboard -->
+        <record id="email_template_gamification_leaderboard" model="email.template">
+            <field name="name">Leaderboard Goal Report - Send by Email</field>
+            <field name="email_from">noreply@localhost</field>
+            <field name="subject">${object.name} group report</field>
+            <field name="email_recipients">${object.report_message_group_id.alias_id.name_get()[0][1]}</field>
+            <field name="model_id" ref="gamification.model_gamification_goal_plan"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html"><![CDATA[
+<div>
+    <h1>Group report - ${object.name}</h1>
+
+    <p>Hello, 
+
+    Bellow are the latest results for the plan ${object.name} for the group ${object.report_message_group_id.name}</p>
+
+    % for planline in ctx['planlines']:
+        <h2>${planline['goal_type']}</h2>
+        <table width="100%" border="1">
+            <th>#</th>
+            <th>User</th>
+            <th>Completeness</th>
+            <th>Current</th>
+        % for idx, goal in planline['list']:
+            <tr>
+                <td>${idx+1}</td>
+                <td>${goal.completeness}</td>
+                <td>${goal.current}/${goal.target_goal}</td>
+            </tr>
+        % endfor
+        </table>
+    % endfor
+
 </div>
             ]]></field>
         </record>

From 5a341ab9708f74e93c4f29593256a46a79a63275 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Feb 2013 16:13:28 +0100
Subject: [PATCH 073/547] [FIX] gamification: add user name in report board

bzr revid: mat@openerp.com-20130226151328-4lnq7ku5y8waedkl
---
 addons/gamification/report/report_progress.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/report/report_progress.xml b/addons/gamification/report/report_progress.xml
index 5027cf5e877..08fa3cad3c8 100644
--- a/addons/gamification/report/report_progress.xml
+++ b/addons/gamification/report/report_progress.xml
@@ -71,9 +71,14 @@
             <th>Completeness</th>
             <th>Current</th>
         % for idx, goal in planline['list']:
-            <tr>
+            <tr
+                % if goal.completeness >= 100:
+                    style="font-weight:bold;""
+                % endif
+                >
                 <td>${idx+1}</td>
-                <td>${goal.completeness}</td>
+                <td>${goal.user.name}</td>
+                <td>${goal.completeness}%</td>
                 <td>${goal.current}/${goal.target_goal}</td>
             </tr>
         % endfor

From 240ed326b20f6a4303380b011c4634d9a81e3326 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Feb 2013 16:23:25 +0100
Subject: [PATCH 074/547] [IMP] gamification: overwrite write method for goal

bzr revid: mat@openerp.com-20130226152325-5n3ruxk6jsju18uu
---
 addons/gamification/goal.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index de7f74462b1..2491f474c26 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -272,6 +272,13 @@ class gamification_goal(osv.Model):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
 
+    def write(self, cr, uid, ids, vals, context=None):
+        for goal in self.browse(cr, uid, ids, vals):
+            vals['last_update'] = fields.date.today()        
+        write_res = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
+        return write_res
+
+
 class gamification_goal_plan(osv.Model):
     """Gamification goal plan
 
@@ -536,7 +543,7 @@ class gamification_goal_plan(osv.Model):
                     # most complete first, current if same percentage (eg: if several 100%)
                     sorted_planline_goals = enumerate(sorted(planlines_stats, key=lambda k: (k['completeness'], k['current']), reverse=True))
                     template_context['planlines'].append({'goal_type':planline.type_id.name, 'list':sorted_planline_goals})
-                    
+
                 self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
 
             else:

From 6cc39b566ad46ce4bc9775c74dda97e1563b981e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Feb 2013 16:32:47 +0100
Subject: [PATCH 075/547] [ADD] gamification: refresh button for manual goal

bzr revid: mat@openerp.com-20130226153247-ak48q3dooyc71doi
---
 addons/gamification/goal.py       | 3 ++-
 addons/gamification/view/goal.xml | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 2491f474c26..fedf4c7ea36 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -273,8 +273,9 @@ class gamification_goal(osv.Model):
 
 
     def write(self, cr, uid, ids, vals, context=None):
+        """Overwrite the write method to update the last_update field to today"""
         for goal in self.browse(cr, uid, ids, vals):
-            vals['last_update'] = fields.date.today()        
+            vals['last_update'] = fields.date.today()
         write_res = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         return write_res
 
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 926d02f9c71..52def276977 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -47,6 +47,9 @@
                         <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
+                        <div class="oe_right oe_button_box" attrs="{'invisible':[('computation_mode','!=', 'manually')]}">
+                            <button name="write" type="object" string="Refresh/The value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders"/>
+                        </div>
                         <group>
                             <group string="Reference">
                                 <field name="type_id" on_change="on_change_type_id(type_id)" attrs="{'readonly':[('state','!=','draft')]}"/>

From ce777dde1cdea831edfc6dee7e3ff212b973353a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Feb 2013 09:46:08 +0100
Subject: [PATCH 076/547] [IMP] gamification: better consistency for plan

bzr revid: mat@openerp.com-20130227084608-79t5fyjzweq5zq1j
---
 addons/gamification/goal.py       | 20 ++++++++++++----
 addons/gamification/view/plan.xml | 38 ++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index fedf4c7ea36..32186ff0a15 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -305,7 +305,7 @@ class gamification_goal_plan(osv.Model):
             help="list of goals that will be set",
             required=True),
         'autojoin_group_id' : fields.many2one('res.groups',
-            string='Group',
+            string='Auto-join Group',
             help='Group of users whose members will automatically be added to the users'),
         'period' : fields.selection([
                 ('once', 'No Periodicity'),
@@ -342,8 +342,8 @@ class gamification_goal_plan(osv.Model):
             string="Frequency",
             required=True),
         'report_message_group_id' : fields.many2one('mail.group',
-            string='Report to',
-            help='Group that will receive the report in addition to the user'),
+            string='Send a copy to',
+            help='Group that will receive a copy of the report in addition to the user'),
         'report_header' : fields.text('Report Header'),
         'remind_update_delay' : fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified.")
@@ -375,6 +375,16 @@ class gamification_goal_plan(osv.Model):
         (_check_nonzero_users, "At least one user is required to create a non-draft goal plan", ['user_ids']),
     ]
 
+    def write(self, cr, uid, ids, vals, context=None):
+        """Overwrite the write method to add the user of groups"""
+        write_res = super(gamification_goal_plan, self).write(cr, uid, ids, vals, context=context)
+        
+        # add users when change the group auto-subscription
+        if 'autojoin_group_id' in vals:
+            new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
+            self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
+        return write_res
+
     def _update_all(self, cr, uid, ids=False, context=None):
         """Update every plan in progress"""
         if not ids:
@@ -487,7 +497,7 @@ class gamification_goal_plan(osv.Model):
         return True
 
 
-    def plan_subscribe_users(self, cr, uid, ids, user_ids, context=None):
+    def plan_subscribe_users(self, cr, uid, ids, new_user_ids, context=None):
         """ Add the following users to plans
 
         :param ids: ids of plans to which the users will be added
@@ -495,7 +505,7 @@ class gamification_goal_plan(osv.Model):
 
         for plan in self.browse(cr,uid, ids, context):
             subscription = [user.id for user in plan.user_ids]
-            subscription.extend(user_ids)
+            subscription.extend(new_user_ids)
             unified_subscription = list(set(subscription))
             self.write(cr, uid, ids, {'user_ids': [(4, uid) for uid in unified_subscription]}, context=context)
         return True
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index f4b3313c76e..ce2e60c5d1e 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -70,12 +70,38 @@
                             <group colspan="4">
                                 <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="remind_update_delay"/>
-                                <field name="visibility_mode"/>
+                                
                             </group>
-                            <group string="Report">
-                                <field name="report_message_group_id" />
-                                <field name="report_message_frequency" attrs="{'invisible':[('report_message_group_id','=', False)], 'required':[('report_message_group_id','=', False)]}"/>
-                                <field name="report_header" attrs="{'invisible':[('report_message_group_id','=', False)]}"/>
+                            <group string="Notify" colspan="4">
+                                <label for="visibility_mode"/>
+                                <div>
+                                    <field name="visibility_mode" colspan="2" />
+
+                                    <group name="visibility_mode_help" class="oe_grey oe_edit_only" colspan="1">
+                                        <p attrs="{'invisible': [('visibility_mode','!=','board')]}">
+                                           In Leaderboard mode, the reports will contain the progress of users of this plan.
+                                        </p>
+                                        <p attrs="{'invisible': [('visibility_mode','!=','progressbar')]}">
+                                           In Personal Progressbar mode, the progress of each user can only be seen by himself and the followers of this plan.
+                                        </p>
+                                    </group>
+                                </div>
+
+                                <field name="report_message_frequency" />
+                                <field name="report_header" />
+                                
+                                <label for="report_message_group_id"/>
+                                <div>
+                                    <field name="report_message_group_id" />
+                                    <group name="report_help" class="oe_grey oe_edit_only" col="2" colspan="2">
+                                       <p attrs="{'invisible': [('report_message_group_id','!=',False)]}">
+                                           Select a group that will receive a copy of the reports.
+                                       </p>
+                                       <p attrs="{'invisible': [('report_message_group_id','=',False)]}">
+                                           A copy of the report that user recieve will be sent to this group.
+                                       </p>
+                                   </group>
+                               </div>
                             </group>
                         </group>
                         
@@ -90,7 +116,7 @@
                         
                         <group string="Subscription">
                             <group colspan="4">
-                                <field name="autojoin_group_id" string="Group" />
+                                <field name="autojoin_group_id" />
                             </group>
                             <group colspan="4">
                                 <field name="user_ids" widget="many2many_kanban">

From 86bb3fbb2a814879df99d60196eb914a9d426175 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Feb 2013 10:42:13 +0100
Subject: [PATCH 077/547] [FIX] gamification: show related goals from plan
 correctly

bzr revid: mat@openerp.com-20130227094213-jbhg1g5xiv1va2fz
---
 addons/gamification/goal.py       | 29 ++++++++++++++++++++++++++---
 addons/gamification/view/plan.xml |  5 ++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 32186ff0a15..3776b008e56 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -447,6 +447,29 @@ class gamification_goal_plan(osv.Model):
 
         return True
 
+    def action_show_related_goals(self, cr, uid, ids, context=None):
+        """ This opens goal view with a restriction to the list of goals from this plan only
+            @return: the goal view
+        """
+        # get ids of related goals 
+        goal_obj = self.pool.get('gamification.goal')
+        related_goal_ids = []
+        for plan in self.browse(cr, uid, ids, context=context):
+            for planline in plan.planline_ids:
+                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
+                related_goal_ids.extend(goal_ids)
+        
+        # process the new view
+        if context is None:
+            context = {}
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'gamification','goals_from_plan_act', context=context)
+        res['context'] = context
+        res['context'].update({
+            'default_id': related_goal_ids
+        })
+        res['domain'] = [('id','in', related_goal_ids)]
+        return res
+
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the lsit of goals fron a plan"""
         for plan in self.browse(cr, uid, ids, context):
@@ -571,6 +594,7 @@ class gamification_goal_plan(osv.Model):
                     self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
         return True
 
+
     def get_current_related_goals(self, cr, uid, plan_id, user_id, context=None):
         """Get the ids of goals linked to a plan for the current instance
 
@@ -593,9 +617,8 @@ class gamification_goal_plan(osv.Model):
                 domain.append(('start_date', '=', start_date.isoformat()))
 
             goal_ids = goal_obj.search(cr, uid, domain, context=context)
-            if len(goal_ids) == 1:
-                related_goal_ids.append(goal_ids[0])
-            elif len(goal_ids) == 0:
+            related_goal_ids.append(goal_ids[0])
+            if len(goal_ids) == 0:
                 # this goal has been deleted
                 raise osv.except_osv('Warning!','Planline {0} has no goal present for user {1} at date {2}'.format(planline.id, user.id, start_date))
             else: # more than one goal ?
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index ce2e60c5d1e..265deaaecd8 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -31,12 +31,11 @@
             </field>
         </record>
 
-        <record id="act_show_goals_from_plan" model="ir.actions.act_window">
+        <record id="goals_from_plan_act" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
             <field name="view_type">form</field>
             <field name="name">Related Goals</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_plan_id': [active_id], 'default_plan_id': active_id}</field>
         </record>
 
         <record id="goal_plan_form_view" model="ir.ui.view">
@@ -63,7 +62,7 @@
 
                         <!-- action buttons -->
                         <div class="oe_right oe_button_box">
-                            <button name="%(act_show_goals_from_plan)d" type="action" string="Related Goals" help="show all the generated goals for this plan"/>
+                            <button name="action_show_related_goals" type="object" string="Related Goals" help="show all the generated goals for this plan"/>
                         </div>
 
                         <group>

From 504b6c4ca7e29afe04f216519b982ed1f986a0f2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Feb 2013 11:59:56 +0100
Subject: [PATCH 078/547] [ADD] gamification: send reminder for update

bzr revid: mat@openerp.com-20130227105956-pu0xjsswucjou5o9
---
 addons/gamification/__openerp__.py            |  1 +
 addons/gamification/goal.py                   | 26 ++++++++++---------
 addons/gamification/report/reminder.xml       | 23 ++++++++++++++++
 .../gamification/report/report_progress.xml   | 11 --------
 addons/gamification/view/goal.xml             |  2 +-
 5 files changed, 39 insertions(+), 24 deletions(-)
 create mode 100644 addons/gamification/report/reminder.xml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 855a18cb749..26cc1696fc2 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -33,6 +33,7 @@
         'view/menu.xml',
         'cron.xml',
         'report/report_progress.xml',
+        'report/reminder.xml',
         ],
     'installable': True,
     'application': True,
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 3776b008e56..704ba2bad11 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -24,7 +24,7 @@ from openerp.tools.safe_eval import safe_eval
 
 from mako.template import Template as MakoTemplate
 
-from datetime import date, timedelta
+from datetime import date, datetime, timedelta
 import calendar
 import itertools
 
@@ -115,13 +115,6 @@ class gamification_goal_type(osv.Model):
 
 
 
-def compute_goal_completeness(current, target_goal):
-    # more than 100% case is handled by the widget
-    if target_goal > 0:
-        return 100.0 * current / target_goal
-    else:
-        return 0.0
-
 class gamification_goal(osv.Model):
     """Goal instance for a user
 
@@ -132,9 +125,14 @@ class gamification_goal(osv.Model):
     _inherit = 'mail.thread'
 
     def _get_completeness(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the percentage of completeness of the goal, between 0 and 100"""
         res = {}
         for goal in self.browse(cr, uid, ids, context):
-            res[goal.id] = compute_goal_completeness(goal.current, goal.target_goal)
+            if goal.current > 0:
+                res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
+            else:
+                res[goal.id] = 0.0
+            
         return res
 
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
@@ -194,7 +192,6 @@ class gamification_goal(osv.Model):
     }
 
 
-
     def _update_all(self, cr, uid, ids=False, context=None):
         """Update every goal in progress"""
         if not ids:
@@ -208,7 +205,7 @@ class gamification_goal(osv.Model):
         If a goal reaches the target value, the status is set to reach
         If the end date is passed (at least +1 day, time not considered) without
         the target value being reached, the goal is set as failed."""
-
+        
         for goal in self.browse(cr, uid, ids, context=context or {}):
             if goal.state not in ('inprogress','inprogress_update','reached'):
                 # skip if goal failed or canceled
@@ -223,9 +220,14 @@ class gamification_goal(osv.Model):
                 # check for remind to update
                 if goal.remind_update_delay and goal.last_update:
                     delta_max = timedelta(days=goal.remind_update_delay)
-                    if fields.date.today() - goal.last_update > delta_max:
+                    last_update = datetime.strptime(goal.last_update,'%Y-%m-%d').date()
+                    if date.today() - last_update > delta_max:
                         towrite['state'] = 'inprogress_update'
 
+                        # generate a remind report
+                        template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_goal_reminder')[1]
+                        self.pool.get('email.template').send_mail(cr, uid, template_id, goal.id, context=context)
+                        
             else: # count or sum
                 obj = self.pool.get(goal.type_id.model_id.model)
                 field_date_name = goal.type_id.field_date_id.name
diff --git a/addons/gamification/report/reminder.xml b/addons/gamification/report/reminder.xml
new file mode 100644
index 00000000000..d184b6518de
--- /dev/null
+++ b/addons/gamification/report/reminder.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record id="email_template_goal_reminder" model="email.template">
+            <field name="name">Goal Update Reminder - Send by Email</field>
+            <field name="email_from">noreply@localhost</field>
+            <field name="subject">Goal Update Reminder</field>
+            <field name="email_recipients">${object.user_id.email}</field>
+            <field name="model_id" ref="gamification.model_gamification_goal"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html"><![CDATA[
+<div>
+    <p>Hello ${object.user_id.name}</p>
+    
+    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay}. Do not forget to do it.</p>
+
+    <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
+</div>
+            ]]></field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/gamification/report/report_progress.xml b/addons/gamification/report/report_progress.xml
index 08fa3cad3c8..08e37df1dec 100644
--- a/addons/gamification/report/report_progress.xml
+++ b/addons/gamification/report/report_progress.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data>
-        <!-- EDI related Email Templates menu -->
-        <record model="ir.actions.act_window" id="action_email_templates">
-            <field name="name">Email Templates</field>
-            <field name="res_model">email.template</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="view_id" ref="email_template.email_template_tree" />
-        </record>
-    </data>
-
     <data>
         <!--Email template for individual report -->
         <record id="email_template_gamification_individual" model="email.template">
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 52def276977..c983076c9ad 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -48,7 +48,7 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box" attrs="{'invisible':[('computation_mode','!=', 'manually')]}">
-                            <button name="write" type="object" string="Refresh/The value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders"/>
+                            <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders"/>
                         </div>
                         <group>
                             <group string="Reference">

From e57a761dc7ca0463b8dffac7d8423ec362745513 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Feb 2013 12:12:20 +0100
Subject: [PATCH 079/547] [IMP] gamification: add start goal button for draft
 goals

bzr revid: mat@openerp.com-20130227111220-ipgvl5djlndcnxpw
---
 addons/gamification/goal.py       | 5 ++++-
 addons/gamification/view/goal.xml | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 704ba2bad11..2b120eeaedf 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -208,7 +208,7 @@ class gamification_goal(osv.Model):
         
         for goal in self.browse(cr, uid, ids, context=context or {}):
             if goal.state not in ('inprogress','inprogress_update','reached'):
-                # skip if goal failed or canceled
+                # skip if goal draft, failed or canceled
                 continue
             if goal.state == 'reached' and goal.end_date and fields.date.today() > goal.end_date:
                 # only a goal reached but not passed the end date will still be 
@@ -263,6 +263,9 @@ class gamification_goal(osv.Model):
             self.write(cr, uid, [goal.id], towrite, context=context)
         return True
 
+    def action_start(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+        return self.update(cr, uid, ids, context=context)
 
     def action_reach(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'reached'}, context=context)
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index c983076c9ad..a15e53a074e 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -40,7 +40,8 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Refresh state" type="object" name="update" class="oe_highlight"/>
+                        <button string="Start goal" type="object" name="action_start" states="draft" class="oe_highlight"/>
+                        <button string="Refresh state" type="object" name="update" states="inprogress,inprogress_update,failed,reached" class="oe_highlight"/>
                         <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>

From d9cee091eaa30a50f8cf4366e95a7cd8a286bc00 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Feb 2013 12:27:32 +0100
Subject: [PATCH 080/547] [IMP] gamification: use alias instead of email

bzr revid: mat@openerp.com-20130227112732-tlblt4x9n5131ci9
---
 addons/gamification/report/reminder.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/report/reminder.xml b/addons/gamification/report/reminder.xml
index d184b6518de..918e2773bc5 100644
--- a/addons/gamification/report/reminder.xml
+++ b/addons/gamification/report/reminder.xml
@@ -5,7 +5,7 @@
             <field name="name">Goal Update Reminder - Send by Email</field>
             <field name="email_from">noreply@localhost</field>
             <field name="subject">Goal Update Reminder</field>
-            <field name="email_recipients">${object.user_id.email}</field>
+            <field name="email_recipients">${object.user_id.alias_id.name_get()[0][1]}</field>
             <field name="model_id" ref="gamification.model_gamification_goal"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[

From 79206a10e32cb16cc3e8087d8c7ecbe93ff168cb Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Feb 2013 17:56:00 +0100
Subject: [PATCH 081/547] [IMP] gamification: corrections with feedbacks and
 usage of templates

bzr revid: mat@openerp.com-20130227165600-0majyllrmy452hwb
---
 addons/gamification/goal.py                   | 99 +++++++++++++------
 addons/gamification/report/reminder.xml       | 23 -----
 .../gamification/report/report_progress.xml   | 81 ---------------
 .../templates/group_progress.mako             | 38 +++++++
 .../templates/personal_progress.mako          | 31 ++++++
 addons/gamification/templates/reminder.mako   | 16 +++
 addons/gamification/view/goal.xml             | 14 +--
 addons/gamification/view/plan.xml             |  4 +-
 8 files changed, 166 insertions(+), 140 deletions(-)
 delete mode 100644 addons/gamification/report/reminder.xml
 delete mode 100644 addons/gamification/report/report_progress.xml
 create mode 100644 addons/gamification/templates/group_progress.mako
 create mode 100644 addons/gamification/templates/personal_progress.mako
 create mode 100644 addons/gamification/templates/reminder.mako

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 2b120eeaedf..75b5b4e7019 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -22,11 +22,50 @@
 from openerp.osv import fields, osv
 from openerp.tools.safe_eval import safe_eval
 
-from mako.template import Template as MakoTemplate
-
 from datetime import date, datetime, timedelta
+from mako.template import Template as MakoTemplate
+from urllib import urlencode, quote as quote
+
 import calendar
 import itertools
+import logging
+import os.path
+
+_logger = logging.getLogger(__name__)
+
+GAMIFICATION_PATH = os.path.dirname(os.path.abspath(__file__))
+
+try:
+    # We use a jinja2 sandboxed environment to render mako templates.
+    # Note that the rendering does not cover all the mako syntax, in particular
+    # arbitrary Python statements are not accepted, and not all expressions are
+    # allowed: only "public" attributes (not starting with '_') of objects may
+    # be accessed.
+    # This is done on purpose: it prevents incidental or malicious execution of
+    # Python code that may break the security of the server.
+    from jinja2.sandbox import SandboxedEnvironment
+    from jinja2 import FileSystemLoader
+    mako_template_env = SandboxedEnvironment(
+        loader=FileSystemLoader(os.path.join(GAMIFICATION_PATH,'templates/')),
+        block_start_string="<%",
+        block_end_string="%>",
+        variable_start_string="${",
+        variable_end_string="}",
+        comment_start_string="<%doc>",
+        comment_end_string="</%doc>",
+        line_statement_prefix="%",
+        line_comment_prefix="##",
+        trim_blocks=True,               # do not output newline after blocks
+        autoescape=True,                # XML/HTML automatic escaping
+    )
+    mako_template_env.globals.update({
+        'str': str,
+        'quote': quote,
+        'urlencode': urlencode,
+    })
+except ImportError:
+    _logger.warning("jinja2 not available, templating features will not work!")
+
 
 
 def start_end_date_for_period(period):
@@ -221,12 +260,13 @@ class gamification_goal(osv.Model):
                 if goal.remind_update_delay and goal.last_update:
                     delta_max = timedelta(days=goal.remind_update_delay)
                     last_update = datetime.strptime(goal.last_update,'%Y-%m-%d').date()
-                    if date.today() - last_update > delta_max:
+                    if date.today() - last_update > delta_max and goal.state == 'inprogress':
                         towrite['state'] = 'inprogress_update'
 
                         # generate a remind report
-                        template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_goal_reminder')[1]
-                        self.pool.get('email.template').send_mail(cr, uid, template_id, goal.id, context=context)
+                        body_html = mako_template_env.get_template('reminder.mako').render({'object':goal})
+                        self.pool.get('mail.thread').message_post(cr, goal.user_id.id, False, body=body_html, context=context)
+                        #self.pool.get('email.template').send_mail(cr, uid, template_id, goal.id, context=context)
                         
             else: # count or sum
                 obj = self.pool.get(goal.type_id.model_id.model)
@@ -280,7 +320,9 @@ class gamification_goal(osv.Model):
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to update the last_update field to today"""
         for goal in self.browse(cr, uid, ids, vals):
-            vals['last_update'] = fields.date.today()
+            # TODO if current in vals
+            #vals['last_update'] = fields.date.today()
+            pass
         write_res = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         return write_res
 
@@ -553,10 +595,9 @@ class gamification_goal_plan(osv.Model):
             template_context = dict(context)
             if plan.visibility_mode == 'board':
                 # generate a shared report
-                template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_gamification_leaderboard')[1]
+                template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'email_template_gamification_leaderboard')
 
-                # unsorted list of planline                
-                template_context['planlines'] = []
+                planlines_boards = []
                 for planline in plan.planline_ids:
 
                     (start_date, end_date) = start_end_date_for_period(plan.period)
@@ -567,12 +608,12 @@ class gamification_goal_plan(osv.Model):
                     ]
                     if start_date:
                         domain.append(('start_date', '=', start_date.isoformat()))
- 
-                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
                     
-                    planlines_stats = []
+
+                    board_goals = []
+                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
                     for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
-                        planlines_stats.append({
+                        board_goals.append({
                             'user': goal.user_id,
                             'current':goal.current,
                             'target_goal':goal.target_goal,
@@ -580,23 +621,30 @@ class gamification_goal_plan(osv.Model):
                         })
 
                     # most complete first, current if same percentage (eg: if several 100%)
-                    sorted_planline_goals = enumerate(sorted(planlines_stats, key=lambda k: (k['completeness'], k['current']), reverse=True))
-                    template_context['planlines'].append({'goal_type':planline.type_id.name, 'list':sorted_planline_goals})
+                    sorted_board = enumerate(sorted(board_goals, key=lambda k: (k['completeness'], k['current']), reverse=True))
+                    planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
 
-                self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
+                body_html = mako_template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
+                self.pool.get('mail.thread').message_post(cr, [user.id for user in plan.user_ids], False, body=body_html, context=context)
+                #self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
 
             else:
                 # generate individual reports
                 template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_gamification_individual')[1]
                 for user in plan.user_ids:
                     
-                    goal_ids = self.get_current_related_user_goals(cr, uid, plan.id, user.id, context)
+                    goal_ids = self.get_current_related_goals(cr, uid, plan.id, user.id, context=context)
                     if len(goal_ids) == 0:
                         continue
 
-                    template_context['goals'] = goal_obj.browse(cr, uid, goal_ids, context=context)
-                    template_context['user'] = user
-                    self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
+                    variables = {
+                        'object':plan,
+                        'user':user,
+                        'goals':goal_obj.browse(cr, uid, goal_ids, context=context)
+                    }
+                    body_html = mako_template_env.get_template('personal_progress.mako').render(variables)
+                    self.pool.get('mail.thread').message_post(cr, user.id, False, body=body_html, context=context)
+                    #self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
         return True
 
 
@@ -616,19 +664,14 @@ class gamification_goal_plan(osv.Model):
 
         for planline in plan.planline_ids:
             domain = [('planline_id', '=', planline.id),
-                ('user_id', '=', user_id)]
+                ('user_id', '=', user_id),
+                ('state','in',('inprogress','inprogress_update','reached'))]
 
             if start_date:
                 domain.append(('start_date', '=', start_date.isoformat()))
 
             goal_ids = goal_obj.search(cr, uid, domain, context=context)
-            related_goal_ids.append(goal_ids[0])
-            if len(goal_ids) == 0:
-                # this goal has been deleted
-                raise osv.except_osv('Warning!','Planline {0} has no goal present for user {1} at date {2}'.format(planline.id, user.id, start_date))
-            else: # more than one goal ?
-                raise osv.except_osv('Warning!', 'Duplicate goals for planline {0}, user {1}, date {2}'.format(planline.id, user.id, start_date))
-                related_goal_ids.extend(goal_ids)
+            related_goal_ids.extend(goal_ids)
 
         return related_goal_ids
 
diff --git a/addons/gamification/report/reminder.xml b/addons/gamification/report/reminder.xml
deleted file mode 100644
index 918e2773bc5..00000000000
--- a/addons/gamification/report/reminder.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-        <record id="email_template_goal_reminder" model="email.template">
-            <field name="name">Goal Update Reminder - Send by Email</field>
-            <field name="email_from">noreply@localhost</field>
-            <field name="subject">Goal Update Reminder</field>
-            <field name="email_recipients">${object.user_id.alias_id.name_get()[0][1]}</field>
-            <field name="model_id" ref="gamification.model_gamification_goal"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="body_html"><![CDATA[
-<div>
-    <p>Hello ${object.user_id.name}</p>
-    
-    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay}. Do not forget to do it.</p>
-
-    <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
-</div>
-            ]]></field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/gamification/report/report_progress.xml b/addons/gamification/report/report_progress.xml
deleted file mode 100644
index 08e37df1dec..00000000000
--- a/addons/gamification/report/report_progress.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-        <!--Email template for individual report -->
-        <record id="email_template_gamification_individual" model="email.template">
-            <field name="name">Individual Goal Report - Send by Email</field>
-            <field name="email_from">noreply@localhost</field>
-            <field name="subject">Individual report - ${object.name}</field>
-            <field name="email_recipients">${object.report_message_group_id.alias_id.name_get()[0][1]}</field>
-            <field name="model_id" ref="gamification.model_gamification_goal_plan"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="body_html"><![CDATA[
-<div>
-    <h1>Individual report - ${object.name}</h1>
-
-    <p>Hello, bellow are the latest results for the plan ${object.name} for ${ctx['user'].name}.</p>
-
-    <table width="100%" border="1">
-    <tr>
-        <th>Goal</th>
-        <th>Target</th>
-        <th>Current</th>
-        <th>Completeness</th>
-    </tr>
-    % for goal in ctx['goals']:
-        <tr>
-            <td>${goal.type_id.name}</td>
-            <td>${goal.target_goal}</td>
-            <td>${goal.current}</td>
-            <td>${goal.completeness} %</td>
-        </tr>
-    % endfor
-    </table>
-
-</div>
-            ]]></field>
-        </record>
-
-        <!-- Email template for leaderboard -->
-        <record id="email_template_gamification_leaderboard" model="email.template">
-            <field name="name">Leaderboard Goal Report - Send by Email</field>
-            <field name="email_from">noreply@localhost</field>
-            <field name="subject">${object.name} group report</field>
-            <field name="email_recipients">${object.report_message_group_id.alias_id.name_get()[0][1]}</field>
-            <field name="model_id" ref="gamification.model_gamification_goal_plan"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="body_html"><![CDATA[
-<div>
-    <h1>Group report - ${object.name}</h1>
-
-    <p>Hello, 
-
-    Bellow are the latest results for the plan ${object.name} for the group ${object.report_message_group_id.name}</p>
-
-    % for planline in ctx['planlines']:
-        <h2>${planline['goal_type']}</h2>
-        <table width="100%" border="1">
-            <th>#</th>
-            <th>User</th>
-            <th>Completeness</th>
-            <th>Current</th>
-        % for idx, goal in planline['list']:
-            <tr
-                % if goal.completeness >= 100:
-                    style="font-weight:bold;""
-                % endif
-                >
-                <td>${idx+1}</td>
-                <td>${goal.user.name}</td>
-                <td>${goal.completeness}%</td>
-                <td>${goal.current}/${goal.target_goal}</td>
-            </tr>
-        % endfor
-        </table>
-    % endfor
-
-</div>
-            ]]></field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
new file mode 100644
index 00000000000..b0b6e7d6243
--- /dev/null
+++ b/addons/gamification/templates/group_progress.mako
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text_css">${css}</style>
+</head>
+<body>
+	<header>
+	    % if object.report_header
+	    	${object.report_header}
+	    % endif
+	</header>
+    
+    Below are the latest results for the plan <strong>${object.name}</strong> for the group <em>${object.report_message_group_id.name}</em>.</p>
+    !${planlines_boards}!
+    % for planline in planlines_boards:
+        <h2>${planline['goal_type']}</h2>
+        <table width="100%" border="1">
+        	<tr>
+	            <th>#</th>
+	            <th>User</th>
+	            <th>Completeness</th>
+	            <th>Current</th>
+	        </tr>
+	        % for idx, goal in planline['board_goals']:
+	            <tr
+	                % if goal.completeness >= 100:
+	                    style="font-weight:bold;"
+	                % endif
+	                >
+	                <td>${idx+1}</td>
+	                <td>${goal.user.name}</td>
+	                <td>${goal.completeness}%</td>
+	                <td>${goal.current}/${goal.target_goal}</td>
+	            </tr>
+	        % endfor
+        </table>
+    % endfor
+</body>
\ No newline at end of file
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
new file mode 100644
index 00000000000..a7325760b56
--- /dev/null
+++ b/addons/gamification/templates/personal_progress.mako
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text_css">${css}</style>
+</head>
+<body>
+	<header>
+	    % if object.report_header
+	    	${object.report_header}
+	    % endif
+	</header>
+    
+    <p>Below are the latest results for the plan ${object.name} for ${user.name}.</p>
+
+    <table width="100%" border="1">
+    <tr>
+        <th>Goal</th>
+        <th>Target</th>
+        <th>Current</th>
+        <th>Completeness</th>
+    </tr>
+    % for goal in goals:
+        <tr>
+            <td>${goal.type_id.name}</td>
+            <td>${goal.target_goal}</td>
+            <td>${goal.current}</td>
+            <td>${goal.completeness} %</td>
+        </tr>
+    % endfor
+    </table>
+</body>
\ No newline at end of file
diff --git a/addons/gamification/templates/reminder.mako b/addons/gamification/templates/reminder.mako
new file mode 100644
index 00000000000..9e161dcef0e
--- /dev/null
+++ b/addons/gamification/templates/reminder.mako
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text_css">${css}</style>
+</head>
+<body>
+	<header>
+	    % if object.report_header
+	    	${object.report_header}
+	    % endif
+	</header>
+    
+    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay}. Do not forget to do it.</p>
+
+    <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
+</body>
\ No newline at end of file
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index a15e53a074e..c497270eff0 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -41,16 +41,13 @@
                 <form string="Goal" version="7.0">
                     <header>
                         <button string="Start goal" type="object" name="action_start" states="draft" class="oe_highlight"/>
-                        <button string="Refresh state" type="object" name="update" states="inprogress,inprogress_update,failed,reached" class="oe_highlight"/>
+                        
                         <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
                         <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
-                        <div class="oe_right oe_button_box" attrs="{'invisible':[('computation_mode','!=', 'manually')]}">
-                            <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders"/>
-                        </div>
                         <group>
                             <group string="Reference">
                                 <field name="type_id" on_change="on_change_type_id(type_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -69,9 +66,14 @@
                                 </div>
                                 <field name="last_update" groups="base.group_no_one"/>
                             </group>
-                            <group string="Data">
+                            <group string="Data" colspan="4">
                                 <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}"/>
+                                <label for="current" />
+                                <div>
+                                    <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}" class="oe_inline"/>
+                                    <button string="Refresh state" type="object" name="update" states="inprogress,inprogress_update,failed,reached" class="oe_highlight oe_inline"/>
+                                    <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
+                                </div>
                             </group>
                         </group>
                     </sheet>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index 265deaaecd8..fbf4dc4a3e3 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -47,8 +47,8 @@
                         <button string="Start Plan" type="object" name="action_start" states="draft" class="oe_highlight"/>
                         <button string="Check Plan" type="object" name="action_check" states="inprogress"/>
                         <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
-                        <button string="Cancel Plan" type="object" name="action_cancel" states="inprogress"/>
-                        <button string="Reset Plan" type="object" name="action_reset" states="done"/>
+                        <button string="Reset to Draft" type="object" name="action_cancel" states="inprogress"/>
+                        <button string="Reset Completion" type="object" name="action_reset" states="done"/>
                         <button string="Report Progress" type="object" name="report_progress" states="inprogress,done" groups="base.group_no_one"/>
                         <field name="state" widget="statusbar"/>
                     </header>

From d11f2a265a254945913c73a2eb6c243b64572824 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Feb 2013 18:04:42 +0100
Subject: [PATCH 082/547] [FIX] gamification: send to partner_ids and remove
 template references

bzr revid: mat@openerp.com-20130227170442-66n8x7csjk7y6o6c
---
 addons/gamification/__openerp__.py |  2 --
 addons/gamification/goal.py        | 21 +++++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 26cc1696fc2..5bf4bd596dd 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -32,8 +32,6 @@
         'view/plan.xml',
         'view/menu.xml',
         'cron.xml',
-        'report/report_progress.xml',
-        'report/reminder.xml',
         ],
     'installable': True,
     'application': True,
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 75b5b4e7019..d19b5cb5371 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -265,7 +265,10 @@ class gamification_goal(osv.Model):
 
                         # generate a remind report
                         body_html = mako_template_env.get_template('reminder.mako').render({'object':goal})
-                        self.pool.get('mail.thread').message_post(cr, goal.user_id.id, False, body=body_html, context=context)
+                        self.pool.get('mail.thread').message_post(cr, uid, False, 
+                            body=body_html,
+                            partner_ids=[goal.user_id.partner_id.id],
+                            context=context)
                         #self.pool.get('email.template').send_mail(cr, uid, template_id, goal.id, context=context)
                         
             else: # count or sum
@@ -321,8 +324,7 @@ class gamification_goal(osv.Model):
         """Overwrite the write method to update the last_update field to today"""
         for goal in self.browse(cr, uid, ids, vals):
             # TODO if current in vals
-            #vals['last_update'] = fields.date.today()
-            pass
+            vals['last_update'] = fields.date.today()
         write_res = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         return write_res
 
@@ -595,8 +597,6 @@ class gamification_goal_plan(osv.Model):
             template_context = dict(context)
             if plan.visibility_mode == 'board':
                 # generate a shared report
-                template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'email_template_gamification_leaderboard')
-
                 planlines_boards = []
                 for planline in plan.planline_ids:
 
@@ -625,12 +625,14 @@ class gamification_goal_plan(osv.Model):
                     planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
 
                 body_html = mako_template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
-                self.pool.get('mail.thread').message_post(cr, [user.id for user in plan.user_ids], False, body=body_html, context=context)
+                self.pool.get('mail.thread').message_post(cr, uid, False,
+                    body=body_html,
+                    partner_ids=[user.partner_id.id for user in plan.user_ids],
+                    context=context)
                 #self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
 
             else:
                 # generate individual reports
-                template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'email_template_gamification_individual')[1]
                 for user in plan.user_ids:
                     
                     goal_ids = self.get_current_related_goals(cr, uid, plan.id, user.id, context=context)
@@ -643,7 +645,10 @@ class gamification_goal_plan(osv.Model):
                         'goals':goal_obj.browse(cr, uid, goal_ids, context=context)
                     }
                     body_html = mako_template_env.get_template('personal_progress.mako').render(variables)
-                    self.pool.get('mail.thread').message_post(cr, user.id, False, body=body_html, context=context)
+                    self.pool.get('mail.thread').message_post(cr, uid, False,
+                        body=body_html,
+                        partner_ids=[user.partner_id.id],
+                        context=context)
                     #self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
         return True
 

From 9e1df28731a22fca948ad99f524abc28a1d48240 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 10:22:47 +0100
Subject: [PATCH 083/547] [FIX] gamification: send messages correctly

bzr revid: mat@openerp.com-20130228092247-v5jv7xt0mlsav4jx
---
 addons/gamification/goal.py                   | 35 +++++++++++++------
 .../templates/group_progress.mako             | 18 ++++++----
 addons/gamification/view/goal.xml             |  2 +-
 addons/gamification/view/plan.xml             |  4 +++
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index d19b5cb5371..b2ef4b71df1 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -324,7 +324,11 @@ class gamification_goal(osv.Model):
         """Overwrite the write method to update the last_update field to today"""
         for goal in self.browse(cr, uid, ids, vals):
             # TODO if current in vals
-            vals['last_update'] = fields.date.today()
+            if 'current' in vals:
+                vals['last_update'] = fields.date.today()
+                if goal.report_message_frequency == 'onchange':
+                    plan_obj = self.pool.get('gamification.goal.plan')
+                    plan_obj.report_progress(cr, uid, [goal.planline_id.plan_id.id], users=[goal.user_id], context=context)
         write_res = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         return write_res
 
@@ -342,6 +346,7 @@ class gamification_goal_plan(osv.Model):
 
     _name = 'gamification.goal.plan'
     _description = 'Gamification goal plan'
+    _inherit = 'mail.thread'
 
     _columns = {
         'name' : fields.char('Plan Name', required=True),
@@ -583,9 +588,10 @@ class gamification_goal_plan(osv.Model):
         return True
 
 
-    def report_progress(self, cr, uid, ids, context=None):
+    def report_progress(self, cr, uid, ids, users=False, context=None):
         """Post report about the progress of the goals"""
         
+        context = context or {}
         goal_obj = self.pool.get('gamification.goal')
 
         for plan in self.browse(cr, uid, ids, context=context):
@@ -593,8 +599,6 @@ class gamification_goal_plan(osv.Model):
                 # no report group, skipping
                 continue
 
-            # copy of context to access more variables in templates
-            template_context = dict(context)
             if plan.visibility_mode == 'board':
                 # generate a shared report
                 planlines_boards = []
@@ -625,12 +629,16 @@ class gamification_goal_plan(osv.Model):
                     planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
 
                 body_html = mako_template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
-                self.pool.get('mail.thread').message_post(cr, uid, False,
+                self.message_post(cr, uid, plan.id,
                     body=body_html,
                     partner_ids=[user.partner_id.id for user in plan.user_ids],
-                    context=context)
-                #self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
-
+                    context=context,
+                    subtype='mail.mt_comment')
+                self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                    body=body_html,
+                    context=context,
+                    subtype='mail.mt_comment')
+                
             else:
                 # generate individual reports
                 for user in plan.user_ids:
@@ -645,11 +653,16 @@ class gamification_goal_plan(osv.Model):
                         'goals':goal_obj.browse(cr, uid, goal_ids, context=context)
                     }
                     body_html = mako_template_env.get_template('personal_progress.mako').render(variables)
-                    self.pool.get('mail.thread').message_post(cr, uid, False,
+                    
+                    self.message_post(cr, uid, plan.id,
                         body=body_html,
                         partner_ids=[user.partner_id.id],
-                        context=context)
-                    #self.pool.get('email.template').send_mail(cr, uid, template_id, plan.id, context=template_context)
+                        context=context,
+                        subtype='mail.mt_comment')
+                    self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                        body=body_html,
+                        context=context,
+                        subtype='mail.mt_comment')
         return True
 
 
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index b0b6e7d6243..a815b711114 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -5,16 +5,17 @@
 </head>
 <body>
 	<header>
-	    % if object.report_header
-	    	${object.report_header}
-	    % endif
+	    <strong>${object.name}</strong>
 	</header>
-    
-    Below are the latest results for the plan <strong>${object.name}</strong> for the group <em>${object.report_message_group_id.name}</em>.</p>
-    !${planlines_boards}!
+
+	<p class="oe_grey">${object.report_header or ''}</p>
+
     % for planline in planlines_boards:
-        <h2>${planline['goal_type']}</h2>
+        
         <table width="100%" border="1">
+        	<tr>
+        		<th colspan="4">${planline['goal_type']}</th>
+        	</tr>
         	<tr>
 	            <th>#</th>
 	            <th>User</th>
@@ -34,5 +35,8 @@
 	            </tr>
 	        % endfor
         </table>
+
+        <br/><br/>
+
     % endfor
 </body>
\ No newline at end of file
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index c497270eff0..80cced0590e 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -78,7 +78,7 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" help="Follow this goal to automatically track the events associated." groups="base.group_user"/>
+                        <field name="message_follower_ids" widget="mail_followers"/>
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index fbf4dc4a3e3..2c9efc5342f 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -138,6 +138,10 @@
                             </group>
                         </group>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>

From 585968eb6357f32fef1651f26830be96ef70645d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 10:39:15 +0100
Subject: [PATCH 084/547] [IMP] gamification: allow restriction in user list
 for report

bzr revid: mat@openerp.com-20130228093915-k7c2sa3rqvg355rm
---
 addons/gamification/goal.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index b2ef4b71df1..5acee02c448 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -589,7 +589,13 @@ class gamification_goal_plan(osv.Model):
 
 
     def report_progress(self, cr, uid, ids, users=False, context=None):
-        """Post report about the progress of the goals"""
+        """Post report about the progress of the goals
+
+        :param list(int) ids: the list of plan ids that need to be reported
+        :param list(res.users) users: the list of users that are concerned by
+          the report. If False, will send the report to every user concerned
+          (goal users and group that recieves a copy). Only used for plan with
+          a visibility mode set to 'personal'."""
         
         context = context or {}
         goal_obj = self.pool.get('gamification.goal')
@@ -641,7 +647,7 @@ class gamification_goal_plan(osv.Model):
                 
             else:
                 # generate individual reports
-                for user in plan.user_ids:
+                for user in users or plan.user_ids:
                     
                     goal_ids = self.get_current_related_goals(cr, uid, plan.id, user.id, context=context)
                     if len(goal_ids) == 0:

From d4a828fe734d35a19d42c9af1875bf34d0f7fcd7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 10:42:00 +0100
Subject: [PATCH 085/547] [FIX] gamification: send reminder messages correctly

bzr revid: mat@openerp.com-20130228094200-a74z0hfwe8kdxymm
---
 addons/gamification/goal.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 5acee02c448..b7e045d9894 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -265,11 +265,11 @@ class gamification_goal(osv.Model):
 
                         # generate a remind report
                         body_html = mako_template_env.get_template('reminder.mako').render({'object':goal})
-                        self.pool.get('mail.thread').message_post(cr, uid, False, 
+                        self.message_post(cr, uid, goal.id,
                             body=body_html,
                             partner_ids=[goal.user_id.partner_id.id],
-                            context=context)
-                        #self.pool.get('email.template').send_mail(cr, uid, template_id, goal.id, context=context)
+                            context=context,
+                            subtype='mail.mt_comment')
                         
             else: # count or sum
                 obj = self.pool.get(goal.type_id.model_id.model)

From b6dbf3dae170e0484c8c9da4185607cd24cfa27b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 11:14:46 +0100
Subject: [PATCH 086/547] [FIX] gamification: new goals are not reported

bzr revid: mat@openerp.com-20130228101446-jvky5d93emqj74j5
---
 addons/gamification/goal.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index b7e045d9894..37edc95054f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -319,19 +319,27 @@ class gamification_goal(osv.Model):
     def action_cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
-
+    def create(self, cr, uid, vals, context=None):
+        """Overwrite the create method to add a 'just_created' field to True"""
+        context = context or {}
+        context['just_created'] = True
+        return super(gamification_goal, self).create(cr, uid, vals, context=context)
+        
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to update the last_update field to today"""
         for goal in self.browse(cr, uid, ids, vals):
-            # TODO if current in vals
+            vals['last_update'] = fields.date.today()
             if 'current' in vals:
-                vals['last_update'] = fields.date.today()
-                if goal.report_message_frequency == 'onchange':
+
+                if 'just_created' in context:
+                    # new goals should not be reported
+                    continue
+
+                if goal.planline_id and goal.planline_id.plan_id.report_message_frequency == 'onchange':
                     plan_obj = self.pool.get('gamification.goal.plan')
                     plan_obj.report_progress(cr, uid, [goal.planline_id.plan_id.id], users=[goal.user_id], context=context)
-        write_res = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
-        return write_res
-
+        return super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
+        
 
 class gamification_goal_plan(osv.Model):
     """Gamification goal plan

From 7e3c25ca4482aa54a9ddd2f580016a426c0ca444 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 12:28:10 +0100
Subject: [PATCH 087/547] [IMP] gamification: separators for filters

bzr revid: mat@openerp.com-20130228112810-ua3ljeg5044f2isc
---
 addons/gamification/view/goal.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 80cced0590e..af5a3e3672c 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -103,8 +103,13 @@
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <search string="Search Goals">
-                    <filter name="my_inprogress" string="My Goals in Progress"
-                        domain="[('user_id', '=', uid),('state', 'in', ('inprogress', 'inprogress_update'))]"/>
+                    <filter name="my" string="My Goals" domain="[('user_id', '=', uid)]"/>
+                    <separator/>
+                    <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
+                    <filter name="inprogress" string="In Progress" domain="[('state', 'in', ('inprogress', 'inprogress_update'))]"/>
+                    <filter name="closed" string="Closed" domain="[('state', 'in', ('reached', 'failed'))]"/>
+                    <separator/>
+
                     <field name="planline_id"/>
                     <field name="user_id"/>
                     <field name="type_id"/>

From 81d917d1a5cdd031b126cb392f06c8800d5c3d0f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 12:28:30 +0100
Subject: [PATCH 088/547] [REF] gamification: update all goals

bzr revid: mat@openerp.com-20130228112830-cin5bfd63rwu9ndk
---
 addons/gamification/goal.py | 51 ++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 37edc95054f..93657de6eba 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -329,8 +329,8 @@ class gamification_goal(osv.Model):
         """Overwrite the write method to update the last_update field to today"""
         for goal in self.browse(cr, uid, ids, vals):
             vals['last_update'] = fields.date.today()
-            if 'current' in vals:
 
+            if 'current' in vals:
                 if 'just_created' in context:
                     # new goals should not be reported
                     continue
@@ -448,12 +448,37 @@ class gamification_goal_plan(osv.Model):
         return write_res
 
     def _update_all(self, cr, uid, ids=False, context=None):
-        """Update every plan in progress"""
-        if not ids:
-            ids = self.search(cr, uid, [('state', '=', 'inprogress'),
-                ('period', '!=', 'once')])
+        """Update the plans
+
+        Create the goals for planlines not linked to goals (eg: modified the 
+            plan to add planlines)
+        :param list(int) ids: the ids of the plans to update, if False will 
+        update every goal in progress"""
+
+        if not ids:
+            ids = self.search(cr, uid, [('state', '=', 'inprogress')])
+
+        goal_obj = self.pool.get('gamification.goal')
+        planline_obj = self.pool.get('gamification.goal.planline')
+
+        self.generate_goals_from_plan(cr, uid, ids, context=context)
+        for plan in self.browse(cr, uid, ids, context):
+            for planline in plan.planline_ids:
+                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
+                goal_obj.update(cr, uid, goal_ids, context=context)
+
+            # useless, goals removed in cascade
+            # current_planlines = [planline.id for planline in plan.planline_ids]
+            # print(current_planlines)
+            # related_planlines = planline_obj.search(cr, uid, [('plan_id','=',plan.id)])
+            # print(related_planlines)
+            # # the list of planlines linked to the plan but not in plan.planline_ids
+            # excluded_planlines = [plid for plid in related_planlines if plid not in current_planlines ]
+            # print(excluded_planlines)
+            # excluded_goals = goal_obj.search(cr, uid, [('planline_id', 'in', excluded_planlines)], context=context)
+            # print(excluded_goals)
+            # goal_obj.write(cr, uid, excluded_goals, {'state': 'canceled'}, context=context)
 
-        return self.generate_goals_from_plan(cr, uid, ids, context=context)
 
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
@@ -463,21 +488,11 @@ class gamification_goal_plan(osv.Model):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def action_check(self, cr, uid, ids, context=None):
-        """Check a goal plan in progress
+        """Check a goal plan
 
         Create goals that haven't been created yet (eg: if added users of planlines)
         Recompute the current value for each goal related"""
-        self.generate_goals_from_plan(cr, uid, ids, context=context)
-        for plan in self.browse(cr, uid, ids, context):
-            if plan.state != 'improgress':
-                continue
-
-            for planline in plan.planline_ids:
-                goal_obj = self.pool.get('gamification.goal')
-                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
-                goal_obj.update(cr, uid, goal_ids, context=context)
-
-        return True
+        return self._update_all(cr, uid, ids, context=context)    
 
 
     def action_close(self, cr, uid, ids, context=None):

From 49283571945d8a47907548fdfe1616b5101634db Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 14:53:29 +0100
Subject: [PATCH 089/547] [REF] gamification: split goal and rename views

bzr revid: mat@openerp.com-20130228135329-uxvvewraskm3jlfi
---
 addons/gamification/__init__.py               |   1 +
 addons/gamification/__openerp__.py            |   6 +-
 addons/gamification/goal.py                   | 501 +-----------------
 .../{view/goal.xml => goal_view.xml}          |  89 ++++
 addons/gamification/plan.py                   | 480 +++++++++++++++++
 .../{view/plan.xml => plan_view.xml}          |   0
 addons/gamification/view/menu.xml             |  13 -
 addons/gamification/view/type.xml             |  82 ---
 8 files changed, 576 insertions(+), 596 deletions(-)
 rename addons/gamification/{view/goal.xml => goal_view.xml} (61%)
 create mode 100644 addons/gamification/plan.py
 rename addons/gamification/{view/plan.xml => plan_view.xml} (100%)
 delete mode 100644 addons/gamification/view/menu.xml
 delete mode 100644 addons/gamification/view/type.xml

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index f89b6d58063..26ed2972356 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -1,2 +1,3 @@
 import goal
+import plan
 import res_users
diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 5bf4bd596dd..db0099acef4 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -27,10 +27,8 @@
     'description': """Gamification of goals""",
 
     'data': [
-        'view/type.xml',
-        'view/goal.xml',
-        'view/plan.xml',
-        'view/menu.xml',
+        'goal_view.xml',
+        'plan_view.xml',
         'cron.xml',
         ],
     'installable': True,
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 93657de6eba..5660084fa77 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -22,78 +22,9 @@
 from openerp.osv import fields, osv
 from openerp.tools.safe_eval import safe_eval
 
+from templates import TemplateHelper
+
 from datetime import date, datetime, timedelta
-from mako.template import Template as MakoTemplate
-from urllib import urlencode, quote as quote
-
-import calendar
-import itertools
-import logging
-import os.path
-
-_logger = logging.getLogger(__name__)
-
-GAMIFICATION_PATH = os.path.dirname(os.path.abspath(__file__))
-
-try:
-    # We use a jinja2 sandboxed environment to render mako templates.
-    # Note that the rendering does not cover all the mako syntax, in particular
-    # arbitrary Python statements are not accepted, and not all expressions are
-    # allowed: only "public" attributes (not starting with '_') of objects may
-    # be accessed.
-    # This is done on purpose: it prevents incidental or malicious execution of
-    # Python code that may break the security of the server.
-    from jinja2.sandbox import SandboxedEnvironment
-    from jinja2 import FileSystemLoader
-    mako_template_env = SandboxedEnvironment(
-        loader=FileSystemLoader(os.path.join(GAMIFICATION_PATH,'templates/')),
-        block_start_string="<%",
-        block_end_string="%>",
-        variable_start_string="${",
-        variable_end_string="}",
-        comment_start_string="<%doc>",
-        comment_end_string="</%doc>",
-        line_statement_prefix="%",
-        line_comment_prefix="##",
-        trim_blocks=True,               # do not output newline after blocks
-        autoescape=True,                # XML/HTML automatic escaping
-    )
-    mako_template_env.globals.update({
-        'str': str,
-        'quote': quote,
-        'urlencode': urlencode,
-    })
-except ImportError:
-    _logger.warning("jinja2 not available, templating features will not work!")
-
-
-
-def start_end_date_for_period(period):
-    """Return the start and end date for a goal period based on today
-
-    :return (start_date, end_date), datetime.date objects, False if the period is
-    not defined or unknown"""
-    today = date.today()
-    if period == 'daily':
-        start_date = today
-        end_date = start_date # ? + timedelta(days=1)
-    elif period == 'weekly':
-        delta = timedelta(days=today.weekday())
-        start_date = today - delta
-        end_date = start_date + timedelta(days=7)
-    elif period == 'monthly':
-        month_range = calendar.monthrange(today.year, today.month)
-        start_date = today.replace(day=month_range[0])
-        end_date = today.replace(day=month_range[1])
-    elif period == 'yearly':
-        start_date = today.replace(month=1, day=1)
-        end_date = today.replace(month=12, day=31)
-    else: # period == 'once':
-        start_date = False # for manual goal, start each time
-        end_date = False
-    
-    return (start_date, end_date)
-
 
 class gamification_goal_type(osv.Model):
     """Goal type definition
@@ -264,7 +195,8 @@ class gamification_goal(osv.Model):
                         towrite['state'] = 'inprogress_update'
 
                         # generate a remind report
-                        body_html = mako_template_env.get_template('reminder.mako').render({'object':goal})
+                        template_env = TemplateHelper()
+                        body_html = template_env.get_template('reminder.mako').render({'object':goal})
                         self.message_post(cr, uid, goal.id,
                             body=body_html,
                             partner_ids=[goal.user_id.partner_id.id],
@@ -340,428 +272,3 @@ class gamification_goal(osv.Model):
                     plan_obj.report_progress(cr, uid, [goal.planline_id.plan_id.id], users=[goal.user_id], context=context)
         return super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         
-
-class gamification_goal_plan(osv.Model):
-    """Gamification goal plan
-
-    Set of predifined goals to be able to automate goal settings or
-    quickly apply several goals manually to a group of users
-
-    If 'user_ids' is defined and 'period' is different than 'one', the set will
-    be assigned to the users for each period (eg: every 1st of each month if 
-        'monthly' is selected)
-    """
-
-    _name = 'gamification.goal.plan'
-    _description = 'Gamification goal plan'
-    _inherit = 'mail.thread'
-
-    _columns = {
-        'name' : fields.char('Plan Name', required=True),
-        'user_ids' : fields.many2many('res.users',
-            string='Users',
-            help="list of users to which the goal will be set"),
-        'planline_ids' : fields.one2many('gamification.goal.planline',
-            'plan_id',
-            string='Planline',
-            help="list of goals that will be set",
-            required=True),
-        'autojoin_group_id' : fields.many2one('res.groups',
-            string='Auto-join Group',
-            help='Group of users whose members will automatically be added to the users'),
-        'period' : fields.selection([
-                ('once', 'No Periodicity'),
-                ('daily', 'Daily'),
-                ('weekly', 'Weekly'),
-                ('monthly', 'Monthly'),
-                ('yearly', 'Yearly')
-            ],
-            string='Periodicity',
-            help='Period of automatic goal assigment, will be done manually if none is selected',
-            required=True),
-        'state': fields.selection([
-                ('draft', 'Draft'),
-                ('inprogress', 'In progress'),
-                ('done', 'Done'),
-            ],
-            string='State',
-            required=True),
-        'visibility_mode':fields.selection([
-                ('board','Leader board'),
-                ('progressbar','Personal progressbar')
-            ],
-            string="Visibility",
-            help='How are displayed the results, shared or in a single progressbar',
-            required=True),
-        'report_message_frequency':fields.selection([
-                ('never','Never'),
-                ('onchange','On change'),
-                ('daily','Daily'),
-                ('weekly','Weekly'),
-                ('monthly','Monthly'),
-                ('yearly', 'Yearly')
-            ],
-            string="Frequency",
-            required=True),
-        'report_message_group_id' : fields.many2one('mail.group',
-            string='Send a copy to',
-            help='Group that will receive a copy of the report in addition to the user'),
-        'report_header' : fields.text('Report Header'),
-        'remind_update_delay' : fields.integer('Remind delay',
-            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified.")
-        }
-
-    _defaults = {
-        'period': 'once',
-        'state': 'draft',
-        'visibility_mode' : 'progressbar',
-        'report_message_frequency' : 'onchange',
-    }
-
-    def _check_nonzero_planline(self, cr, uid, ids, context=None):
-        """checks that there is at least one planline set"""
-        for plan in self.browse(cr, uid, ids, context):
-            if len(plan.planline_ids) < 1:
-                return False
-        return True
-
-    def _check_nonzero_users(self, cr, uid, ids, context=None):
-        """checks that there is at least one user set"""
-        for plan in self.browse(cr, uid, ids, context):
-            if len(plan.user_ids) < 1 and plan.state != 'draft':
-                return False
-        return True
-
-    _constraints = [
-        (_check_nonzero_planline, "At least one planline is required to create a goal plan", ['planline_ids']),
-        (_check_nonzero_users, "At least one user is required to create a non-draft goal plan", ['user_ids']),
-    ]
-
-    def write(self, cr, uid, ids, vals, context=None):
-        """Overwrite the write method to add the user of groups"""
-        write_res = super(gamification_goal_plan, self).write(cr, uid, ids, vals, context=context)
-        
-        # add users when change the group auto-subscription
-        if 'autojoin_group_id' in vals:
-            new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
-            self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
-        return write_res
-
-    def _update_all(self, cr, uid, ids=False, context=None):
-        """Update the plans
-
-        Create the goals for planlines not linked to goals (eg: modified the 
-            plan to add planlines)
-        :param list(int) ids: the ids of the plans to update, if False will 
-        update every goal in progress"""
-
-        if not ids:
-            ids = self.search(cr, uid, [('state', '=', 'inprogress')])
-
-        goal_obj = self.pool.get('gamification.goal')
-        planline_obj = self.pool.get('gamification.goal.planline')
-
-        self.generate_goals_from_plan(cr, uid, ids, context=context)
-        for plan in self.browse(cr, uid, ids, context):
-            for planline in plan.planline_ids:
-                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
-                goal_obj.update(cr, uid, goal_ids, context=context)
-
-            # useless, goals removed in cascade
-            # current_planlines = [planline.id for planline in plan.planline_ids]
-            # print(current_planlines)
-            # related_planlines = planline_obj.search(cr, uid, [('plan_id','=',plan.id)])
-            # print(related_planlines)
-            # # the list of planlines linked to the plan but not in plan.planline_ids
-            # excluded_planlines = [plid for plid in related_planlines if plid not in current_planlines ]
-            # print(excluded_planlines)
-            # excluded_goals = goal_obj.search(cr, uid, [('planline_id', 'in', excluded_planlines)], context=context)
-            # print(excluded_goals)
-            # goal_obj.write(cr, uid, excluded_goals, {'state': 'canceled'}, context=context)
-
-
-    def action_start(self, cr, uid, ids, context=None):
-        """Start a draft goal plan
-
-        Change the state of the plan to in progress"""
-        self.generate_goals_from_plan(cr, uid, ids, context=context)
-        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
-
-    def action_check(self, cr, uid, ids, context=None):
-        """Check a goal plan
-
-        Create goals that haven't been created yet (eg: if added users of planlines)
-        Recompute the current value for each goal related"""
-        return self._update_all(cr, uid, ids, context=context)    
-
-
-    def action_close(self, cr, uid, ids, context=None):
-        """Close a plan in progress
-
-        Change the state of the plan to in done
-        Does NOT close the related goals, this is handled by the goal itself"""
-        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
-
-    def action_reset(self, cr, uid, ids, context=None):
-        """Reset a closed goal plan
-
-        Change the state of the plan to in progress
-        Closing a plan does not affect the goals so neither does reset"""
-        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        """Cancel a plan in progress
-
-        Change the state of the plan to draft
-        Cancel the related goals"""
-        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
-        for plan in self.browse(cr, uid, ids, context):
-            for planline in plan.planline_ids:
-                goal_obj = self.pool.get('gamification.goal')
-
-                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
-                goal_obj.write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
-
-        return True
-
-    def action_show_related_goals(self, cr, uid, ids, context=None):
-        """ This opens goal view with a restriction to the list of goals from this plan only
-            @return: the goal view
-        """
-        # get ids of related goals 
-        goal_obj = self.pool.get('gamification.goal')
-        related_goal_ids = []
-        for plan in self.browse(cr, uid, ids, context=context):
-            for planline in plan.planline_ids:
-                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
-                related_goal_ids.extend(goal_ids)
-        
-        # process the new view
-        if context is None:
-            context = {}
-        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'gamification','goals_from_plan_act', context=context)
-        res['context'] = context
-        res['context'].update({
-            'default_id': related_goal_ids
-        })
-        res['domain'] = [('id','in', related_goal_ids)]
-        return res
-
-    def generate_goals_from_plan(self, cr, uid, ids, context=None):
-        """Generate the lsit of goals fron a plan"""
-        for plan in self.browse(cr, uid, ids, context):
-            (start_date, end_date) = start_end_date_for_period(plan.period)
-
-            for planline in plan.planline_ids:
-                for user in plan.user_ids:
-                    #self.create_goal_from_plan(cr, uid, ids, planline.id, user.id, start_date, context=context)
-
-                    goal_obj = self.pool.get('gamification.goal')
-                    domain = [('planline_id', '=', planline.id),
-                            ('user_id', '=', user.id)]
-                    if start_date:
-                        domain.append(('start_date', '=', start_date))
-                    
-                    # goal existing for this planline ?
-                    if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
-
-                        # resume canceled goals
-                        domain.append(('state', '=', 'canceled'))
-                        canceled_goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                        goal_obj.write(cr, uid, canceled_goal_ids, {'state': 'inprogress'}, context=context)
-                        goal_obj.update(cr, uid, canceled_goal_ids, context=context)
-                        
-                        # skip to next user
-                        continue
-
-                    values = {
-                        'type_id':planline.type_id.id,
-                        'planline_id':planline.id,
-                        'user_id':user.id,
-                        'target_goal':planline.target_goal,
-                        'state':'inprogress',
-                    }
-            
-                    if start_date:
-                        values['start_date'] = start_date.isoformat()
-                    if end_date:
-                        values['end_date'] = end_date.isoformat()
-
-                    if planline.plan_id.remind_update_delay:
-                        values['remind_update_delay'] = planline.plan_id.remind_update_delay
-
-                    new_goal_id = goal_obj.create(cr, uid, values, context)
-                    
-                    goal_obj.update(cr, uid, [new_goal_id], context=context)
-
-        return True
-
-
-    def plan_subscribe_users(self, cr, uid, ids, new_user_ids, context=None):
-        """ Add the following users to plans
-
-        :param ids: ids of plans to which the users will be added
-        :param user_ids: ids of the users to add"""
-
-        for plan in self.browse(cr,uid, ids, context):
-            subscription = [user.id for user in plan.user_ids]
-            subscription.extend(new_user_ids)
-            unified_subscription = list(set(subscription))
-            self.write(cr, uid, ids, {'user_ids': [(4, uid) for uid in unified_subscription]}, context=context)
-        return True
-
-
-    def report_progress(self, cr, uid, ids, users=False, context=None):
-        """Post report about the progress of the goals
-
-        :param list(int) ids: the list of plan ids that need to be reported
-        :param list(res.users) users: the list of users that are concerned by
-          the report. If False, will send the report to every user concerned
-          (goal users and group that recieves a copy). Only used for plan with
-          a visibility mode set to 'personal'."""
-        
-        context = context or {}
-        goal_obj = self.pool.get('gamification.goal')
-
-        for plan in self.browse(cr, uid, ids, context=context):
-            if not plan.report_message_group_id:
-                # no report group, skipping
-                continue
-
-            if plan.visibility_mode == 'board':
-                # generate a shared report
-                planlines_boards = []
-                for planline in plan.planline_ids:
-
-                    (start_date, end_date) = start_end_date_for_period(plan.period)
-                    domain = [
-                        ('planline_id', '=', planline.id),
-                        ('state', 'in', ('inprogress', 'inprogress_update',
-                            'reached', 'failed')),
-                    ]
-                    if start_date:
-                        domain.append(('start_date', '=', start_date.isoformat()))
-                    
-
-                    board_goals = []
-                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                    for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
-                        board_goals.append({
-                            'user': goal.user_id,
-                            'current':goal.current,
-                            'target_goal':goal.target_goal,
-                            'completeness':goal.completeness,
-                        })
-
-                    # most complete first, current if same percentage (eg: if several 100%)
-                    sorted_board = enumerate(sorted(board_goals, key=lambda k: (k['completeness'], k['current']), reverse=True))
-                    planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
-
-                body_html = mako_template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
-                self.message_post(cr, uid, plan.id,
-                    body=body_html,
-                    partner_ids=[user.partner_id.id for user in plan.user_ids],
-                    context=context,
-                    subtype='mail.mt_comment')
-                self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
-                    body=body_html,
-                    context=context,
-                    subtype='mail.mt_comment')
-                
-            else:
-                # generate individual reports
-                for user in users or plan.user_ids:
-                    
-                    goal_ids = self.get_current_related_goals(cr, uid, plan.id, user.id, context=context)
-                    if len(goal_ids) == 0:
-                        continue
-
-                    variables = {
-                        'object':plan,
-                        'user':user,
-                        'goals':goal_obj.browse(cr, uid, goal_ids, context=context)
-                    }
-                    body_html = mako_template_env.get_template('personal_progress.mako').render(variables)
-                    
-                    self.message_post(cr, uid, plan.id,
-                        body=body_html,
-                        partner_ids=[user.partner_id.id],
-                        context=context,
-                        subtype='mail.mt_comment')
-                    self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
-                        body=body_html,
-                        context=context,
-                        subtype='mail.mt_comment')
-        return True
-
-
-    def get_current_related_goals(self, cr, uid, plan_id, user_id, context=None):
-        """Get the ids of goals linked to a plan for the current instance
-
-        If several goals are linked to the same planline and user, only the
-        latest instance of the plan is checked (eg: if the plan is monthly,
-        return the goals started the 1st of this month).
-        """
-
-        plan = self.browse(cr, uid, plan_id, context=context)
-        (start_date, end_date) = start_end_date_for_period(plan.period)
-
-        goal_obj = self.pool.get('gamification.goal')
-        related_goal_ids = []
-
-        for planline in plan.planline_ids:
-            domain = [('planline_id', '=', planline.id),
-                ('user_id', '=', user_id),
-                ('state','in',('inprogress','inprogress_update','reached'))]
-
-            if start_date:
-                domain.append(('start_date', '=', start_date.isoformat()))
-
-            goal_ids = goal_obj.search(cr, uid, domain, context=context)
-            related_goal_ids.extend(goal_ids)
-
-        return related_goal_ids
-
-class gamification_goal_planline(osv.Model):
-    """Gamification goal planline
-
-    Predifined goal for 'gamification_goal_plan'
-    These are generic list of goals with only the target goal defined
-    Should only be created for the gamification_goal_plan object
-    """
-
-    _name = 'gamification.goal.planline'
-    _description = 'Gamification generic goal for plan'
-    _order = "sequence_type"
-
-
-    def _get_planline_types(self, cr, uid, ids, context=None):
-        """Return the ids of planline items related to the gamification.goal.type
-        objects in 'ids (used to update the value of 'sequence_type')'"""
-
-        result = {}
-        for goal_type in self.pool.get('gamification.goal.type').browse(cr, uid, ids, context=context):
-            domain = [('type_id', '=', goal_type.id)]
-            planline_ids = self.pool.get('gamification.goal.planline').search(cr, uid, domain, context=context)
-            for p_id in planline_ids:
-                result[p_id] = True
-        return result.keys()
-
-    _columns = {
-        'plan_id' : fields.many2one('gamification.goal.plan',
-            string='Plan',
-            ondelete="cascade"),
-        'type_id' : fields.many2one('gamification.goal.type',
-            string='Goal Type',
-            required=True,
-            ondelete="cascade"),
-        'target_goal' : fields.float('Target Value to Reach',
-            required=True),
-        'sequence_type' : fields.related('type_id','sequence',
-            type='integer',
-            string='Sequence',
-            readonly=True,
-            store={
-                'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
-                }),
-    }
\ No newline at end of file
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/goal_view.xml
similarity index 61%
rename from addons/gamification/view/goal.xml
rename to addons/gamification/goal_view.xml
index af5a3e3672c..fbe810b9312 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/goal_view.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
+        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
+            <!-- Goals -->
+            <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
+            <!-- Goal plans -->
+            <menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
+            <!-- Goal types -->
+            <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>
+
+        <!-- Goal views -->
+
         <record id="goal_list_action" model="ir.actions.act_window">
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
@@ -123,5 +133,84 @@
             </field>
         </record>
 
+
+        <!-- Goal types view -->
+        
+        <record id="goal_type_list_action" model="ir.actions.act_window">
+            <field name="name">Goal Types</field>
+            <field name="res_model">gamification.goal.type</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal type. 
+                </p>
+                <p>
+                    A goal type is a technical model of goal defining a condition to reach.
+                    The dates, values to reach or users are defined in goal instance.
+                </p>
+            </field>
+        </record>
+
+        <record id="goal_type_list_view" model="ir.ui.view">
+            <field name="name">Goal Types List</field>
+            <field name="model">gamification.goal.type</field>
+            <field name="arch" type="xml">
+                <tree string="Goal types">
+                    <field name="sequence" widget="handle"/>
+                    <field name="name"/>
+                    <field name="computation_mode"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="goal_type_form_view" model="ir.ui.view">
+            <field name="name">Goal Types Form</field>
+            <field name="model">gamification.goal.type</field>
+            <field name="arch" type="xml">
+                <form string="Goal types" version="7.0">
+                    <sheet>
+                        <h1>
+                            <div class="oe_edit_only">
+                                <label for="name"/>
+                            </div>
+                            <field name="name"/>
+                        </h1>
+                        <group>
+                            <group string="General">
+                                <field name="description"/>
+                                <field name="condition"/>
+                            </group>
+                            <group string="Computation">
+                                <field name="computation_mode"/>
+
+                                <!-- Hide the fields below if manually -->
+                                <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
+                                <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]" />
+                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
+                                <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="goal_type_search_view" model="ir.ui.view">
+            <field name="name">Goal Type Search</field>
+            <field name="model">gamification.goal.type</field>
+            <field name="arch" type="xml">
+                <search string="Search Goal Types">
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="field_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/>
+                        <filter string="Computation Mode" domain="[]" context="{'group_by':'computation_mode'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
new file mode 100644
index 00000000000..8c31dcd57c7
--- /dev/null
+++ b/addons/gamification/plan.py
@@ -0,0 +1,480 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+from templates import TemplateHelper
+
+from datetime import date, datetime, timedelta
+import calendar
+
+
+def start_end_date_for_period(period):
+    """Return the start and end date for a goal period based on today
+
+    :return (start_date, end_date), datetime.date objects, False if the period is
+    not defined or unknown"""
+    today = date.today()
+    if period == 'daily':
+        start_date = today
+        end_date = start_date # ? + timedelta(days=1)
+    elif period == 'weekly':
+        delta = timedelta(days=today.weekday())
+        start_date = today - delta
+        end_date = start_date + timedelta(days=7)
+    elif period == 'monthly':
+        month_range = calendar.monthrange(today.year, today.month)
+        start_date = today.replace(day=month_range[0])
+        end_date = today.replace(day=month_range[1])
+    elif period == 'yearly':
+        start_date = today.replace(month=1, day=1)
+        end_date = today.replace(month=12, day=31)
+    else: # period == 'once':
+        start_date = False # for manual goal, start each time
+        end_date = False
+    
+    return (start_date, end_date)
+
+
+class gamification_goal_plan(osv.Model):
+    """Gamification goal plan
+
+    Set of predifined goals to be able to automate goal settings or
+    quickly apply several goals manually to a group of users
+
+    If 'user_ids' is defined and 'period' is different than 'one', the set will
+    be assigned to the users for each period (eg: every 1st of each month if 
+        'monthly' is selected)
+    """
+
+    _name = 'gamification.goal.plan'
+    _description = 'Gamification goal plan'
+    _inherit = 'mail.thread'
+
+    _columns = {
+        'name' : fields.char('Plan Name', required=True),
+        'user_ids' : fields.many2many('res.users',
+            string='Users',
+            help="list of users to which the goal will be set"),
+        'planline_ids' : fields.one2many('gamification.goal.planline',
+            'plan_id',
+            string='Planline',
+            help="list of goals that will be set",
+            required=True),
+        'autojoin_group_id' : fields.many2one('res.groups',
+            string='Auto-join Group',
+            help='Group of users whose members will automatically be added to the users'),
+        'period' : fields.selection([
+                ('once', 'No Periodicity'),
+                ('daily', 'Daily'),
+                ('weekly', 'Weekly'),
+                ('monthly', 'Monthly'),
+                ('yearly', 'Yearly')
+            ],
+            string='Periodicity',
+            help='Period of automatic goal assigment, will be done manually if none is selected',
+            required=True),
+        'state': fields.selection([
+                ('draft', 'Draft'),
+                ('inprogress', 'In progress'),
+                ('done', 'Done'),
+            ],
+            string='State',
+            required=True),
+        'visibility_mode':fields.selection([
+                ('board','Leader board'),
+                ('progressbar','Personal progressbar')
+            ],
+            string="Visibility",
+            help='How are displayed the results, shared or in a single progressbar',
+            required=True),
+        'report_message_frequency':fields.selection([
+                ('never','Never'),
+                ('onchange','On change'),
+                ('daily','Daily'),
+                ('weekly','Weekly'),
+                ('monthly','Monthly'),
+                ('yearly', 'Yearly')
+            ],
+            string="Frequency",
+            required=True),
+        'report_message_group_id' : fields.many2one('mail.group',
+            string='Send a copy to',
+            help='Group that will receive a copy of the report in addition to the user'),
+        'report_header' : fields.text('Report Header'),
+        'remind_update_delay' : fields.integer('Remind delay',
+            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified.")
+        }
+
+    _defaults = {
+        'period': 'once',
+        'state': 'draft',
+        'visibility_mode' : 'progressbar',
+        'report_message_frequency' : 'onchange',
+    }
+
+    def _check_nonzero_planline(self, cr, uid, ids, context=None):
+        """checks that there is at least one planline set"""
+        for plan in self.browse(cr, uid, ids, context):
+            if len(plan.planline_ids) < 1:
+                return False
+        return True
+
+    def _check_nonzero_users(self, cr, uid, ids, context=None):
+        """checks that there is at least one user set"""
+        for plan in self.browse(cr, uid, ids, context):
+            if len(plan.user_ids) < 1 and plan.state != 'draft':
+                return False
+        return True
+
+    _constraints = [
+        (_check_nonzero_planline, "At least one planline is required to create a goal plan", ['planline_ids']),
+        (_check_nonzero_users, "At least one user is required to create a non-draft goal plan", ['user_ids']),
+    ]
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """Overwrite the write method to add the user of groups"""
+        write_res = super(gamification_goal_plan, self).write(cr, uid, ids, vals, context=context)
+        
+        # add users when change the group auto-subscription
+        if 'autojoin_group_id' in vals:
+            new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
+            self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
+        return write_res
+
+    def _update_all(self, cr, uid, ids=False, context=None):
+        """Update the plans
+
+        Create the goals for planlines not linked to goals (eg: modified the 
+            plan to add planlines)
+        :param list(int) ids: the ids of the plans to update, if False will 
+        update every goal in progress"""
+
+        if not ids:
+            ids = self.search(cr, uid, [('state', '=', 'inprogress')])
+
+        goal_obj = self.pool.get('gamification.goal')
+        planline_obj = self.pool.get('gamification.goal.planline')
+
+        self.generate_goals_from_plan(cr, uid, ids, context=context)
+        for plan in self.browse(cr, uid, ids, context):
+            for planline in plan.planline_ids:
+                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
+                goal_obj.update(cr, uid, goal_ids, context=context)
+
+            # useless, goals removed in cascade
+            # current_planlines = [planline.id for planline in plan.planline_ids]
+            # print(current_planlines)
+            # related_planlines = planline_obj.search(cr, uid, [('plan_id','=',plan.id)])
+            # print(related_planlines)
+            # # the list of planlines linked to the plan but not in plan.planline_ids
+            # excluded_planlines = [plid for plid in related_planlines if plid not in current_planlines ]
+            # print(excluded_planlines)
+            # excluded_goals = goal_obj.search(cr, uid, [('planline_id', 'in', excluded_planlines)], context=context)
+            # print(excluded_goals)
+            # goal_obj.write(cr, uid, excluded_goals, {'state': 'canceled'}, context=context)
+
+
+    def action_start(self, cr, uid, ids, context=None):
+        """Start a draft goal plan
+
+        Change the state of the plan to in progress"""
+        self.generate_goals_from_plan(cr, uid, ids, context=context)
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+
+    def action_check(self, cr, uid, ids, context=None):
+        """Check a goal plan
+
+        Create goals that haven't been created yet (eg: if added users of planlines)
+        Recompute the current value for each goal related"""
+        return self._update_all(cr, uid, ids, context=context)    
+
+
+    def action_close(self, cr, uid, ids, context=None):
+        """Close a plan in progress
+
+        Change the state of the plan to in done
+        Does NOT close the related goals, this is handled by the goal itself"""
+        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
+
+    def action_reset(self, cr, uid, ids, context=None):
+        """Reset a closed goal plan
+
+        Change the state of the plan to in progress
+        Closing a plan does not affect the goals so neither does reset"""
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """Cancel a plan in progress
+
+        Change the state of the plan to draft
+        Cancel the related goals"""
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        for plan in self.browse(cr, uid, ids, context):
+            for planline in plan.planline_ids:
+                goal_obj = self.pool.get('gamification.goal')
+
+                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
+                goal_obj.write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
+
+        return True
+
+    def action_show_related_goals(self, cr, uid, ids, context=None):
+        """ This opens goal view with a restriction to the list of goals from this plan only
+            @return: the goal view
+        """
+        # get ids of related goals 
+        goal_obj = self.pool.get('gamification.goal')
+        related_goal_ids = []
+        for plan in self.browse(cr, uid, ids, context=context):
+            for planline in plan.planline_ids:
+                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
+                related_goal_ids.extend(goal_ids)
+        
+        # process the new view
+        if context is None:
+            context = {}
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'gamification','goals_from_plan_act', context=context)
+        res['context'] = context
+        res['context'].update({
+            'default_id': related_goal_ids
+        })
+        res['domain'] = [('id','in', related_goal_ids)]
+        return res
+
+    def generate_goals_from_plan(self, cr, uid, ids, context=None):
+        """Generate the lsit of goals fron a plan"""
+        for plan in self.browse(cr, uid, ids, context):
+            (start_date, end_date) = start_end_date_for_period(plan.period)
+
+            for planline in plan.planline_ids:
+                for user in plan.user_ids:
+                    #self.create_goal_from_plan(cr, uid, ids, planline.id, user.id, start_date, context=context)
+
+                    goal_obj = self.pool.get('gamification.goal')
+                    domain = [('planline_id', '=', planline.id),
+                            ('user_id', '=', user.id)]
+                    if start_date:
+                        domain.append(('start_date', '=', start_date))
+                    
+                    # goal existing for this planline ?
+                    if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
+
+                        # resume canceled goals
+                        domain.append(('state', '=', 'canceled'))
+                        canceled_goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                        goal_obj.write(cr, uid, canceled_goal_ids, {'state': 'inprogress'}, context=context)
+                        goal_obj.update(cr, uid, canceled_goal_ids, context=context)
+                        
+                        # skip to next user
+                        continue
+
+                    values = {
+                        'type_id':planline.type_id.id,
+                        'planline_id':planline.id,
+                        'user_id':user.id,
+                        'target_goal':planline.target_goal,
+                        'state':'inprogress',
+                    }
+            
+                    if start_date:
+                        values['start_date'] = start_date.isoformat()
+                    if end_date:
+                        values['end_date'] = end_date.isoformat()
+
+                    if planline.plan_id.remind_update_delay:
+                        values['remind_update_delay'] = planline.plan_id.remind_update_delay
+
+                    new_goal_id = goal_obj.create(cr, uid, values, context)
+                    
+                    goal_obj.update(cr, uid, [new_goal_id], context=context)
+
+        return True
+
+
+    def plan_subscribe_users(self, cr, uid, ids, new_user_ids, context=None):
+        """ Add the following users to plans
+
+        :param ids: ids of plans to which the users will be added
+        :param user_ids: ids of the users to add"""
+
+        for plan in self.browse(cr,uid, ids, context):
+            subscription = [user.id for user in plan.user_ids]
+            subscription.extend(new_user_ids)
+            unified_subscription = list(set(subscription))
+            self.write(cr, uid, ids, {'user_ids': [(4, uid) for uid in unified_subscription]}, context=context)
+        return True
+
+
+    def report_progress(self, cr, uid, ids, context=None, users=False):
+        """Post report about the progress of the goals
+
+        :param list(int) ids: the list of plan ids that need to be reported
+        :param list(res.users) users: the list of users that are concerned by
+          the report. If False, will send the report to every user concerned
+          (goal users and group that recieves a copy). Only used for plan with
+          a visibility mode set to 'personal'."""
+        
+        context = context or {}
+        goal_obj = self.pool.get('gamification.goal')
+        template_env = TemplateHelper()
+
+        for plan in self.browse(cr, uid, ids, context=context):
+            if not plan.report_message_group_id:
+                # no report group, skipping
+                continue
+
+            if plan.visibility_mode == 'board':
+                # generate a shared report
+                planlines_boards = []
+                for planline in plan.planline_ids:
+
+                    (start_date, end_date) = start_end_date_for_period(plan.period)
+                    domain = [
+                        ('planline_id', '=', planline.id),
+                        ('state', 'in', ('inprogress', 'inprogress_update',
+                            'reached', 'failed')),
+                    ]
+                    if start_date:
+                        domain.append(('start_date', '=', start_date.isoformat()))
+                    
+
+                    board_goals = []
+                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                    for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
+                        board_goals.append({
+                            'user': goal.user_id,
+                            'current':goal.current,
+                            'target_goal':goal.target_goal,
+                            'completeness':goal.completeness,
+                        })
+
+                    # most complete first, current if same percentage (eg: if several 100%)
+                    sorted_board = enumerate(sorted(board_goals, key=lambda k: (k['completeness'], k['current']), reverse=True))
+                    planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
+
+                body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
+                self.message_post(cr, uid, plan.id,
+                    body=body_html,
+                    partner_ids=[user.partner_id.id for user in plan.user_ids],
+                    context=context,
+                    subtype='mail.mt_comment')
+                self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                    body=body_html,
+                    context=context,
+                    subtype='mail.mt_comment')
+                
+            else:
+                # generate individual reports
+                for user in users or plan.user_ids:
+                    goal_ids = self.get_current_related_goals(cr, uid, plan.id, user.id, context=context)
+                    if len(goal_ids) == 0:
+                        continue
+
+                    variables = {
+                        'object':plan,
+                        'user':user,
+                        'goals':goal_obj.browse(cr, uid, goal_ids, context=context)
+                    }
+                    body_html = template_env.get_template('personal_progress.mako').render(variables)
+                    
+                    self.message_post(cr, uid, plan.id,
+                        body=body_html,
+                        partner_ids=[user.partner_id.id],
+                        context=context,
+                        subtype='mail.mt_comment')
+                    self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                        body=body_html,
+                        context=context,
+                        subtype='mail.mt_comment')
+        return True
+
+
+    def get_current_related_goals(self, cr, uid, plan_id, user_id, context=None):
+        """Get the ids of goals linked to a plan for the current instance
+
+        If several goals are linked to the same planline and user, only the
+        latest instance of the plan is checked (eg: if the plan is monthly,
+        return the goals started the 1st of this month).
+        """
+
+        plan = self.browse(cr, uid, plan_id, context=context)
+        (start_date, end_date) = start_end_date_for_period(plan.period)
+
+        goal_obj = self.pool.get('gamification.goal')
+        related_goal_ids = []
+
+        for planline in plan.planline_ids:
+            domain = [('planline_id', '=', planline.id),
+                ('user_id', '=', user_id),
+                ('state','in',('inprogress','inprogress_update','reached'))]
+
+            if start_date:
+                domain.append(('start_date', '=', start_date.isoformat()))
+
+            goal_ids = goal_obj.search(cr, uid, domain, context=context)
+            related_goal_ids.extend(goal_ids)
+
+        return related_goal_ids
+
+class gamification_goal_planline(osv.Model):
+    """Gamification goal planline
+
+    Predifined goal for 'gamification_goal_plan'
+    These are generic list of goals with only the target goal defined
+    Should only be created for the gamification_goal_plan object
+    """
+
+    _name = 'gamification.goal.planline'
+    _description = 'Gamification generic goal for plan'
+    _order = "sequence_type"
+
+
+    def _get_planline_types(self, cr, uid, ids, context=None):
+        """Return the ids of planline items related to the gamification.goal.type
+        objects in 'ids (used to update the value of 'sequence_type')'"""
+
+        result = {}
+        for goal_type in self.pool.get('gamification.goal.type').browse(cr, uid, ids, context=context):
+            domain = [('type_id', '=', goal_type.id)]
+            planline_ids = self.pool.get('gamification.goal.planline').search(cr, uid, domain, context=context)
+            for p_id in planline_ids:
+                result[p_id] = True
+        return result.keys()
+
+    _columns = {
+        'plan_id' : fields.many2one('gamification.goal.plan',
+            string='Plan',
+            ondelete="cascade"),
+        'type_id' : fields.many2one('gamification.goal.type',
+            string='Goal Type',
+            required=True,
+            ondelete="cascade"),
+        'target_goal' : fields.float('Target Value to Reach',
+            required=True),
+        'sequence_type' : fields.related('type_id','sequence',
+            type='integer',
+            string='Sequence',
+            readonly=True,
+            store={
+                'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
+                }),
+    }
\ No newline at end of file
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/plan_view.xml
similarity index 100%
rename from addons/gamification/view/plan.xml
rename to addons/gamification/plan_view.xml
diff --git a/addons/gamification/view/menu.xml b/addons/gamification/view/menu.xml
deleted file mode 100644
index f26feb1ffef..00000000000
--- a/addons/gamification/view/menu.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <!-- <menuitem id="root_menu" name="Gamification"/> -->
-        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
-        	<!-- Goals -->
-        	<menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
-			<!-- Goal plans -->
-        	<menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
-        	<!-- Goal types -->
-        	<menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/gamification/view/type.xml b/addons/gamification/view/type.xml
deleted file mode 100644
index 8593148430b..00000000000
--- a/addons/gamification/view/type.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <record id="goal_type_list_action" model="ir.actions.act_window">
-            <field name="name">Goal Types</field>
-            <field name="res_model">gamification.goal.type</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to create a goal type. 
-                </p>
-                <p>
-                    A goal type is a technical model of goal defining a condition to reach.
-                    The dates, values to reach or users are defined in goal instance.
-                </p>
-            </field>
-        </record>
-
-        <record id="goal_type_list_view" model="ir.ui.view">
-            <field name="name">Goal Types List</field>
-            <field name="model">gamification.goal.type</field>
-            <field name="arch" type="xml">
-                <tree string="Goal types">
-                    <field name="sequence" widget="handle"/>
-                    <field name="name"/>
-                    <field name="computation_mode"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record id="goal_type_form_view" model="ir.ui.view">
-            <field name="name">Goal Types Form</field>
-            <field name="model">gamification.goal.type</field>
-            <field name="arch" type="xml">
-                <form string="Goal types" version="7.0">
-                    <sheet>
-                        <h1>
-                            <div class="oe_edit_only">
-                                <label for="name"/>
-                            </div>
-                            <field name="name"/>
-                        </h1>
-                        <group>
-                            <group string="General">
-                                <field name="description"/>
-                                <field name="condition"/>
-                            </group>
-                            <group string="Computation">
-                                <field name="computation_mode"/>
-
-                                <!-- Hide the fields below if manually -->
-                                <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
-                                <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]" />
-                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
-                                <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="goal_type_search_view" model="ir.ui.view">
-            <field name="name">Goal Type Search</field>
-            <field name="model">gamification.goal.type</field>
-            <field name="arch" type="xml">
-                <search string="Search Goal Types">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="field_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/>
-                        <filter string="Computation Mode" domain="[]" context="{'group_by':'computation_mode'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file

From 58645bc786f720195ab277ac6f2a7090af9a70a6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 15:08:13 +0100
Subject: [PATCH 090/547] [FIX] gamification: forgot template file

bzr revid: mat@openerp.com-20130228140813-zpf02rtjdhnixa3k
---
 addons/gamification/templates.py | 39 ++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 addons/gamification/templates.py

diff --git a/addons/gamification/templates.py b/addons/gamification/templates.py
new file mode 100644
index 00000000000..21e6b8e0b4f
--- /dev/null
+++ b/addons/gamification/templates.py
@@ -0,0 +1,39 @@
+# We use a jinja2 sandboxed environment to render mako templates.
+# Note that the rendering does not cover all the mako syntax, in particular
+# arbitrary Python statements are not accepted, and not all expressions are
+# allowed: only "public" attributes (not starting with '_') of objects may
+# be accessed.
+# This is done on purpose: it prevents incidental or malicious execution of
+# Python code that may break the security of the server.
+
+from jinja2.sandbox import SandboxedEnvironment
+from jinja2 import FileSystemLoader
+    
+from urllib import urlencode, quote as quote
+import os.path
+
+class TemplateHelper(SandboxedEnvironment):
+
+    GAMIFICATION_PATH = os.path.dirname(os.path.abspath(__file__))
+
+    def __init__(self):
+
+        super(TemplateHelper,self).__init__(
+            loader=FileSystemLoader(os.path.join(self.GAMIFICATION_PATH,'templates/')),
+            block_start_string="<%",
+            block_end_string="%>",
+            variable_start_string="${",
+            variable_end_string="}",
+            comment_start_string="<%doc>",
+            comment_end_string="</%doc>",
+            line_statement_prefix="%",
+            line_comment_prefix="##",
+            trim_blocks=True,               # do not output newline after blocks
+            autoescape=True,                # XML/HTML automatic escaping
+        )
+        self.globals.update({
+            'str': str,
+            'quote': quote,
+            'urlencode': urlencode,
+        })
+

From 03435479fdcf89945e4d8f3d507251cbbf701f9c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 15:19:33 +0100
Subject: [PATCH 091/547] [FIX] gamification: move menu definition to bottom

bzr revid: mat@openerp.com-20130228141933-t86uw0vih1houpyd
---
 addons/gamification/goal_view.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index fbe810b9312..4c605f2660c 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
-            <!-- Goals -->
-            <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
-            <!-- Goal plans -->
-            <menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
-            <!-- Goal types -->
-            <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>
 
         <!-- Goal views -->
-
         <record id="goal_list_action" model="ir.actions.act_window">
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
@@ -212,5 +204,11 @@
             </field>
         </record>
 
+        <!-- menus -->
+        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
+            <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
+            <menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
+            <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From 402f30284c1749a68a007513b56b12e8625bf9dd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 16:34:01 +0100
Subject: [PATCH 092/547] [FIX] gamification: move load order for menus

bzr revid: mat@openerp.com-20130228153401-1aptxkbcjdle1taw
---
 addons/gamification/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index db0099acef4..aa205457a4f 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -27,8 +27,8 @@
     'description': """Gamification of goals""",
 
     'data': [
-        'goal_view.xml',
         'plan_view.xml',
+        'goal_view.xml',
         'cron.xml',
         ],
     'installable': True,

From adf8b29451f42eca48e33cd6a7172515de3d5bbf Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Feb 2013 17:35:13 +0100
Subject: [PATCH 093/547] [FIX] gamification: send to user if no groups

bzr revid: mat@openerp.com-20130228163513-jb7pbs8xuiyoyuql
---
 addons/gamification/goal.py                   |  2 +-
 addons/gamification/plan.py                   | 22 +++++++++----------
 .../templates/group_progress.mako             |  4 ++--
 .../templates/personal_progress.mako          | 13 ++++++-----
 addons/gamification/templates/reminder.mako   |  6 ++---
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 5660084fa77..95e55fe4ab5 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -223,7 +223,7 @@ class gamification_goal(osv.Model):
                 else: # computation mode = count
                     res = obj.search(cr, uid, domain, context=context)
                     towrite = {'current': len(res)}
-
+                print(domain, res)
             # check goal target reached
             if (goal.type_id.condition == 'plus' \
                 and towrite['current'] >= goal.target_goal) \
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 8c31dcd57c7..b731f7af67b 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -338,9 +338,6 @@ class gamification_goal_plan(osv.Model):
         template_env = TemplateHelper()
 
         for plan in self.browse(cr, uid, ids, context=context):
-            if not plan.report_message_group_id:
-                # no report group, skipping
-                continue
 
             if plan.visibility_mode == 'board':
                 # generate a shared report
@@ -372,15 +369,17 @@ class gamification_goal_plan(osv.Model):
                     planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
 
                 body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
+                print(body_html)
                 self.message_post(cr, uid, plan.id,
                     body=body_html,
                     partner_ids=[user.partner_id.id for user in plan.user_ids],
                     context=context,
                     subtype='mail.mt_comment')
-                self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
-                    body=body_html,
-                    context=context,
-                    subtype='mail.mt_comment')
+                if plan.report_message_group_id:
+                    self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                        body=body_html,
+                        context=context,
+                        subtype='mail.mt_comment')
                 
             else:
                 # generate individual reports
@@ -401,10 +400,11 @@ class gamification_goal_plan(osv.Model):
                         partner_ids=[user.partner_id.id],
                         context=context,
                         subtype='mail.mt_comment')
-                    self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
-                        body=body_html,
-                        context=context,
-                        subtype='mail.mt_comment')
+                    if plan.report_message_group_id:
+                        self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                            body=body_html,
+                            context=context,
+                            subtype='mail.mt_comment')
         return True
 
 
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index a815b711114..332711fd1e4 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -9,8 +9,8 @@
 	</header>
 
 	<p class="oe_grey">${object.report_header or ''}</p>
-
-    % for planline in planlines_boards:
+	<br/><br/>
+	% for planline in planlines_boards:
         
         <table width="100%" border="1">
         	<tr>
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
index a7325760b56..3c4e48f82a1 100644
--- a/addons/gamification/templates/personal_progress.mako
+++ b/addons/gamification/templates/personal_progress.mako
@@ -5,13 +5,11 @@
 </head>
 <body>
 	<header>
-	    % if object.report_header
-	    	${object.report_header}
-	    % endif
-	</header>
-    
-    <p>Below are the latest results for the plan ${object.name} for ${user.name}.</p>
+        <strong>${object.name}</strong>
+    </header>
 
+    <p class="oe_grey">${object.report_header or ''}</p>
+    <br/><br/>
     <table width="100%" border="1">
     <tr>
         <th>Goal</th>
@@ -26,6 +24,9 @@
             <td>${goal.current}</td>
             <td>${goal.completeness} %</td>
         </tr>
+
+        <br/><br/>  
+    
     % endfor
     </table>
 </body>
\ No newline at end of file
diff --git a/addons/gamification/templates/reminder.mako b/addons/gamification/templates/reminder.mako
index 9e161dcef0e..632467eb771 100644
--- a/addons/gamification/templates/reminder.mako
+++ b/addons/gamification/templates/reminder.mako
@@ -5,10 +5,10 @@
 </head>
 <body>
 	<header>
-	    % if object.report_header
-	    	${object.report_header}
-	    % endif
+	    <strong>Reminder ${object.name}</strong>
 	</header>
+
+	<p class="oe_grey">${object.report_header or ''}</p>
     
     <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay}. Do not forget to do it.</p>
 

From f6fe4cb8d457892b558c4648dd4ec607d432fbfa Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 09:11:10 +0100
Subject: [PATCH 094/547] [FIX] gamification: first month day is quite often 1

bzr revid: mat@openerp.com-20130301081110-rtrbl4pwc8xegfcs
---
 addons/gamification/plan.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index b731f7af67b..c98e5b5fb4a 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -42,7 +42,7 @@ def start_end_date_for_period(period):
         end_date = start_date + timedelta(days=7)
     elif period == 'monthly':
         month_range = calendar.monthrange(today.year, today.month)
-        start_date = today.replace(day=month_range[0])
+        start_date = today.replace(day=1)
         end_date = today.replace(day=month_range[1])
     elif period == 'yearly':
         start_date = today.replace(month=1, day=1)
@@ -369,7 +369,7 @@ class gamification_goal_plan(osv.Model):
                     planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
 
                 body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
-                print(body_html)
+                
                 self.message_post(cr, uid, plan.id,
                     body=body_html,
                     partner_ids=[user.partner_id.id for user in plan.user_ids],
@@ -395,6 +395,8 @@ class gamification_goal_plan(osv.Model):
                     }
                     body_html = template_env.get_template('personal_progress.mako').render(variables)
                     
+                    # FIXME mail NOT sent -> no followers
+                    # FIXME huge blank space
                     self.message_post(cr, uid, plan.id,
                         body=body_html,
                         partner_ids=[user.partner_id.id],

From 6308e19b59837d1a08a5817332ab92e4e33b8764 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 10:56:49 +0100
Subject: [PATCH 095/547] [FIX] gamification: send the email to partner_ids,
 finally

bzr revid: mat@openerp.com-20130301095649-8osyr0em20jn6fz7
---
 addons/gamification/plan.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index c98e5b5fb4a..9bede3ba62e 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -369,10 +369,9 @@ class gamification_goal_plan(osv.Model):
                     planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
 
                 body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
-                
                 self.message_post(cr, uid, plan.id,
                     body=body_html,
-                    partner_ids=[user.partner_id.id for user in plan.user_ids],
+                    partner_ids=[(6, 0, [user.partner_id.id for user in plan.user_ids])],
                     context=context,
                     subtype='mail.mt_comment')
                 if plan.report_message_group_id:
@@ -395,11 +394,10 @@ class gamification_goal_plan(osv.Model):
                     }
                     body_html = template_env.get_template('personal_progress.mako').render(variables)
                     
-                    # FIXME mail NOT sent -> no followers
                     # FIXME huge blank space
                     self.message_post(cr, uid, plan.id,
                         body=body_html,
-                        partner_ids=[user.partner_id.id],
+                        partner_ids=[(6, 0, [user.partner_id.id])],
                         context=context,
                         subtype='mail.mt_comment')
                     if plan.report_message_group_id:

From d51dbfb6bf3ed1e4adff3ef79f7528d8bceb044d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 12:27:20 +0100
Subject: [PATCH 096/547] [IMP] gamification: better cron call and comments

bzr revid: mat@openerp.com-20130301112720-tc781hdz1y1vnqp1
---
 addons/gamification/goal.py                   | 37 ++++++++++++++++---
 addons/gamification/goal_view.xml             |  2 +-
 addons/gamification/plan.py                   | 27 +++++---------
 .../templates/personal_progress.mako          |  3 +-
 4 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 95e55fe4ab5..bf5973b7dea 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -162,17 +162,26 @@ class gamification_goal(osv.Model):
     }
 
 
-    def _update_all(self, cr, uid, ids=False, context=None):
-        """Update every goal in progress"""
+    def _update_all(self, cr, uid, context=None, ids=False):
+        """Update every goal in progress or reached whose date is not passed"""
+        if not context: context = {}
         if not ids:
-            ids = self.search(cr, uid, [('state', 'in', ('inprogress','inprogress_update', 'reached'))])
+            ids = self.search(cr, uid, [
+                '&',
+                    ('state', 'in', ('inprogress','inprogress_update', 'reached')),
+                    '|',
+                        ('end_date', '>=', fields.date.today()),
+                        ('end_date', '=', False)
+                ])
 
         return self.update(cr, uid, ids, context=context)
 
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
 
-        If a goal reaches the target value, the status is set to reach
+        If a manual goal is not updated for enough time, the user will be
+        reminded to do so (done only once, in 'inprogress' state).
+        If a goal reaches the target value, the status is set to reached
         If the end date is passed (at least +1 day, time not considered) without
         the target value being reached, the goal is set as failed."""
         
@@ -239,16 +248,31 @@ class gamification_goal(osv.Model):
         return True
 
     def action_start(self, cr, uid, ids, context=None):
+        """Mark a goal as started.
+
+        This should only be used when creating goals manually (in draft state)"""
         self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
         return self.update(cr, uid, ids, context=context)
 
     def action_reach(self, cr, uid, ids, context=None):
+        """Mark a goal as reached.
+
+        If the target goal condition is not met, the state will be reset to In
+        Progress at the next goal update until the end date."""
         return self.write(cr, uid, ids, {'state': 'reached'}, context=context)
 
     def action_fail(self, cr, uid, ids, context=None):
+        """Set the state of the goal to failed.
+
+        A failed goal will be ignored in future checks."""
         return self.write(cr, uid, ids, {'state': 'failed'}, context=context)
 
     def action_cancel(self, cr, uid, ids, context=None):
+        """Reset the completion after setting a goal as reached or failed.
+
+        This is only the current state, if the date and/or target criterias
+        match the conditions for a change of state, this will be applied at the 
+        next goal update."""
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -258,7 +282,10 @@ class gamification_goal(osv.Model):
         return super(gamification_goal, self).create(cr, uid, vals, context=context)
         
     def write(self, cr, uid, ids, vals, context=None):
-        """Overwrite the write method to update the last_update field to today"""
+        """Overwrite the write method to update the last_update field to today
+
+        If the current value is changed and the report frequency is set to On 
+        change, q report is generated"""
         for goal in self.browse(cr, uid, ids, vals):
             vals['last_update'] = fields.date.today()
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 4c605f2660c..f0305eb758a 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -58,7 +58,7 @@
                             </group>
                             <group string="Schedule">
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="end_date" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="end_date" />
                                 <field name="computation_mode" invisible="1"/>
 
                                 <label for="remind_update_delay" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 9bede3ba62e..bdaafd5f4ba 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -160,13 +160,13 @@ class gamification_goal_plan(osv.Model):
             self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
         return write_res
 
-    def _update_all(self, cr, uid, ids=False, context=None):
+    def _update_all(self, cr, uid, context=None, ids=False):
         """Update the plans
 
         Create the goals for planlines not linked to goals (eg: modified the 
             plan to add planlines)
         :param list(int) ids: the ids of the plans to update, if False will 
-        update every goal in progress"""
+        update only goals in progress."""
 
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')])
@@ -180,19 +180,6 @@ class gamification_goal_plan(osv.Model):
                 goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
                 goal_obj.update(cr, uid, goal_ids, context=context)
 
-            # useless, goals removed in cascade
-            # current_planlines = [planline.id for planline in plan.planline_ids]
-            # print(current_planlines)
-            # related_planlines = planline_obj.search(cr, uid, [('plan_id','=',plan.id)])
-            # print(related_planlines)
-            # # the list of planlines linked to the plan but not in plan.planline_ids
-            # excluded_planlines = [plid for plid in related_planlines if plid not in current_planlines ]
-            # print(excluded_planlines)
-            # excluded_goals = goal_obj.search(cr, uid, [('planline_id', 'in', excluded_planlines)], context=context)
-            # print(excluded_goals)
-            # goal_obj.write(cr, uid, excluded_goals, {'state': 'canceled'}, context=context)
-
-
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
 
@@ -261,7 +248,12 @@ class gamification_goal_plan(osv.Model):
         return res
 
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
-        """Generate the lsit of goals fron a plan"""
+        """Generate the list of goals linked to a plan.
+
+        If goals already exist for this planline, the planline is skipped. This 
+        can be called after each change in the user or planline list.
+        :param list(int) ids: the list of plan concerned"""
+
         for plan in self.browse(cr, uid, ids, context):
             (start_date, end_date) = start_end_date_for_period(plan.period)
 
@@ -314,11 +306,12 @@ class gamification_goal_plan(osv.Model):
         """ Add the following users to plans
 
         :param ids: ids of plans to which the users will be added
-        :param user_ids: ids of the users to add"""
+        :param new_user_ids: ids of the users to add"""
 
         for plan in self.browse(cr,uid, ids, context):
             subscription = [user.id for user in plan.user_ids]
             subscription.extend(new_user_ids)
+            # remove duplicates
             unified_subscription = list(set(subscription))
             self.write(cr, uid, ids, {'user_ids': [(4, uid) for uid in unified_subscription]}, context=context)
         return True
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
index 3c4e48f82a1..702e844cf06 100644
--- a/addons/gamification/templates/personal_progress.mako
+++ b/addons/gamification/templates/personal_progress.mako
@@ -7,9 +7,8 @@
 	<header>
         <strong>${object.name}</strong>
     </header>
-
     <p class="oe_grey">${object.report_header or ''}</p>
-    <br/><br/>
+    <br><br>
     <table width="100%" border="1">
     <tr>
         <th>Goal</th>

From 7295e0e24897f69bf6cf37f24b398a72fc0080ac Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 15:32:44 +0100
Subject: [PATCH 097/547] [FIX] crm: a logged phone call is always done

bzr revid: mat@openerp.com-20130301143244-tf2on9w5g2irme3t
---
 addons/crm/crm_phonecall_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 2344604a294..613481ade91 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -58,7 +58,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context">{}</field>
+        <field name="context" eval="'{\'default_state\':\'done\'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">

From 24c0902c20f9e99c67bbc4f1570fd22ab5af1b1a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 16:21:50 +0100
Subject: [PATCH 098/547] [IMP] better templates

bzr revid: mat@openerp.com-20130301152150-7iyp75nywkvai2jn
---
 addons/gamification/templates/base.mako       | 13 ++++++++++++
 .../templates/group_progress.mako             | 18 ++++-------------
 .../templates/personal_progress.mako          | 20 ++++---------------
 3 files changed, 21 insertions(+), 30 deletions(-)
 create mode 100644 addons/gamification/templates/base.mako

diff --git a/addons/gamification/templates/base.mako b/addons/gamification/templates/base.mako
new file mode 100644
index 00000000000..d5bb0c24c99
--- /dev/null
+++ b/addons/gamification/templates/base.mako
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text_css">${css}</style>
+</head>
+<body>
+	<header>
+	    <strong>${object.name}</strong>
+	</header>
+	<p class="oe_grey">${object.report_header or ''}</p>
+<% block body %><% endblock %>
+
+</body>
\ No newline at end of file
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index 332711fd1e4..e875b3466f8 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -1,17 +1,7 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style type="text_css">${css}</style>
-</head>
-<body>
-	<header>
-	    <strong>${object.name}</strong>
-	</header>
+<% extends 'base.mako' %>
 
-	<p class="oe_grey">${object.report_header or ''}</p>
-	<br/><br/>
-	% for planline in planlines_boards:
-        
+<% block body %>
+	% for planline in planlines_boards: 
         <table width="100%" border="1">
         	<tr>
         		<th colspan="4">${planline['goal_type']}</th>
@@ -39,4 +29,4 @@
         <br/><br/>
 
     % endfor
-</body>
\ No newline at end of file
+<% endblock %>
\ No newline at end of file
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
index 702e844cf06..642d0aa9fc8 100644
--- a/addons/gamification/templates/personal_progress.mako
+++ b/addons/gamification/templates/personal_progress.mako
@@ -1,15 +1,6 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style type="text_css">${css}</style>
-</head>
-<body>
-	<header>
-        <strong>${object.name}</strong>
-    </header>
-    <p class="oe_grey">${object.report_header or ''}</p>
-    <br><br>
-    <table width="100%" border="1">
+<% extends 'base.mako' %>
+
+<% block body %><table width="100%" border="1">
     <tr>
         <th>Goal</th>
         <th>Target</th>
@@ -23,9 +14,6 @@
             <td>${goal.current}</td>
             <td>${goal.completeness} %</td>
         </tr>
-
-        <br/><br/>  
-    
     % endfor
     </table>
-</body>
\ No newline at end of file
+<% endblock %>
\ No newline at end of file

From 1401725d22f1c604cdff14148287c3626f96857a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 16:42:26 +0100
Subject: [PATCH 099/547] [IMP] gamification menu requires technical features

bzr revid: mat@openerp.com-20130301154226-v2gh6yg9zkpxsuyo
---
 addons/gamification/goal_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index f0305eb758a..e35ad91df64 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -204,8 +204,8 @@
             </field>
         </record>
 
-        <!-- menus -->
-        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration"/>
+        <!-- menus in settings - technical feature required -->
+        <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration" groups="base.group_no_one" />
             <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
             <menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
             <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>

From 453bbe06e3d9925b8012621f19df84ccb96168a6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 16:43:36 +0100
Subject: [PATCH 100/547] [REF] gamification: update goals only from plan, one
 cron call

bzr revid: mat@openerp.com-20130301154336-aqnq9tprxa7s9dim
---
 addons/gamification/cron.xml | 14 --------------
 addons/gamification/goal.py  | 18 ++----------------
 addons/gamification/plan.py  | 35 +++++++++++++++++++++--------------
 3 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index 4388ac88ff9..c025ba3dad7 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <!-- Scheduler for goal checking-->
-        <record forcecreate="True" id="ir_cron_check_goal"
-            model="ir.cron">
-            <field name="name">Run Goal Checker</field>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall" />
-            <field name="model">gamification.goal</field>
-            <field name="function">_update_all</field>
-            <field name="args">()</field>
-        </record>
-
         <record forcecreate="True" id="ir_cron_check_plan"
             model="ir.cron">
             <field name="name">Run Goal Plan Checker</field>
@@ -25,6 +12,5 @@
             <field name="function">_update_all</field>
             <field name="args">()</field>
         </record>
-
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index bf5973b7dea..8fce8d43753 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -38,7 +38,7 @@ class gamification_goal_type(osv.Model):
     _order = "sequence"
 
     _columns = {
-        'name': fields.char('Type Name', required=True),
+        'name': fields.char('Type Name', required=True, translate=True),
         'description': fields.text('Description'),
         'computation_mode': fields.selection([
                 ('sum','Sum'),
@@ -162,20 +162,6 @@ class gamification_goal(osv.Model):
     }
 
 
-    def _update_all(self, cr, uid, context=None, ids=False):
-        """Update every goal in progress or reached whose date is not passed"""
-        if not context: context = {}
-        if not ids:
-            ids = self.search(cr, uid, [
-                '&',
-                    ('state', 'in', ('inprogress','inprogress_update', 'reached')),
-                    '|',
-                        ('end_date', '>=', fields.date.today()),
-                        ('end_date', '=', False)
-                ])
-
-        return self.update(cr, uid, ids, context=context)
-
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
 
@@ -232,7 +218,7 @@ class gamification_goal(osv.Model):
                 else: # computation mode = count
                     res = obj.search(cr, uid, domain, context=context)
                     towrite = {'current': len(res)}
-                print(domain, res)
+                
             # check goal target reached
             if (goal.type_id.condition == 'plus' \
                 and towrite['current'] >= goal.target_goal) \
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index bdaafd5f4ba..2a5e955c828 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -70,7 +70,7 @@ class gamification_goal_plan(osv.Model):
     _inherit = 'mail.thread'
 
     _columns = {
-        'name' : fields.char('Plan Name', required=True),
+        'name' : fields.char('Plan Name', required=True, translate=True),
         'user_ids' : fields.many2many('res.users',
             string='Users',
             help="list of users to which the goal will be set"),
@@ -90,7 +90,7 @@ class gamification_goal_plan(osv.Model):
                 ('yearly', 'Yearly')
             ],
             string='Periodicity',
-            help='Period of automatic goal assigment, will be done manually if none is selected',
+            help='Period of automatic goal assigment. If none is selected, should be launched manually.',
             required=True),
         'state': fields.selection([
                 ('draft', 'Draft'),
@@ -114,14 +114,14 @@ class gamification_goal_plan(osv.Model):
                 ('monthly','Monthly'),
                 ('yearly', 'Yearly')
             ],
-            string="Frequency",
+            string="Report Frequency",
             required=True),
         'report_message_group_id' : fields.many2one('mail.group',
             string='Send a copy to',
             help='Group that will receive a copy of the report in addition to the user'),
         'report_header' : fields.text('Report Header'),
         'remind_update_delay' : fields.integer('Remind delay',
-            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified.")
+            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value or zero is specified.")
         }
 
     _defaults = {
@@ -160,25 +160,32 @@ class gamification_goal_plan(osv.Model):
             self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
         return write_res
 
+
     def _update_all(self, cr, uid, context=None, ids=False):
-        """Update the plans
+        """Update the plans and goals
 
         Create the goals for planlines not linked to goals (eg: modified the 
             plan to add planlines)
         :param list(int) ids: the ids of the plans to update, if False will 
         update only goals in progress."""
-
+        if not context: context = {}        
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')])
 
-        goal_obj = self.pool.get('gamification.goal')
-        planline_obj = self.pool.get('gamification.goal.planline')
-
         self.generate_goals_from_plan(cr, uid, ids, context=context)
-        for plan in self.browse(cr, uid, ids, context):
-            for planline in plan.planline_ids:
-                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
-                goal_obj.update(cr, uid, goal_ids, context=context)
+        
+        # update goals
+        goal_obj = self.pool.get('gamification.goal')
+        goal_ids = goal_obj.search(cr, uid, [
+                '&',
+                    ('state', 'in', ('inprogress','inprogress_update', 'reached')),
+                    '|',
+                        ('end_date', '>=', fields.date.today()),
+                        ('end_date', '=', False)
+                ], context=context)
+        goal_obj.update(cr, uid, goal_ids, context=context)
+
+        self.report_progress(cr, uid, ids, context=context)
 
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
@@ -362,6 +369,7 @@ class gamification_goal_plan(osv.Model):
                     planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
 
                 body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
+                
                 self.message_post(cr, uid, plan.id,
                     body=body_html,
                     partner_ids=[(6, 0, [user.partner_id.id for user in plan.user_ids])],
@@ -387,7 +395,6 @@ class gamification_goal_plan(osv.Model):
                     }
                     body_html = template_env.get_template('personal_progress.mako').render(variables)
                     
-                    # FIXME huge blank space
                     self.message_post(cr, uid, plan.id,
                         body=body_html,
                         partner_ids=[(6, 0, [user.partner_id.id])],

From 12c30843eb7e53be8f38323763722656468935ef Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 1 Mar 2013 18:01:37 +0100
Subject: [PATCH 101/547] [ADD] add goal plan menu in hr

bzr revid: mat@openerp.com-20130301170137-kzpe0lt4e4a0f105
---
 addons/hr_evaluation/__openerp__.py         | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 0c999ec4f7b..8249468a600 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -28,7 +28,7 @@
     'website': 'http://www.openerp.com',
     'summary': 'Periodical Evaluations, Appraisals, Surveys',
     'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg','images/hr_interview_requests.jpeg'],
-    'depends': ['hr','base_calendar','survey'],
+    'depends': ['hr','base_calendar','survey','gamification'],
     'description': """
 Periodical Employees evaluation and appraisals
 ==============================================
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 52b288fdad5..1e502817436 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -410,6 +410,7 @@
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
+        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" />
 
       <!-- Email Compose message Action-->
       <act_window

From e7ba23a4f799701f55b26dfa0afcb852067eddca Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 4 Mar 2013 12:27:12 +0100
Subject: [PATCH 102/547] [FIX] gamification send report at right frequency

bzr revid: mat@openerp.com-20130304112712-5qt8x9mikoqyg59o
---
 addons/gamification/goal.py       |   2 +-
 addons/gamification/plan.py       | 225 +++++++++++++++++++-----------
 addons/gamification/plan_view.xml |   2 +-
 3 files changed, 142 insertions(+), 87 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 8fce8d43753..60b39c2e5a0 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -282,6 +282,6 @@ class gamification_goal(osv.Model):
 
                 if goal.planline_id and goal.planline_id.plan_id.report_message_frequency == 'onchange':
                     plan_obj = self.pool.get('gamification.goal.plan')
-                    plan_obj.report_progress(cr, uid, [goal.planline_id.plan_id.id], users=[goal.user_id], context=context)
+                    plan_obj.report_progress(cr, uid, goal.planline_id.plan_id, users=[goal.user_id], context=context)
         return super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 2a5e955c828..881e08fdea5 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -69,6 +69,26 @@ class gamification_goal_plan(osv.Model):
     _description = 'Gamification goal plan'
     _inherit = 'mail.thread'
 
+    def _get_next_report_date(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the next report date based on the last report date and report
+        period. Return a string in isoformat."""
+        res = {}
+        for plan in self.browse(cr, uid, ids, context):
+            last = datetime.strptime(plan.last_report_date,'%Y-%m-%d').date()
+            if plan.report_message_frequency == 'daily':
+                next = last + timedelta(days=1)
+            elif plan.report_message_frequency == 'weekly':
+                next = last + timedelta(days=7)
+            elif plan.report_message_frequency == 'monthly':
+                month_range = calendar.monthrange(last.year, last.month)
+                next = last.replace(day=month_range[1]) + timedelta(days=1)
+            elif plan.report_message_frequency == 'yearly':
+                next = last.replace(year=last.year + 1)
+            else: # frequency == 'once':
+                next = False
+            res[plan.id] = next.isoformat()
+        return res
+
     _columns = {
         'name' : fields.char('Plan Name', required=True, translate=True),
         'user_ids' : fields.many2many('res.users',
@@ -121,7 +141,11 @@ class gamification_goal_plan(osv.Model):
             help='Group that will receive a copy of the report in addition to the user'),
         'report_header' : fields.text('Report Header'),
         'remind_update_delay' : fields.integer('Remind delay',
-            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value or zero is specified.")
+            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value or zero is specified."),
+        'last_report_date': fields.date('Last Report Date'),
+        'next_report_date': fields.function(_get_next_report_date,
+            type='date',
+            string='Next Report Date'),
         }
 
     _defaults = {
@@ -129,6 +153,7 @@ class gamification_goal_plan(osv.Model):
         'state': 'draft',
         'visibility_mode' : 'progressbar',
         'report_message_frequency' : 'onchange',
+        'last_report_date' : fields.date.today
     }
 
     def _check_nonzero_planline(self, cr, uid, ids, context=None):
@@ -167,25 +192,44 @@ class gamification_goal_plan(osv.Model):
         Create the goals for planlines not linked to goals (eg: modified the 
             plan to add planlines)
         :param list(int) ids: the ids of the plans to update, if False will 
-        update only goals in progress."""
+        update only plans in progress."""
         if not context: context = {}        
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')])
 
         self.generate_goals_from_plan(cr, uid, ids, context=context)
         
-        # update goals
         goal_obj = self.pool.get('gamification.goal')
+        # we use yesterday to update the goals that just ended
+        yesterday = date.today() - timedelta(days=1)
         goal_ids = goal_obj.search(cr, uid, [
                 '&',
                     ('state', 'in', ('inprogress','inprogress_update', 'reached')),
                     '|',
-                        ('end_date', '>=', fields.date.today()),
+                        ('end_date', '>=', yesterday.isoformat()),
                         ('end_date', '=', False)
                 ], context=context)
         goal_obj.update(cr, uid, goal_ids, context=context)
 
-        self.report_progress(cr, uid, ids, context=context)
+        for plan in self.browse(cr, uid, ids, context=context):
+            # goals closed but still opened at the last report date
+            closed_goals_to_report = []
+            for planline in plan.planline_ids:
+                closed_goals_to_report.extend( goal_obj.search(cr, uid, [
+                    ('planline_id','=',planline.id),
+                    ('start_date', '>=', plan.last_report_date),
+                    ('end_date', '<=', plan.last_report_date)
+                    ]) )
+
+            if len(closed_goals_to_report) > 0:
+                # some goals need a final report
+                self.report_progress(cr, uid, plan, subset_goal_ids=closed_goals_to_report, context=context)
+                self.write(cr, uid, plan.id, {'last_report_date':fields.date.today}, context=context)
+
+            if fields.date.today() == plan.next_report_date:
+                self.report_progress(cr, uid, plan, context=context)
+                self.write(cr, uid, plan.id, {'last_report_date':fields.date.today}, context=context)
+
 
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
@@ -199,7 +243,7 @@ class gamification_goal_plan(osv.Model):
 
         Create goals that haven't been created yet (eg: if added users of planlines)
         Recompute the current value for each goal related"""
-        return self._update_all(cr, uid, ids, context=context)    
+        return self._update_all(cr, uid, ids=ids, context=context)    
 
 
     def action_close(self, cr, uid, ids, context=None):
@@ -254,6 +298,12 @@ class gamification_goal_plan(osv.Model):
         res['domain'] = [('id','in', related_goal_ids)]
         return res
 
+    def action_report_progress(self, cr, uid, ids, context=None):
+        """Manual report of a goal, does not influence automatic report frequency"""
+        for plan in self.browse(cr, uid, ids, context):
+            self.report_progress(cr, uid, plan, context=context)
+        return True
+
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the list of goals linked to a plan.
 
@@ -324,55 +374,112 @@ class gamification_goal_plan(osv.Model):
         return True
 
 
-    def report_progress(self, cr, uid, ids, context=None, users=False):
+    def report_progress(self, cr, uid, plan, context=None, users=False, subset_goal_ids=False):
         """Post report about the progress of the goals
 
-        :param list(int) ids: the list of plan ids that need to be reported
+        :param plan: the plan object that need to be reported
         :param list(res.users) users: the list of users that are concerned by
           the report. If False, will send the report to every user concerned
           (goal users and group that recieves a copy). Only used for plan with
-          a visibility mode set to 'personal'."""
+          a visibility mode set to 'personal'.
+        :param list(int) goal_ids: the list of goal ids linked to the plan for 
+          the report. If not specified, use the goals for the current plan 
+          period. This parameter can be used to produce report for previous plan
+          periods."""
         
         context = context or {}
         goal_obj = self.pool.get('gamification.goal')
         template_env = TemplateHelper()
 
-        for plan in self.browse(cr, uid, ids, context=context):
+        (start_date, end_date) = start_end_date_for_period(plan.period)
 
-            if plan.visibility_mode == 'board':
-                # generate a shared report
-                planlines_boards = []
+        if plan.visibility_mode == 'board':
+            # generate a shared report
+            planlines_boards = []
+
+            for planline in plan.planline_ids:
+                
+                domain = [
+                    ('planline_id', '=', planline.id),
+                    ('state', 'in', ('inprogress', 'inprogress_update',
+                        'reached', 'failed')),
+                ]
+                
+                if subset_goal_ids:
+                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                    common_goal_ids = [goal.id for goal in goal_ids if goal in subset_goal_ids]
+                else:
+                    # if no subset goals, use the dates for restriction
+                    if start_date:
+                        domain.append(('start_date', '=', start_date.isoformat()))
+                    if end_date:
+                        domain.append(('end_date', '=', end_date.isoformat()))
+                    common_goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                
+                board_goals = []
+                for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context):
+                    board_goals.append({
+                        'user': goal.user_id,
+                        'current':goal.current,
+                        'target_goal':goal.target_goal,
+                        'completeness':goal.completeness,
+                    })
+
+                # most complete first, current if same percentage (eg: if several 100%)
+                sorted_board = enumerate(sorted(board_goals, key=lambda k: (k['completeness'], k['current']), reverse=True))
+                planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
+
+            body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
+            
+            self.message_post(cr, uid, plan.id,
+                body=body_html,
+                partner_ids=[(6, 0, [user.partner_id.id for user in plan.user_ids])],
+                context=context,
+                subtype='mail.mt_comment')
+            if plan.report_message_group_id:
+                self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                    body=body_html,
+                    context=context,
+                    subtype='mail.mt_comment')
+            
+        else:
+            # generate individual reports
+            for user in users or plan.user_ids:
+                related_goal_ids = []
                 for planline in plan.planline_ids:
-
-                    (start_date, end_date) = start_end_date_for_period(plan.period)
                     domain = [
                         ('planline_id', '=', planline.id),
+                        ('user_id', '=', user.id),
                         ('state', 'in', ('inprogress', 'inprogress_update',
                             'reached', 'failed')),
                     ]
-                    if start_date:
-                        domain.append(('start_date', '=', start_date.isoformat()))
                     
+                    if subset_goal_ids:
+                        goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                        related_goal_ids.extend( [goal.id for goal in goal_ids if goal in subset_goal_ids] )
 
-                    board_goals = []
-                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                    for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
-                        board_goals.append({
-                            'user': goal.user_id,
-                            'current':goal.current,
-                            'target_goal':goal.target_goal,
-                            'completeness':goal.completeness,
-                        })
+                    else:
+                        # if no subset goals, use the dates for restriction
+                        if start_date:
+                            domain.append(('start_date', '=', start_date.isoformat()))
+                        if end_date:
+                            domain.append(('end_date', '=', end_date.isoformat()))
 
-                    # most complete first, current if same percentage (eg: if several 100%)
-                    sorted_board = enumerate(sorted(board_goals, key=lambda k: (k['completeness'], k['current']), reverse=True))
-                    planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
+                        related_goal_ids.extend( goal_obj.search(cr, uid, domain, context=context) )
 
-                body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
+                if len(related_goal_ids) == 0:
+                    continue
+
+                variables = {
+                    'object':plan,
+                    'user':user,
+                    'goals':goal_obj.browse(cr, uid, related_goal_ids, context=context)
+                }
+                body_html = template_env.get_template('personal_progress.mako').render(variables)
                 
                 self.message_post(cr, uid, plan.id,
                     body=body_html,
-                    partner_ids=[(6, 0, [user.partner_id.id for user in plan.user_ids])],
+                    partner_ids=[(6, 0, [user.partner_id.id])],
                     context=context,
                     subtype='mail.mt_comment')
                 if plan.report_message_group_id:
@@ -380,60 +487,8 @@ class gamification_goal_plan(osv.Model):
                         body=body_html,
                         context=context,
                         subtype='mail.mt_comment')
-                
-            else:
-                # generate individual reports
-                for user in users or plan.user_ids:
-                    goal_ids = self.get_current_related_goals(cr, uid, plan.id, user.id, context=context)
-                    if len(goal_ids) == 0:
-                        continue
-
-                    variables = {
-                        'object':plan,
-                        'user':user,
-                        'goals':goal_obj.browse(cr, uid, goal_ids, context=context)
-                    }
-                    body_html = template_env.get_template('personal_progress.mako').render(variables)
-                    
-                    self.message_post(cr, uid, plan.id,
-                        body=body_html,
-                        partner_ids=[(6, 0, [user.partner_id.id])],
-                        context=context,
-                        subtype='mail.mt_comment')
-                    if plan.report_message_group_id:
-                        self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
-                            body=body_html,
-                            context=context,
-                            subtype='mail.mt_comment')
         return True
-
-
-    def get_current_related_goals(self, cr, uid, plan_id, user_id, context=None):
-        """Get the ids of goals linked to a plan for the current instance
-
-        If several goals are linked to the same planline and user, only the
-        latest instance of the plan is checked (eg: if the plan is monthly,
-        return the goals started the 1st of this month).
-        """
-
-        plan = self.browse(cr, uid, plan_id, context=context)
-        (start_date, end_date) = start_end_date_for_period(plan.period)
-
-        goal_obj = self.pool.get('gamification.goal')
-        related_goal_ids = []
-
-        for planline in plan.planline_ids:
-            domain = [('planline_id', '=', planline.id),
-                ('user_id', '=', user_id),
-                ('state','in',('inprogress','inprogress_update','reached'))]
-
-            if start_date:
-                domain.append(('start_date', '=', start_date.isoformat()))
-
-            goal_ids = goal_obj.search(cr, uid, domain, context=context)
-            related_goal_ids.extend(goal_ids)
-
-        return related_goal_ids
+        
 
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
@@ -477,4 +532,4 @@ class gamification_goal_planline(osv.Model):
             store={
                 'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
                 }),
-    }
\ No newline at end of file
+    }
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 2c9efc5342f..cf95b6f690f 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -49,7 +49,7 @@
                         <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Reset to Draft" type="object" name="action_cancel" states="inprogress"/>
                         <button string="Reset Completion" type="object" name="action_reset" states="done"/>
-                        <button string="Report Progress" type="object" name="report_progress" states="inprogress,done" groups="base.group_no_one"/>
+                        <button string="Report Progress" type="object" name="action_report_progress" states="inprogress,done" groups="base.group_no_one"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>

From 9e025b95a8384e846d97d779944ba93c55500770 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 4 Mar 2013 16:31:38 +0100
Subject: [PATCH 103/547] [IMP] add autojoin group users for goal plan start

bzr revid: mat@openerp.com-20130304153138-n35mawq0ffbtypj7
---
 addons/gamification/plan.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 881e08fdea5..e015d0865c6 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -182,7 +182,8 @@ class gamification_goal_plan(osv.Model):
         # add users when change the group auto-subscription
         if 'autojoin_group_id' in vals:
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
-            self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
+            if new_group:
+                self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
         return write_res
 
 
@@ -235,6 +236,11 @@ class gamification_goal_plan(osv.Model):
         """Start a draft goal plan
 
         Change the state of the plan to in progress"""
+        # subscribe users if autojoin group
+        for plan in self.browse(cr, uid, ids, context=context):
+            if plan.autojoin_group_id:
+                self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
+
         self.generate_goals_from_plan(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
@@ -488,7 +494,7 @@ class gamification_goal_plan(osv.Model):
                         context=context,
                         subtype='mail.mt_comment')
         return True
-        
+
 
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline

From 102064ee0d7db94c6abd07ff3b3f44b3b732d8d2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 4 Mar 2013 16:33:25 +0100
Subject: [PATCH 104/547] [ADD] data for gamification plan in the sale_crm
 module

bzr revid: mat@openerp.com-20130304153325-nzc6f04groiuqsn8
---
 addons/gamification_sale_crm/__init__.py      |   0
 addons/gamification_sale_crm/__openerp__.py   |  33 +++
 .../gamification_sale_crm/sale_crm_goals.xml  | 224 ++++++++++++++++++
 3 files changed, 257 insertions(+)
 create mode 100644 addons/gamification_sale_crm/__init__.py
 create mode 100644 addons/gamification_sale_crm/__openerp__.py
 create mode 100644 addons/gamification_sale_crm/sale_crm_goals.xml

diff --git a/addons/gamification_sale_crm/__init__.py b/addons/gamification_sale_crm/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/gamification_sale_crm/__openerp__.py b/addons/gamification_sale_crm/__openerp__.py
new file mode 100644
index 00000000000..b8b9444d643
--- /dev/null
+++ b/addons/gamification_sale_crm/__openerp__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'CRM Gamification',
+    'version': '1.0',
+    'author': 'OpenERP SA',
+    'category': 'CRM',
+    'depends': ['gamification','sale_crm'],
+    'description': """Example of goal types and plans that can be used related to the usage of the CRM Sale module.""",
+
+    'data': [
+    	'sale_crm_goals.xml',
+        ],
+    'auto_install': True,
+}
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
new file mode 100644
index 00000000000..3541b658791
--- /dev/null
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- 
+            plan sale
+                invocie of the month
+                delais de fermeture
+                commandes crees ce mois
+                factures payees
+                note de credit
+            plan marketing
+                delais d'ouverture
+                # new leads
+                # new opportunities
+
+
+        invoice of the month
+    
+
+         -->
+
+        <!-- goal types -->
+        <record model="gamification.goal.type" id="type_crm_tot_invoices">
+            <field name="name">Total Invoiced</field>
+            <field name="description"></field>
+            <field name="computation_mode">sum</field>
+            <field name="model_id" eval="str(ref('account.model_account_invoice_report'))" />
+            <field name="field_id" eval="str(ref('account.field_account_invoice_report_price_total'))" />
+            <field name="field_date_id" eval="str(ref('account.field_account_invoice_report_day'))" />
+            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id)]</field>
+        </record> 
+
+        <record model="gamification.goal.type" id="type_crm_lead_delay_open">
+            <field name="name">Delay to Open</field>
+            <field name="description">The average number of days to open the case (less than)</field>
+            <field name="computation_mode">sum</field>
+            <field name="condition">minus</field>
+            <field name="model_id" eval="str(ref('crm.model_crm_lead_report'))" />
+            <field name="field_id" eval="str(ref('crm.field_crm_lead_report_delay_close'))" />
+            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_report_date_closed'))" />
+            <field name="domain">[('user_id','=',user_id)]</field>
+        </record> 
+
+        <record model="gamification.goal.type" id="type_crm_lead_delay_close">
+            <field name="name">Delay to Close</field>
+            <field name="description">The average number of days to close the case (less than)</field>
+            <field name="computation_mode">sum</field>
+            <field name="condition">minus</field>
+            <field name="model_id" eval="str(ref('crm.model_crm_lead_report'))" />
+            <field name="field_id" eval="str(ref('crm.field_crm_lead_report_delay_open'))" />
+            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_report_opening_date'))" />
+            <field name="domain">[('user_id','=',user_id)]</field>
+        </record> 
+
+
+        <record model="gamification.goal.type" id="type_crm_nbr_call">
+            <field name="name"># Logged Calls</field>
+            <field name="description">Log a certain number of calls to reach this goal</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="str(ref('crm.model_crm_phonecall'))" />
+            <field name="field_date_id" eval="str(ref('crm.field_crm_phonecall_date_closed'))" />
+            <field name="domain">[('user_id','=',user_id),('type','='),('state','=','done')]</field>
+        </record> 
+
+        <record model="gamification.goal.type" id="type_crm_nbr_new_leads">
+            <field name="name"># New Leads</field>
+            <field name="description">Based on the creation date</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="str(ref('crm.model_crm_lead'))" />
+            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_create_date'))" />
+            <field name="domain">[('user_id','=',user_id)]</field>
+        </record>
+
+        <record model="gamification.goal.type" id="type_crm_nbr_new_opportunities">
+            <field name="name"># New Opportunities</field>
+            <field name="description">Based on the opening date</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="str(ref('crm.model_crm_lead'))" />
+            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_date_open'))" />
+            <field name="domain">[('user_id','=',user_id),('type','=','opportunity')]</field>
+        </record>
+
+        <record model="gamification.goal.type" id="type_crm_nbr_sale_order_created">
+            <field name="name"># New Sales Orders</field>
+            <field name="description">Based on the creation date</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
+            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_order'))" />
+            <field name="domain">[('user_id','=',user_id),('state','not in',('draft', 'sent', 'cancel'))]</field>
+        </record>
+
+
+        <record model="gamification.goal.type" id="type_crm_nbr_paid_sale_order">
+            <field name="name"># Paid Sales Orders</field>
+            <field name="description">Based on the confirmation date</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
+            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_confirm'))" />
+            <field name="domain">[('user_id','=',user_id),('paid','=',True)]</field>
+        </record>
+
+        <record model="gamification.goal.type" id="type_crm_tot_paid_sale_order">
+            <field name="name">Total Paid Sales Orders</field>
+            <field name="description">Based on the confirmation date</field>
+            <field name="computation_mode">sum</field>
+            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
+            <field name="field_id" eval="str(ref('sale.field_sale_order_amount_total'))" />
+            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_confirm'))" />
+            <field name="domain">[('user_id','=',user_id),('paid','=',True)]</field>
+        </record>
+
+
+        <record model="gamification.goal.type" id="type_crm_nbr_customer_refunds">
+            <field name="name"># Customer Refunds</field>
+            <field name="description"></field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="str(ref('account.model_account_invoice'))" />
+            <field name="field_date_id" eval="str(ref('account.field_account_invoice_date_invoice'))" />
+            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
+        </record>
+
+        <record model="gamification.goal.type" id="type_crm_tot_customer_refunds">
+            <field name="name">Total Customer Refunds</field>
+            <field name="description"></field>
+            <field name="computation_mode">sum</field>
+            <field name="model_id" eval="str(ref('account.model_account_invoice'))" />
+            <field name="field_id" eval="str(ref('account.field_account_invoice_amount_total'))" />
+            <field name="field_date_id" eval="str(ref('account.field_account_invoice_date_invoice'))" />
+            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
+        </record>
+
+
+
+
+        <!-- planlines -->
+        <record model="gamification.goal.planline" id="planline_crm_sale1">
+            <field name="type_id" eval="str(ref('type_crm_tot_invoices'))" />
+            <field name="target_goal">20000</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale2">
+            <field name="type_id" eval="str(ref('type_crm_lead_delay_close'))" />
+            <field name="target_goal">20</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale3">
+            <field name="type_id" eval="str(ref('type_crm_nbr_sale_order_created'))" />
+            <field name="target_goal">5</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale4">
+            <field name="type_id" eval="str(ref('type_crm_nbr_paid_sale_order'))" />
+            <field name="target_goal">5</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale5">
+            <field name="type_id" eval="str(ref('type_crm_nbr_customer_refunds'))" />
+            <field name="target_goal">4</field>
+        </record>
+
+
+
+        <record model="gamification.goal.planline" id="planline_crm_marketing1">
+            <field name="type_id" eval="str(ref('type_crm_lead_delay_open'))" />
+            <field name="target_goal">15</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_marketing2">
+            <field name="type_id" eval="str(ref('type_crm_nbr_new_leads'))" />
+            <field name="target_goal">7</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_marketing3">
+            <field name="type_id" eval="str(ref('type_crm_nbr_new_opportunities'))" />
+            <field name="target_goal">5</field>
+        </record>
+
+
+
+
+        <!-- plans -->
+        <record model="gamification.goal.plan" id="plan_crm_sale">
+            <field name="name">Saleperson</field>
+            <field name="period">monthly</field>
+            <field name="visibility_mode">board</field>
+            <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
+            <field name="report_message_frequency">weekly</field>
+            <field name="report_header">The following message contains the current progress of the sale team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
+            <field name="planline_ids" eval="[(4, ref('planline_crm_sale1')),(4, ref('planline_crm_sale2')),(4, ref('planline_crm_sale3')),(4, ref('planline_crm_sale4')),(4, ref('planline_crm_sale5'))]"/>
+        </record>
+
+        <record model="gamification.goal.plan" id="plan_crm_marketing">
+            <field name="name">Marketing team</field>
+            <field name="period">monthly</field>
+            <field name="visibility_mode">board</field>
+            <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
+            <field name="report_message_frequency">weekly</field>
+            <field name="report_header">The following message contains the current progress of the marketing team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
+            <field name="planline_ids" eval="[(4, ref('planline_crm_marketing1')),(4, ref('planline_crm_marketing2')),(4, ref('planline_crm_marketing3'))]"/>
+        </record>
+
+        <!-- link planline -> plan -->
+        <record model="gamification.goal.planline" id="planline_crm_sale1">
+            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale2">
+            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale3">
+            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale4">
+            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_sale5">
+            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+        </record>
+
+        <record model="gamification.goal.planline" id="planline_crm_marketing1">
+            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_marketing2">
+            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_marketing3">
+            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+        </record>
+    </data>
+</openerp>

From a1fad1665a8a06a2ee95aba9c6dde8a5740cda8c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 4 Mar 2013 17:30:35 +0100
Subject: [PATCH 105/547] [ADD] demo data for gamification_sale_crm

bzr revid: mat@openerp.com-20130304163035-eb18sn25z9qm242o
---
 addons/gamification_sale_crm/__openerp__.py   |   5 +-
 .../gamification_sale_crm/sale_crm_goals.xml  | 106 ++++++++----------
 .../sale_crm_goals_demo.xml                   |  63 +++++++++++
 3 files changed, 109 insertions(+), 65 deletions(-)
 create mode 100644 addons/gamification_sale_crm/sale_crm_goals_demo.xml

diff --git a/addons/gamification_sale_crm/__openerp__.py b/addons/gamification_sale_crm/__openerp__.py
index b8b9444d643..429292e0025 100644
--- a/addons/gamification_sale_crm/__openerp__.py
+++ b/addons/gamification_sale_crm/__openerp__.py
@@ -26,8 +26,7 @@
     'depends': ['gamification','sale_crm'],
     'description': """Example of goal types and plans that can be used related to the usage of the CRM Sale module.""",
 
-    'data': [
-    	'sale_crm_goals.xml',
-        ],
+    'data': ['sale_crm_goals.xml'],
+    'demo': ['sale_crm_goals_demo.xml'],
     'auto_install': True,
 }
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 3541b658791..2269de8f856 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -2,32 +2,14 @@
 <openerp>
     <data>
 
-        <!-- 
-            plan sale
-                invocie of the month
-                delais de fermeture
-                commandes crees ce mois
-                factures payees
-                note de credit
-            plan marketing
-                delais d'ouverture
-                # new leads
-                # new opportunities
-
-
-        invoice of the month
-    
-
-         -->
-
         <!-- goal types -->
         <record model="gamification.goal.type" id="type_crm_tot_invoices">
             <field name="name">Total Invoiced</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
-            <field name="model_id" eval="str(ref('account.model_account_invoice_report'))" />
-            <field name="field_id" eval="str(ref('account.field_account_invoice_report_price_total'))" />
-            <field name="field_date_id" eval="str(ref('account.field_account_invoice_report_day'))" />
+            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id)]</field>
         </record> 
 
@@ -36,9 +18,9 @@
             <field name="description">The average number of days to open the case (less than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">minus</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead_report'))" />
-            <field name="field_id" eval="str(ref('crm.field_crm_lead_report_delay_close'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_report_date_closed'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
+            <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
             <field name="domain">[('user_id','=',user_id)]</field>
         </record> 
 
@@ -47,9 +29,9 @@
             <field name="description">The average number of days to close the case (less than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">minus</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead_report'))" />
-            <field name="field_id" eval="str(ref('crm.field_crm_lead_report_delay_open'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_report_opening_date'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
+            <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_open')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_report_opening_date')" />
             <field name="domain">[('user_id','=',user_id)]</field>
         </record> 
 
@@ -58,8 +40,8 @@
             <field name="name"># Logged Calls</field>
             <field name="description">Log a certain number of calls to reach this goal</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_phonecall'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_phonecall_date_closed'))" />
+            <field name="model_id" eval="ref('crm.model_crm_phonecall')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_phonecall_date_closed')" />
             <field name="domain">[('user_id','=',user_id),('type','='),('state','=','done')]</field>
         </record> 
 
@@ -67,8 +49,8 @@
             <field name="name"># New Leads</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_create_date'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
             <field name="domain">[('user_id','=',user_id)]</field>
         </record>
 
@@ -76,8 +58,8 @@
             <field name="name"># New Opportunities</field>
             <field name="description">Based on the opening date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_date_open'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_date_open')" />
             <field name="domain">[('user_id','=',user_id),('type','=','opportunity')]</field>
         </record>
 
@@ -85,8 +67,8 @@
             <field name="name"># New Sales Orders</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
-            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_order'))" />
+            <field name="model_id" eval="ref('sale.model_sale_order')" />
+            <field name="field_date_id" eval="ref('sale.field_sale_order_date_order')" />
             <field name="domain">[('user_id','=',user_id),('state','not in',('draft', 'sent', 'cancel'))]</field>
         </record>
 
@@ -95,8 +77,8 @@
             <field name="name"># Paid Sales Orders</field>
             <field name="description">Based on the confirmation date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
-            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_confirm'))" />
+            <field name="model_id" eval="ref('sale.model_sale_order')" />
+            <field name="field_date_id" eval="ref('sale.field_sale_order_date_confirm')" />
             <field name="domain">[('user_id','=',user_id),('paid','=',True)]</field>
         </record>
 
@@ -104,10 +86,10 @@
             <field name="name">Total Paid Sales Orders</field>
             <field name="description">Based on the confirmation date</field>
             <field name="computation_mode">sum</field>
-            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
-            <field name="field_id" eval="str(ref('sale.field_sale_order_amount_total'))" />
-            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_confirm'))" />
-            <field name="domain">[('user_id','=',user_id),('paid','=',True)]</field>
+            <field name="model_id" eval="ref('sale.model_sale_order')" />
+            <field name="field_id" eval="ref('sale.field_sale_order_amount_total')" />
+            <field name="field_date_id" eval="ref('sale.field_sale_order_date_confirm')" />
+            <field name="domain">[('user_id','=',user_id),('invoiced','=',True)]</field>
         </record>
 
 
@@ -115,8 +97,8 @@
             <field name="name"># Customer Refunds</field>
             <field name="description"></field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('account.model_account_invoice'))" />
-            <field name="field_date_id" eval="str(ref('account.field_account_invoice_date_invoice'))" />
+            <field name="model_id" eval="ref('account.model_account_invoice')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
         </record>
 
@@ -124,9 +106,9 @@
             <field name="name">Total Customer Refunds</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
-            <field name="model_id" eval="str(ref('account.model_account_invoice'))" />
-            <field name="field_id" eval="str(ref('account.field_account_invoice_amount_total'))" />
-            <field name="field_date_id" eval="str(ref('account.field_account_invoice_date_invoice'))" />
+            <field name="model_id" eval="ref('account.model_account_invoice')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_amount_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
         </record>
 
@@ -135,38 +117,38 @@
 
         <!-- planlines -->
         <record model="gamification.goal.planline" id="planline_crm_sale1">
-            <field name="type_id" eval="str(ref('type_crm_tot_invoices'))" />
+            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
             <field name="target_goal">20000</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale2">
-            <field name="type_id" eval="str(ref('type_crm_lead_delay_close'))" />
+            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
             <field name="target_goal">20</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale3">
-            <field name="type_id" eval="str(ref('type_crm_nbr_sale_order_created'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
             <field name="target_goal">5</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale4">
-            <field name="type_id" eval="str(ref('type_crm_nbr_paid_sale_order'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
             <field name="target_goal">5</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale5">
-            <field name="type_id" eval="str(ref('type_crm_nbr_customer_refunds'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
             <field name="target_goal">4</field>
         </record>
 
 
 
         <record model="gamification.goal.planline" id="planline_crm_marketing1">
-            <field name="type_id" eval="str(ref('type_crm_lead_delay_open'))" />
+            <field name="type_id" eval="ref('type_crm_lead_delay_open')" />
             <field name="target_goal">15</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing2">
-            <field name="type_id" eval="str(ref('type_crm_nbr_new_leads'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_new_leads')" />
             <field name="target_goal">7</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing3">
-            <field name="type_id" eval="str(ref('type_crm_nbr_new_opportunities'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_new_opportunities')" />
             <field name="target_goal">5</field>
         </record>
 
@@ -196,29 +178,29 @@
 
         <!-- link planline -> plan -->
         <record model="gamification.goal.planline" id="planline_crm_sale1">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale2">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale3">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale4">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale5">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
 
         <record model="gamification.goal.planline" id="planline_crm_marketing1">
-            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+            <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing2">
-            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+            <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing3">
-            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+            <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
     </data>
 </openerp>
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
new file mode 100644
index 00000000000..d6382dac773
--- /dev/null
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- plans -->
+        <record model="gamification.goal.plan" id="plan_crm_sale">
+            <field name="user_ids" eval="[(4,ref('base.user_demo'))]" />
+            <field name="state">inprogress</field>
+        </record>
+
+        <!-- goals -->
+        <record model="gamification.goal" id="goal_crm_sale1">
+            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale1')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">2000</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale2">
+            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale2')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">20</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale3">
+            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale3')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">5</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale4">
+            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale4')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">5</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale5">
+            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale5')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">4</field>
+            <field name="state">inprogress</field>
+        </record>
+        
+    </data>
+</openerp>

From bdc00bb9d5c32572c79bd9d4af4cecd3ce0c349c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 5 Mar 2013 10:34:42 +0100
Subject: [PATCH 106/547] [FIX] don't change uid in function call

bzr revid: mat@openerp.com-20130305093442-5617b70exxe767q8
---
 addons/gamification/plan.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index e015d0865c6..6131fc3f827 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -177,8 +177,13 @@ class gamification_goal_plan(osv.Model):
 
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
+        if context is None:
+            context = {}
+        if not ids:
+            return True
+
         write_res = super(gamification_goal_plan, self).write(cr, uid, ids, vals, context=context)
-        
+
         # add users when change the group auto-subscription
         if 'autojoin_group_id' in vals:
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
@@ -376,7 +381,8 @@ class gamification_goal_plan(osv.Model):
             subscription.extend(new_user_ids)
             # remove duplicates
             unified_subscription = list(set(subscription))
-            self.write(cr, uid, ids, {'user_ids': [(4, uid) for uid in unified_subscription]}, context=context)
+
+            self.write(cr, uid, ids, {'user_ids': [(4, user) for user in unified_subscription]}, context=context)
         return True
 
 

From 97f05fcd9d7956e1cae325203e434bb6f860c22b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 5 Mar 2013 11:44:11 +0100
Subject: [PATCH 107/547] [ADD] kanban view for goals

bzr revid: mat@openerp.com-20130305104411-akwb7r6viq4vv7qi
---
 addons/gamification/__openerp__.py          |  1 +
 addons/gamification/goal_view.xml           | 30 ++++++++++++++++++++-
 addons/gamification/static/src/css/goal.css | 16 +++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 addons/gamification/static/src/css/goal.css

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index aa205457a4f..cfff5ec0c53 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -33,4 +33,5 @@
         ],
     'installable': True,
     'application': True,
+    'css': ['static/src/css/goal.css'],
 }
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index e35ad91df64..dccd0f01b21 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -6,7 +6,7 @@
         <record id="goal_list_action" model="ir.actions.act_window">
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
-            <field name="view_mode">tree,form,calendar</field>
+            <field name="view_mode">tree,form,calendar,kanban</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal. 
@@ -125,6 +125,34 @@
             </field>
         </record>
 
+        <record id="goal_kanban_view" model="ir.ui.view" >
+            <field name="name">Goal Kanban View</field>
+            <field name="model">gamification.goal</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_background_grey">
+                    <field name="type_id"/>
+                    <field name="user_id"/>
+                    <field name="current"/>
+                    <field name="completeness"/>
+                    <field name="state"/>
+                    <field name="target_goal"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_#{record.state.raw_value}">
+                                <div class="oe_kanban_content">
+                                    <h4><field name="type_id"/></h4>
+                                    <div class="oe_kanban_project_list">
+                                        <t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/>
+                                        &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>7
+                </kanban>
+            </field>
+        </record>
+
 
         <!-- Goal types view -->
         
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
new file mode 100644
index 00000000000..621a75e514a
--- /dev/null
+++ b/addons/gamification/static/src/css/goal.css
@@ -0,0 +1,16 @@
+.oe_kanban_goal {
+    width: 200px;
+    min-height: 160px;
+}
+.openerp .oe_kanban_view .oe_kanban_color_reached {
+  background-color: #A1FF81;
+  color: #0B1907;
+}
+.openerp .oe_kanban_view .oe_kanban_color_failed {
+  background-color: #ffc7c7;
+  color: #7a3737;
+}
+.oe_kanban_color_inprogress,.oe_kanban_color_inprogress_update,.oe_kanban_color_draft {
+  background-color: white;
+  color: black;
+}
\ No newline at end of file

From d6f0f1870486ffeead883d55066c296d90198a95 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 5 Mar 2013 14:24:39 +0100
Subject: [PATCH 108/547] [FIX] correct domain for paid sale order

bzr revid: mat@openerp.com-20130305132439-osy5e921w30lt5k1
---
 addons/gamification/goal_view.xml               | 2 +-
 addons/gamification/static/src/css/goal.css     | 2 +-
 addons/gamification_sale_crm/sale_crm_goals.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index dccd0f01b21..3f8983b7a84 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -148,7 +148,7 @@
                                 </div>
                             </div>
                         </t>
-                    </templates>7
+                    </templates>
                 </kanban>
             </field>
         </record>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 621a75e514a..7fd96f3356e 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,5 +1,5 @@
 .oe_kanban_goal {
-    width: 200px;
+    width: 160px;
     min-height: 160px;
 }
 .openerp .oe_kanban_view .oe_kanban_color_reached {
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 2269de8f856..dca5755d358 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -79,7 +79,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('sale.model_sale_order')" />
             <field name="field_date_id" eval="ref('sale.field_sale_order_date_confirm')" />
-            <field name="domain">[('user_id','=',user_id),('paid','=',True)]</field>
+            <field name="domain">[('user_id','=',user_id),('invoiced','=',True)]</field>
         </record>
 
         <record model="gamification.goal.type" id="type_crm_tot_paid_sale_order">

From 13ee12041c1832340bcc4f9271e9bd2057d0c953 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 5 Mar 2013 14:32:36 +0100
Subject: [PATCH 109/547] [ADD] kanban view for goals in employee view

bzr revid: mat@openerp.com-20130305133236-3ys5frjawpchn9ef
---
 addons/gamification/goal_view.xml           |  6 +++++-
 addons/hr_evaluation/hr_evaluation.py       | 12 ++++++++++++
 addons/hr_evaluation/hr_evaluation_view.xml |  5 +++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 3f8983b7a84..ec075b5ffeb 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -142,8 +142,12 @@
                                 <div class="oe_kanban_content">
                                     <h4><field name="type_id"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/>
+                                        <p>
+                                            <t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/>
                                         &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
+                                            <br/>
+                                            <small>End: <field name="end_date" /></small>
+                                        </p>
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index d4ee28aff68..83f5f4a515d 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -103,9 +103,19 @@ hr_evaluation_plan_phase()
 class hr_employee(osv.osv):
     _name = "hr.employee"
     _inherit="hr.employee"
+    
+
+    def _get_employee_goals(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the list of goals assigned to the employee"""
+        res = {}
+        for employee in self.browse(cr, uid, ids, context=context):
+            res[employee.id] = self.pool.get('gamification.goal').search(cr,uid,[('user_id','=',employee.user_id.id)], context=context)
+        return res
+
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
         'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
+        'goal_ids': fields.function(_get_employee_goals, type="one2many", obj='gamification.goal', string="Employee Goals")
     }
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
         now = parser.parse(datetime.now().strftime('%Y-%m-%d'))
@@ -125,6 +135,8 @@ class hr_employee(osv.osv):
             obj_evaluation.button_plan_in_progress(cr, uid, [plan_id], context=context)
         return True
 
+
+
 class hr_evaluation(osv.osv):
     _name = "hr_evaluation.evaluation"
     _inherit = "mail.thread"
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 1e502817436..2f8d664fc98 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -147,6 +147,11 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
             </xpath>
+            <xpath expr="//page[@string='Public Information']" position="after">
+                <page string="Goals">
+                    <field name="goal_ids" widget="many2many_kanban" />
+                </page>
+            </xpath>
             </field>
         </record>
 

From 76fdda3de77bc7bcfccf80dd39a12e5cf3927d04 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 5 Mar 2013 16:36:26 +0100
Subject: [PATCH 110/547] [FIX] one2many_kanban and goals before public
 information

bzr revid: mat@openerp.com-20130305153626-k51a3ycddjvsuyuz
---
 addons/hr_evaluation/hr_evaluation_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2f8d664fc98..65f7679bc7b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -147,9 +147,9 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
             </xpath>
-            <xpath expr="//page[@string='Public Information']" position="after">
+            <xpath expr="//page[@string='Public Information']" position="before">
                 <page string="Goals">
-                    <field name="goal_ids" widget="many2many_kanban" />
+                    <field name="goal_ids" widget="one2many_kanban" />
                 </page>
             </xpath>
             </field>

From c377eda65dc03a58c2001fa486aa690b4cc6ac16 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 5 Mar 2013 16:38:14 +0100
Subject: [PATCH 111/547] [ADD] (un)follow button

bzr revid: mat@openerp.com-20130305153814-guthcma4mofytukg
---
 addons/hr/hr.py       | 12 ++++++++++++
 addons/hr/hr_view.xml | 25 ++++++++++++++++++-------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 467f34f708b..665af732d22 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -264,6 +264,18 @@ class hr_employee(osv.osv):
         image_path = addons.get_module_resource('hr', 'static/src/img', 'default_image.png')
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
+
+    def action_follow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_subscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_subscribe_users(cr, uid, ids, context=context)
+
+    def action_unfollow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_unsubscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_unsubscribe_users(cr, uid, ids, context=context)
+
+
     _defaults = {
         'active': 1,
         'image': _get_default_image,
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 8767da6bd63..a5793e53eb0 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,23 +27,32 @@
                             </h1>
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
+
+                            <label for="job_id" class="oe_edit_only"/><field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                            <label for="work_phone" class="oe_edit_only"/><field name="work_phone"/>
+                            <label for="work_email" class="oe_edit_only"/><field name="work_email" widget="email"/>
+
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
                         </div>
                         <notebook>
+                            <page string="Public Profile">
+                                <div class="oe_chatter">
+                                    <field name="message_follower_ids" widget="mail_followers"/>
+                                    <field name="message_ids" widget="mail_thread"/>
+                                </div>
+                            </page>
                             <page string="Public Information">
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="work_email" widget="email"/>
                                         <field name="work_phone"/>
                                         <field name="mobile_phone"/>
                                         <field name="work_location"/>
                                     </group>
                                     <group string="Position">
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                                        <field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
@@ -84,10 +93,6 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
                 </form>
             </field>
         </record>
@@ -127,14 +132,16 @@
                 </search>
              </field>
          </record>
-        <!-- HR Kanban View  -->
 
+
+    <!-- HR Kanban View  -->
     <record model="ir.ui.view" id="hr_kanban_view_employees">
         <field name="name">HR - Employess Kanban</field>
         <field name="model">hr.employee</field>
         <field name="arch" type="xml">
             <kanban>
                 <field name="last_login"/>
+                <field name="message_is_follower"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -157,6 +164,10 @@
                                     <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
                                     <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
                                 </ul>
+                                <div class="oe_group_button">
+                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_group_join">Unfollow</button>
+                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object">Follow</button>
+                                </div>
                             </div>
                         </div>
                         <script>

From 20b6f83a2b53a2d8e8bf29c728df0529525ac1a2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 10:33:27 +0100
Subject: [PATCH 112/547] [IMP] use kanban view for displaying goals

bzr revid: mat@openerp.com-20130306093327-12cvf7rruk00hvzh
---
 addons/gamification/plan_view.xml           | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index cf95b6f690f..9d0621082ba 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -35,7 +35,7 @@
             <field name="res_model">gamification.goal</field>
             <field name="view_type">form</field>
             <field name="name">Related Goals</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">kanban,tree,form</field>
         </record>
 
         <record id="goal_plan_form_view" model="ir.ui.view">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 65f7679bc7b..e01121c9e8e 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -149,7 +149,7 @@
             </xpath>
             <xpath expr="//page[@string='Public Information']" position="before">
                 <page string="Goals">
-                    <field name="goal_ids" widget="one2many_kanban" />
+                    <field name="goal_ids" widget="many2many_kanban" />
                 </page>
             </xpath>
             </field>

From 5e19f8baad7c2c32a079a293b6db80d73713e3a9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 15:36:31 +0100
Subject: [PATCH 113/547] [IMP] move for employee profile

bzr revid: mat@openerp.com-20130306143631-g8d8hg1xsvkc0xxn
---
 addons/hr/hr_view.xml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a5793e53eb0..a6bf78f2301 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -28,18 +28,19 @@
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
 
-                            <label for="job_id" class="oe_edit_only"/><field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                            <label for="work_phone" class="oe_edit_only"/><field name="work_phone"/>
-                            <label for="work_email" class="oe_edit_only"/><field name="work_email" widget="email"/>
-
+                            <field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                            <field name="work_phone"/>
+                            <field name="work_email" widget="email"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
                         </div>
+                        <div class="oe_right" name="info_box">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                        </div>
                         <notebook>
                             <page string="Public Profile">
                                 <div class="oe_chatter">
-                                    <field name="message_follower_ids" widget="mail_followers"/>
                                     <field name="message_ids" widget="mail_thread"/>
                                 </div>
                             </page>
@@ -47,12 +48,7 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="work_phone"/>
-                                        <field name="mobile_phone"/>
-                                        <field name="work_location"/>
-                                    </group>
-                                    <group string="Position">
-                                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                                        
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
@@ -160,8 +156,6 @@
                                     </li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
-                                    <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
-                                    <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
                                     <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
                                 </ul>
                                 <div class="oe_group_button">

From 4409ab2777a2833699e69776be1907c9abc93e36 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 15:39:00 +0100
Subject: [PATCH 114/547] [IMP] write to followers only if hr installed

bzr revid: mat@openerp.com-20130306143900-ypnqlf13p123ilcr
---
 addons/hr/mail_hr_view.xml       | 23 +++++++++++++++++++++++
 addons/mail/mail_thread_view.xml |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 addons/hr/mail_hr_view.xml

diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
new file mode 100644
index 00000000000..79b753ec62f
--- /dev/null
+++ b/addons/hr/mail_hr_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid,
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('to_read', '=', True),
+                  ('starred', '=', False),
+                ],
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read',
+                'show_compose_message': True
+            }&quot;"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 6769fb0d063..f6ed190e5e5 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -16,7 +16,8 @@
                 ],
                 'view_mailbox': True,
                 'view_inbox': True,
-                'read_action': 'read'
+                'read_action': 'read',
+                'show_compose_message': False
             }&quot;"/>
             <field name="help" type="html">
                 <p>

From fca11bc1f10ade70338dc838a6f62c14d45a26d0 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 15:45:44 +0100
Subject: [PATCH 115/547] [IMP] various changes after review

bzr revid: mat@openerp.com-20130306144544-nxtwzbcx600phczf
---
 addons/gamification/cron.xml                  |  2 +-
 addons/gamification/goal.py                   | 21 +++++----
 addons/gamification/plan.py                   | 43 +++++++++++++------
 addons/gamification/plan_view.xml             |  3 +-
 addons/gamification/static/src/css/goal.css   | 10 +----
 .../gamification_sale_crm/sale_crm_goals.xml  | 13 +++---
 6 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index c025ba3dad7..52726176841 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -9,7 +9,7 @@
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
             <field name="model">gamification.goal.plan</field>
-            <field name="function">_update_all</field>
+            <field name="function">_cron_update</field>
             <field name="args">()</field>
         </record>
     </data>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 60b39c2e5a0..ccf14dce35f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -40,6 +40,7 @@ class gamification_goal_type(osv.Model):
     _columns = {
         'name': fields.char('Type Name', required=True, translate=True),
         'description': fields.text('Description'),
+        'unit': fields.char('Unit', help="The unit of the target and current values", translate=True),
         'computation_mode': fields.selection([
                 ('sum','Sum'),
                 ('count','Count'),
@@ -64,8 +65,8 @@ class gamification_goal_type(osv.Model):
             help="Technical filters rules to apply",
             required=True), # how to apply it ?
         'condition' : fields.selection([
-                ('minus','<='),
-                ('plus','>=')
+                ('lower','<='),
+                ('higher','>=')
             ],
             string='Validation Condition',
             help='A goal is considered as completed when the current value is compared to the value to reach',
@@ -78,7 +79,7 @@ class gamification_goal_type(osv.Model):
     _order = 'sequence'
     _defaults = {
         'sequence': 1,
-        'condition': 'plus',
+        'condition': 'higher',
         'computation_mode':'manually',
         'domain':"[]",
     }
@@ -158,7 +159,6 @@ class gamification_goal(osv.Model):
         'current': 0,
         'state': 'draft',
         'start_date': fields.date.today,
-        'last_update': fields.date.today,
     }
 
 
@@ -172,12 +172,11 @@ class gamification_goal(osv.Model):
         the target value being reached, the goal is set as failed."""
         
         for goal in self.browse(cr, uid, ids, context=context or {}):
-            if goal.state not in ('inprogress','inprogress_update','reached'):
-                # skip if goal draft, failed or canceled
+            if goal.state in ('draft','canceled'):
+                # skip if goal draft or canceled
                 continue
-            if goal.state == 'reached' and goal.end_date and fields.date.today() > goal.end_date:
-                # only a goal reached but not passed the end date will still be 
-                # checked (to be able to improve the score)
+            if goal.last_update and goal.end_date and goal.last_update > goal.end_date:
+                # skip if a goal is finished (updated after the goal end date)
                 continue
 
             if goal.type_id.computation_mode == 'manually':
@@ -220,9 +219,9 @@ class gamification_goal(osv.Model):
                     towrite = {'current': len(res)}
                 
             # check goal target reached
-            if (goal.type_id.condition == 'plus' \
+            if (goal.type_id.condition == 'higher' \
                 and towrite['current'] >= goal.target_goal) \
-            or (goal.type_id.condition == 'minus' \
+            or (goal.type_id.condition == 'lower' \
                 and towrite['current'] <= goal.target_goal):
                 towrite['state'] = 'reached'
 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 6131fc3f827..7a74e686c53 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -112,6 +112,7 @@ class gamification_goal_plan(osv.Model):
             string='Periodicity',
             help='Period of automatic goal assigment. If none is selected, should be launched manually.',
             required=True),
+        'start_date' : fields.date('Starting Date', help="The day a new plan will be automatically started. The start and end dates for goals are still defined by the periodicity (eg: weekly goals run from Monday to Sunday)."),
         'state': fields.selection([
                 ('draft', 'Draft'),
                 ('inprogress', 'In progress'),
@@ -153,7 +154,8 @@ class gamification_goal_plan(osv.Model):
         'state': 'draft',
         'visibility_mode' : 'progressbar',
         'report_message_frequency' : 'onchange',
-        'last_report_date' : fields.date.today
+        'last_report_date' : fields.date.today,
+        'start_date' : fields.date.today,
     }
 
     def _check_nonzero_planline(self, cr, uid, ids, context=None):
@@ -192,14 +194,19 @@ class gamification_goal_plan(osv.Model):
         return write_res
 
 
-    def _update_all(self, cr, uid, context=None, ids=False):
-        """Update the plans and goals
+    def _cron_update(self, cr, uid, context=None, ids=False):
+        """Daily cron check.
 
+        Start planned plans (in draft and with start_date = today)
         Create the goals for planlines not linked to goals (eg: modified the 
             plan to add planlines)
-        :param list(int) ids: the ids of the plans to update, if False will 
-        update only plans in progress."""
-        if not context: context = {}        
+        Update every goal running"""
+        if not context: context = {}
+
+        # start planned plans
+        planned_plan_ids = self.search(cr, uid, [('state', '=', 'draft'),('start_date','=',fields.date.today())])
+        self.action_start(cr, uid, planned_plan_ids, context=context)
+
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')])
 
@@ -208,15 +215,26 @@ class gamification_goal_plan(osv.Model):
         goal_obj = self.pool.get('gamification.goal')
         # we use yesterday to update the goals that just ended
         yesterday = date.today() - timedelta(days=1)
+        # TOCHECK conflict with date rule in goal update() function
         goal_ids = goal_obj.search(cr, uid, [
                 '&',
-                    ('state', 'in', ('inprogress','inprogress_update', 'reached')),
+                    ('state', 'not in', ('draft','canceled')),
                     '|',
                         ('end_date', '>=', yesterday.isoformat()),
                         ('end_date', '=', False)
                 ], context=context)
         goal_obj.update(cr, uid, goal_ids, context=context)
 
+        return self._update_all(cr, uid, ids, context=context)
+
+
+    def _update_all(self, cr, uid, ids, context=None):
+        """Update the plans and related goals
+
+        :param list(int) ids: the ids of the plans to update, if False will 
+        update only plans in progress."""
+        if not context: context = {}
+
         for plan in self.browse(cr, uid, ids, context=context):
             # goals closed but still opened at the last report date
             closed_goals_to_report = []
@@ -246,15 +264,15 @@ class gamification_goal_plan(osv.Model):
             if plan.autojoin_group_id:
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
 
-        self.generate_goals_from_plan(cr, uid, ids, context=context)
-        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+        self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+        return self.generate_goals_from_plan(cr, uid, ids, context=context)
 
     def action_check(self, cr, uid, ids, context=None):
         """Check a goal plan
 
         Create goals that haven't been created yet (eg: if added users of planlines)
         Recompute the current value for each goal related"""
-        return self._update_all(cr, uid, ids=ids, context=context)    
+        return self._update_all(cr, uid, ids=ids, context=context)
 
 
     def action_close(self, cr, uid, ids, context=None):
@@ -324,11 +342,10 @@ class gamification_goal_plan(osv.Model):
 
         for plan in self.browse(cr, uid, ids, context):
             (start_date, end_date) = start_end_date_for_period(plan.period)
-
+            
             for planline in plan.planline_ids:
                 for user in plan.user_ids:
-                    #self.create_goal_from_plan(cr, uid, ids, planline.id, user.id, start_date, context=context)
-
+                    
                     goal_obj = self.pool.get('gamification.goal')
                     domain = [('planline_id', '=', planline.id),
                             ('user_id', '=', user.id)]
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 9d0621082ba..6fe8ce30a34 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -44,7 +44,7 @@
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <header>
-                        <button string="Start Plan" type="object" name="action_start" states="draft" class="oe_highlight"/>
+                        <button string="Manual Start" type="object" name="action_start" states="draft" class="oe_highlight"/>
                         <button string="Check Plan" type="object" name="action_check" states="inprogress"/>
                         <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Reset to Draft" type="object" name="action_cancel" states="inprogress"/>
@@ -67,6 +67,7 @@
 
                         <group>
                             <group colspan="4">
+                                <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="remind_update_delay"/>
                                 
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 7fd96f3356e..14a92450d03 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,16 +1,10 @@
 .oe_kanban_goal {
-    width: 160px;
-    min-height: 160px;
 }
-.openerp .oe_kanban_view .oe_kanban_color_reached {
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached {
   background-color: #A1FF81;
   color: #0B1907;
 }
-.openerp .oe_kanban_view .oe_kanban_color_failed {
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_failed {
   background-color: #ffc7c7;
   color: #7a3737;
 }
-.oe_kanban_color_inprogress,.oe_kanban_color_inprogress_update,.oe_kanban_color_draft {
-  background-color: white;
-  color: black;
-}
\ No newline at end of file
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index dca5755d358..f4b920822ad 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -12,12 +12,13 @@
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id)]</field>
         </record> 
+        <!-- filtre ajout seulement customer -->
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_open">
-            <field name="name">Delay to Open</field>
+            <field name="name">Time to Qualify a Lead</field>
             <field name="description">The average number of days to open the case (less than)</field>
             <field name="computation_mode">sum</field>
-            <field name="condition">minus</field>
+            <field name="condition">lower</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
@@ -25,10 +26,10 @@
         </record> 
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_close">
-            <field name="name">Delay to Close</field>
+            <field name="name">Days to Close a Deal</field>
             <field name="description">The average number of days to close the case (less than)</field>
             <field name="computation_mode">sum</field>
-            <field name="condition">minus</field>
+            <field name="condition">lower</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_open')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_opening_date')" />
@@ -95,8 +96,9 @@
 
         <record model="gamification.goal.type" id="type_crm_nbr_customer_refunds">
             <field name="name"># Customer Refunds</field>
-            <field name="description"></field>
+            <field name="description">Refund the least customers</field>
             <field name="computation_mode">count</field>
+            <field name="condition">lower</field>
             <field name="model_id" eval="ref('account.model_account_invoice')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
@@ -106,6 +108,7 @@
             <field name="name">Total Customer Refunds</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
+            <field name="condition">higher</field>
             <field name="model_id" eval="ref('account.model_account_invoice')" />
             <field name="field_id" eval="ref('account.field_account_invoice_amount_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />

From 21c550cdc499eb6d5114a250c6e9d44faf4803f0 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 16:59:53 +0100
Subject: [PATCH 116/547] [ADD] send messages to followers as employee and not
 res.users

bzr revid: mat@openerp.com-20130306155953-q08xnkjogm80ie7g
---
 addons/hr/__openerp__.py   |  1 +
 addons/hr/hr.py            | 19 +++++++++++++++++++
 addons/hr/mail_hr_view.xml |  3 ++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b4b8e982845..b978a83e658 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -59,6 +59,7 @@ You can manage:
         'hr_installer.xml',
         'hr_data.xml',
         'res_config_view.xml',
+        'mail_hr_view.xml',
     ],
     'demo': ['hr_demo.xml'],
     'test': [
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 665af732d22..d5e7f010bf8 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -276,6 +276,25 @@ class hr_employee(osv.osv):
         return self.message_unsubscribe_users(cr, uid, ids, context=context)
 
 
+    def message_post_user_api(self, cr, uid, thread_id, context=None, **kwargs):
+        """Overwrite the message_post method when using the send to my followers screen
+
+        The context should be extended with sent_from_action_mail_inbox_feeds 
+        and default_res_id contains the id of the user linked to the employee 
+        that will be linked the message (done from the action_mail_inbox_feeds
+        view)"""
+
+        print("message_post_user_api", uid, thread_id, context)
+        if 'sent_from_action_mail_inbox_feeds' in context and 'default_res_id' in context:
+            employee_ids = self.search(cr, uid, [('user_id','=',context['default_res_id'])], context=context)
+            if len(employee_ids) > 0:
+                for employee_id in employee_ids:
+                    res = super(hr_employee, self).message_post_user_api(cr, uid, employee_id, context=context, **kwargs)
+                return res
+
+        # if no overwrite or no linked employee, send message as usual
+        return super(hr_employee, self).message_post_user_api(cr, uid, thread_id, context=context, **kwargs)
+
     _defaults = {
         'active': 1,
         'image': _get_default_image,
diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
index 79b753ec62f..d49b2b0c891 100644
--- a/addons/hr/mail_hr_view.xml
+++ b/addons/hr/mail_hr_view.xml
@@ -4,8 +4,9 @@
 
         <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
             <field name="context">{
-              'default_model': 'res.users', 
+              'default_model': 'hr.employee', 
               'default_res_id': uid,
+              'sent_from_action_mail_inbox_feeds': True,
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [

From e34ce46d114456c90fd61a18bb531a5a7c7d2139 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 17:56:59 +0100
Subject: [PATCH 117/547] [ADD] add goal plan manager

bzr revid: mat@openerp.com-20130306165659-ksi573z3jlk4ijve
---
 addons/gamification/plan.py       | 5 ++++-
 addons/gamification/plan_view.xml | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 7a74e686c53..159fd295614 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -93,7 +93,9 @@ class gamification_goal_plan(osv.Model):
         'name' : fields.char('Plan Name', required=True, translate=True),
         'user_ids' : fields.many2many('res.users',
             string='Users',
-            help="list of users to which the goal will be set"),
+            help="List of users to which the goal will be set"),
+        'manager_id' : fields.many2one('res.users', required=True,
+            string='Manager', help="The user that will be able to access the user goals and modify the plan."),
         'planline_ids' : fields.one2many('gamification.goal.planline',
             'plan_id',
             string='Planline',
@@ -156,6 +158,7 @@ class gamification_goal_plan(osv.Model):
         'report_message_frequency' : 'onchange',
         'last_report_date' : fields.date.today,
         'start_date' : fields.date.today,
+        'manager_id' : lambda s, cr, uid, c: uid,
     }
 
     def _check_nonzero_planline(self, cr, uid, ids, context=None):
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 6fe8ce30a34..84ff98d216b 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -26,7 +26,8 @@
                 <tree string="Goal types" colors="blue:state == 'draft';grey:state == 'done'">
                     <field name="name"/>
                     <field name="period"/>
-                    <field name="state" invisible="1"/>
+                    <field name="manager_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -67,6 +68,7 @@
 
                         <group>
                             <group colspan="4">
+                                <field name="manager_id"/>
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="remind_update_delay"/>

From 15a383a8e5f63a0626f8f747dcbe3f98c7818489 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 18:05:11 +0100
Subject: [PATCH 118/547] [FIX] restore fields for hr form

bzr revid: mat@openerp.com-20130306170511-w0wrwbl3kc8fc3ye
---
 addons/hr/hr_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index a6bf78f2301..27b6f7ff83a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,10 +27,6 @@
                             </h1>
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
-
-                            <field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                            <field name="work_phone"/>
-                            <field name="work_email" widget="email"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
@@ -41,6 +37,7 @@
                         <notebook>
                             <page string="Public Profile">
                                 <div class="oe_chatter">
+                                    <field name="message_follower_ids" widget="mail_followers"/>
                                     <field name="message_ids" widget="mail_thread"/>
                                 </div>
                             </page>
@@ -48,7 +45,12 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        
+                                        <field name="work_phone"/>
+                                        <field name="mobile_phone"/>
+                                        <field name="work_location"/>
+                                    </group>
+                                    <group string="Position">
+                                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>

From 350c327dad962d42bf1ee1da74ff2081e53f367b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 6 Mar 2013 18:21:52 +0100
Subject: [PATCH 119/547] [FIX] restore work_emailfields for hr form

bzr revid: mat@openerp.com-20130306172152-0xqpdbsekmx7g9fv
---
 addons/hr/hr_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 27b6f7ff83a..109bbd0cf92 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -45,6 +45,7 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                        <field name="work_email" widget="email"/>
                                         <field name="work_phone"/>
                                         <field name="mobile_phone"/>
                                         <field name="work_location"/>

From d530224b742145b723091848cdd0634c20c73970 Mon Sep 17 00:00:00 2001
From: Jagdish Panchal <jap@tinyerp.com>
Date: Thu, 7 Mar 2013 11:20:56 +0530
Subject: [PATCH 120/547] [IMP] hr_recruitment: add new menu Resumes and
 Letters below application

bzr revid: jap@tinyerp.com-20130307055056-feyvz7sw7t63zin1
---
 addons/hr_recruitment/hr_recruitment_menu.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index dbd4335d730..558816a74a0 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -65,6 +65,11 @@
             name="Applications"
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
+            
+        <menuitem
+            name="Resumes and Letters"
+            parent="base.menu_crm_case_job_req_main"
+            id="menu_crm_case_categ0_act_job02" action="crm_case_categ0_act_job" sequence="3"/>            
     
         <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
 

From b400a08d08f8b85e370a7f695e1dda50382778fd Mon Sep 17 00:00:00 2001
From: Jagdish Panchal <jap@tinyerp.com>
Date: Thu, 7 Mar 2013 12:52:23 +0530
Subject: [PATCH 121/547] [IMP] hr_recruitment: Add teplate for refuse and
 approve application

bzr revid: jap@tinyerp.com-20130307072223-lwly1t29zirv9wmf
---
 addons/hr_recruitment/hr_recruitment_data.xml | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index a0b16f042bc..5b7b0cd008b 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -216,6 +216,45 @@
         <field eval="0" name="allow_comment"/>
     </record>
 
+	<!-- Templates DATA for  refuse and approve -->
+		 
+    <record id="email_template_refuse_applicant" model="email.template">
+        <field name="name">For Refuse Application</field>
+        <field name="email_from">${object.user.email or ''}</field>
+        <field name="subject">We refuse your Application</field>
+        <field name="email_to">${object.email_from}</field>
+        <field name="lang">${object.lang}</field>
+        <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
+        <field eval="0" name="user_signature"/>
+        <field name="body_html"><![CDATA[<p>Dear Madam, Dear Sir,</p>
+        <p>We thank you for your interest in our company and for your application.
+        Unfortunately, your profile does not match with our needs or our recruitment campaign has reached its term.</p>
+        <p>If you want more details, feel free to contact us by phone.</p>
+        <p>Kind regards,</p>
+        <br/>
+         ${object.user_id.name}
+        <br/>]]></field>
+    </record>
+
+    <record id="email_template_approve_applicant" model="email.template">
+        <field name="name">Intrested in Applicastion</field>
+        <field name="email_from">${object.user.email or ''}</field>
+        <field name="email_to">{object.email_from}</field>
+        <field name="subject">We Intrested in your Application</field>
+        <field name="lang">${object.lang}</field>
+        <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
+        <field eval="0" name="user_signature"/>
+        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
+        <p>Congrats! Your resume's got our interest!
+        I will call you as soon as possible to make a 10 minutes phone interview and  plan a first meeting.</p>
+        <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030
+        If I do not answer, please let me a message with some schedules to call you back.</p>
+        <p>Kind regards,</p>
+        <br/>
+         ${object.user_id.name}
+        <br/>]]></field>
+    </record>
+            
     <record id="survey_answer_job_70" model="survey.answer">
         <field name="in_visible_answer_type">1</field>
         <field name="answer">Male</field>

From c87b99dd5c8048224ca1c4db8c19e1d7f4439a4c Mon Sep 17 00:00:00 2001
From: Jagdish Panchal <jap@tinyerp.com>
Date: Thu, 7 Mar 2013 14:11:09 +0530
Subject: [PATCH 122/547] [IMP] hr_recruitment: Improve tool tip for
 application menu

bzr revid: jap@tinyerp.com-20130307084109-xca1qw9mwwulh7eu
---
 addons/hr_recruitment/hr_recruitment_menu.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 558816a74a0..e86dbce6893 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -13,14 +13,12 @@
               <p class="oe_view_nocontent_create">
                 Click to add a new job applicant.
               </p><p>
-                OpenERP helps you track applicants in the recruitment
-                process and follow up all operations: meetings, interviews, etc.
-              </p><p>
-                If you setup the email gateway, applicants and their attached
-                CV are created automatically when an email is sent to
-                jobs@yourcompany.com. If you install the document management
-                modules, all resumes are indexed automatically, so that you can
-                easily search through their content.
+                OpenERP helps you track applicants in the recruitment process 
+                and follow up all operations: meetings, interviews, etc. 
+                Candidates and their cv's are automatically created when they 
+                apply for a job. If you install the document management modules, 
+                all resumes are indexed automatically, so that you can easily 
+                search through their content in the recruitment menu.   
               </p>
             </field>
         </record>

From 2f55e6dd064e7bf2c369bb64998e373fbb9a8c74 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Mar 2013 10:12:01 +0100
Subject: [PATCH 123/547] [FIX] correct goals import and plan update

bzr revid: mat@openerp.com-20130307091201-h623irkxr4b3i7ry
---
 addons/gamification/plan.py                   |  5 +-
 .../gamification_sale_crm/sale_crm_goals.xml  | 48 +++++++++----------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 159fd295614..c49f2775372 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -213,8 +213,6 @@ class gamification_goal_plan(osv.Model):
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')])
 
-        self.generate_goals_from_plan(cr, uid, ids, context=context)
-        
         goal_obj = self.pool.get('gamification.goal')
         # we use yesterday to update the goals that just ended
         yesterday = date.today() - timedelta(days=1)
@@ -237,6 +235,9 @@ class gamification_goal_plan(osv.Model):
         :param list(int) ids: the ids of the plans to update, if False will 
         update only plans in progress."""
         if not context: context = {}
+        goal_obj = self.pool.get('gamification.goal')
+
+        self.generate_goals_from_plan(cr, uid, ids, context=context)
 
         for plan in self.browse(cr, uid, ids, context=context):
             # goals closed but still opened at the last report date
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index f4b920822ad..3308b860e8d 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -10,13 +10,12 @@
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
-            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id)]</field>
-        </record> 
-        <!-- filtre ajout seulement customer -->
+            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_invoice')]</field>
+        </record>
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_open">
             <field name="name">Time to Qualify a Lead</field>
-            <field name="description">The average number of days to open the case (less than)</field>
+            <field name="description">The average number of days to open the case (lower than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
@@ -27,7 +26,7 @@
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_close">
             <field name="name">Days to Close a Deal</field>
-            <field name="description">The average number of days to close the case (less than)</field>
+            <field name="description">The average number of days to close the case (lower than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
@@ -73,45 +72,42 @@
             <field name="domain">[('user_id','=',user_id),('state','not in',('draft', 'sent', 'cancel'))]</field>
         </record>
 
-
         <record model="gamification.goal.type" id="type_crm_nbr_paid_sale_order">
             <field name="name"># Paid Sales Orders</field>
-            <field name="description">Based on the confirmation date</field>
+            <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="ref('sale.model_sale_order')" />
-            <field name="field_date_id" eval="ref('sale.field_sale_order_date_confirm')" />
-            <field name="domain">[('user_id','=',user_id),('invoiced','=',True)]</field>
+            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
+            <field name="domain">[('state','=','paid'),('user_id','=',user_id),('type','=','out_invoice')]</field>
         </record>
-
         <record model="gamification.goal.type" id="type_crm_tot_paid_sale_order">
             <field name="name">Total Paid Sales Orders</field>
-            <field name="description">Based on the confirmation date</field>
-            <field name="computation_mode">sum</field>
-            <field name="model_id" eval="ref('sale.model_sale_order')" />
-            <field name="field_id" eval="ref('sale.field_sale_order_amount_total')" />
-            <field name="field_date_id" eval="ref('sale.field_sale_order_date_confirm')" />
-            <field name="domain">[('user_id','=',user_id),('invoiced','=',True)]</field>
+            <field name="description">Based on the invoice date</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
+            <field name="domain">[('state','=','paid'),('user_id','=',user_id),('type','=','out_invoice')]</field>
         </record>
 
 
         <record model="gamification.goal.type" id="type_crm_nbr_customer_refunds">
             <field name="name"># Customer Refunds</field>
-            <field name="description">Refund the least customers</field>
+            <field name="description">Refund the least customers (lower than)</field>
             <field name="computation_mode">count</field>
             <field name="condition">lower</field>
-            <field name="model_id" eval="ref('account.model_account_invoice')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />
+            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
         </record>
-
         <record model="gamification.goal.type" id="type_crm_tot_customer_refunds">
             <field name="name">Total Customer Refunds</field>
-            <field name="description"></field>
+            <field name="description">The total refunded value is a negative value. Validated when higher (min refunded).</field>
             <field name="computation_mode">sum</field>
             <field name="condition">higher</field>
-            <field name="model_id" eval="ref('account.model_account_invoice')" />
-            <field name="field_id" eval="ref('account.field_account_invoice_amount_total')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />
+            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
         </record>
 
@@ -160,7 +156,7 @@
 
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_crm_sale">
-            <field name="name">Saleperson</field>
+            <field name="name">Salesperson</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">board</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />

From b9507e503f29a66ecde6ae2d9430b740e3df5d0c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Mar 2013 10:54:53 +0100
Subject: [PATCH 124/547] [IMP] gamification: add unit and description in
 kanban

bzr revid: mat@openerp.com-20130307095453-ttfyk3rfkm763ut9
---
 addons/gamification/goal.py                     |  8 +++++++-
 addons/gamification/goal_view.xml               |  4 ++++
 addons/gamification_sale_crm/sale_crm_goals.xml | 11 +++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index ccf14dce35f..beceb3470f8 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -152,7 +152,13 @@ class gamification_goal(osv.Model):
         'remind_update_delay' : fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
         'last_update' : fields.date('Last Update',
-            help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."), #
+            help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
+        'type_description': fields.related('type_id','description',
+            type='char',
+            string='Type Description'),
+        'type_unit': fields.related('type_id','unit',
+            type='char',
+            string='Type Description'),
     }
 
     _defaults = {
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index ec075b5ffeb..c47a2abac2e 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -141,9 +141,13 @@
                             <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_#{record.state.raw_value}">
                                 <div class="oe_kanban_content">
                                     <h4><field name="type_id"/></h4>
+                                    <t t-if="record.type_description.value">
+                                        <em><field name="type_description"/></em>
+                                    </t>
                                     <div class="oe_kanban_project_list">
                                         <p>
                                             <t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/>
+                                            <t t-if="record.type_unit.value"><field name="type_unit"/></t>
                                         &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
                                             <br/>
                                             <small>End: <field name="end_date" /></small>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 3308b860e8d..0c5683f4fca 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -7,6 +7,7 @@
             <field name="name">Total Invoiced</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
+            <field name="unit">€</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
@@ -18,6 +19,7 @@
             <field name="description">The average number of days to open the case (lower than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
+            <field name="unit">days</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
@@ -29,6 +31,7 @@
             <field name="description">The average number of days to close the case (lower than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
+            <field name="unit">days</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_open')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_opening_date')" />
@@ -40,6 +43,7 @@
             <field name="name"># Logged Calls</field>
             <field name="description">Log a certain number of calls to reach this goal</field>
             <field name="computation_mode">count</field>
+            <field name="unit">calls</field>
             <field name="model_id" eval="ref('crm.model_crm_phonecall')" />
             <field name="field_date_id" eval="ref('crm.field_crm_phonecall_date_closed')" />
             <field name="domain">[('user_id','=',user_id),('type','='),('state','=','done')]</field>
@@ -49,6 +53,7 @@
             <field name="name"># New Leads</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
+            <field name="unit">leads</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
             <field name="domain">[('user_id','=',user_id)]</field>
@@ -58,6 +63,7 @@
             <field name="name"># New Opportunities</field>
             <field name="description">Based on the opening date</field>
             <field name="computation_mode">count</field>
+            <field name="unit">opportunities</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_date_open')" />
             <field name="domain">[('user_id','=',user_id),('type','=','opportunity')]</field>
@@ -67,6 +73,7 @@
             <field name="name"># New Sales Orders</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
+            <field name="unit">orders</field>
             <field name="model_id" eval="ref('sale.model_sale_order')" />
             <field name="field_date_id" eval="ref('sale.field_sale_order_date_order')" />
             <field name="domain">[('user_id','=',user_id),('state','not in',('draft', 'sent', 'cancel'))]</field>
@@ -76,6 +83,7 @@
             <field name="name"># Paid Sales Orders</field>
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
+            <field name="unit">orders</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','=','paid'),('user_id','=',user_id),('type','=','out_invoice')]</field>
@@ -84,6 +92,7 @@
             <field name="name">Total Paid Sales Orders</field>
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
+            <field name="unit">€</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
@@ -96,6 +105,7 @@
             <field name="description">Refund the least customers (lower than)</field>
             <field name="computation_mode">count</field>
             <field name="condition">lower</field>
+            <field name="unit">invoices</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
@@ -105,6 +115,7 @@
             <field name="description">The total refunded value is a negative value. Validated when higher (min refunded).</field>
             <field name="computation_mode">sum</field>
             <field name="condition">higher</field>
+            <field name="unit">€</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />

From e03393fcc57149ef12f7c385b99e088da3275fad Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Mar 2013 12:15:57 +0100
Subject: [PATCH 125/547] [IMP] sort goals by date

bzr revid: mat@openerp.com-20130307111557-r4lbtzdeicf7joo6
---
 addons/gamification/goal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index beceb3470f8..65f69c12130 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -35,7 +35,6 @@ class gamification_goal_type(osv.Model):
     """
     _name = 'gamification.goal.type'
     _description = 'Gamification goal type'
-    _order = "sequence"
 
     _columns = {
         'name': fields.char('Type Name', required=True, translate=True),
@@ -103,7 +102,7 @@ class gamification_goal(osv.Model):
                 res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
             else:
                 res[goal.id] = 0.0
-            
+
         return res
 
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
@@ -166,6 +165,7 @@ class gamification_goal(osv.Model):
         'state': 'draft',
         'start_date': fields.date.today,
     }
+    _order = 'last_update desc, end_date, type_id'
 
 
     def update(self, cr, uid, ids, context=None):

From d53a53d31587337043f155d1ca7a06f3194523b5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Mar 2013 12:16:14 +0100
Subject: [PATCH 126/547] [IMP] better display and group_by

bzr revid: mat@openerp.com-20130307111614-zfbem9daqxmi0vdx
---
 addons/gamification/goal_view.xml           | 2 +-
 addons/gamification/plan_view.xml           | 2 +-
 addons/gamification/static/src/css/goal.css | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index c47a2abac2e..c9de146d1db 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -146,7 +146,7 @@
                                     </t>
                                     <div class="oe_kanban_project_list">
                                         <p>
-                                            <t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/>
+                                            <big><t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/></big>
                                             <t t-if="record.type_unit.value"><field name="type_unit"/></t>
                                         &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
                                             <br/>
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 84ff98d216b..31cbb7a94c8 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -63,7 +63,7 @@
 
                         <!-- action buttons -->
                         <div class="oe_right oe_button_box">
-                            <button name="action_show_related_goals" type="object" string="Related Goals" help="show all the generated goals for this plan"/>
+                            <button name="action_show_related_goals" type="object" string="Related Goals" help="show all the generated goals for this plan" context="{'group_by':'user_id'}"/>
                         </div>
 
                         <group>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 14a92450d03..849291ca9bc 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -8,3 +8,9 @@
   background-color: #ffc7c7;
   color: #7a3737;
 }
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_draft,
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_canceled {
+  background-color: #E6E6E6;
+  color: #585858;
+  font-size: 0.9em;
+}
\ No newline at end of file

From 1b01215929940646ae27a89325401626f12fae87 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Mar 2013 14:44:47 +0100
Subject: [PATCH 127/547] [IMP] better kanban display

bzr revid: mat@openerp.com-20130307134447-kpsqvqbpc0jdk3y3
---
 addons/gamification/goal.py       | 6 +++++-
 addons/gamification/goal_view.xml | 8 +++++++-
 addons/gamification/plan.py       | 5 ++---
 addons/gamification/plan_view.xml | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 65f69c12130..959f921b741 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -152,12 +152,16 @@ class gamification_goal(osv.Model):
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
         'last_update' : fields.date('Last Update',
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
+        
         'type_description': fields.related('type_id','description',
             type='char',
             string='Type Description'),
-        'type_unit': fields.related('type_id','unit',
+        'type_unit': fields.related('type_id', 'unit',
             type='char',
             string='Type Description'),
+        'type_condition': fields.related('type_id', 'condition',
+            type='char',
+            string='Type Condition'),
     }
 
     _defaults = {
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index c9de146d1db..d3cabd26396 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -136,10 +136,14 @@
                     <field name="completeness"/>
                     <field name="state"/>
                     <field name="target_goal"/>
+                    <field name="type_condition"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_#{record.state.raw_value}">
                                 <div class="oe_kanban_content">
+                                    <div class="oe_kanban_left">
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
+                                    </div>
                                     <h4><field name="type_id"/></h4>
                                     <t t-if="record.type_description.value">
                                         <em><field name="type_description"/></em>
@@ -148,7 +152,9 @@
                                         <p>
                                             <big><t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/></big>
                                             <t t-if="record.type_unit.value"><field name="type_unit"/></t>
-                                        &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
+                                            <t t-if="record.type_condition.raw_value == 'higher'">
+                                                &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
+                                            </t>
                                             <br/>
                                             <small>End: <field name="end_date" /></small>
                                         </p>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index c49f2775372..edba200a75d 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -182,8 +182,7 @@ class gamification_goal_plan(osv.Model):
 
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
-        if context is None:
-            context = {}
+        context = context or {}
         if not ids:
             return True
 
@@ -413,7 +412,7 @@ class gamification_goal_plan(osv.Model):
         :param plan: the plan object that need to be reported
         :param list(res.users) users: the list of users that are concerned by
           the report. If False, will send the report to every user concerned
-          (goal users and group that recieves a copy). Only used for plan with
+          (goal users and group that receive a copy). Only used for plan with
           a visibility mode set to 'personal'.
         :param list(int) goal_ids: the list of goal ids linked to the plan for 
           the report. If not specified, use the goals for the current plan 
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 31cbb7a94c8..2c09f383051 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -100,7 +100,7 @@
                                            Select a group that will receive a copy of the reports.
                                        </p>
                                        <p attrs="{'invisible': [('report_message_group_id','=',False)]}">
-                                           A copy of the report that user recieve will be sent to this group.
+                                           A copy of the report will be sent to this group.
                                        </p>
                                    </group>
                                </div>

From 4e9092aa487cbb01c05680ce1d2e6a691474a4b6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 7 Mar 2013 16:53:58 +0100
Subject: [PATCH 128/547] [FIX] revert change in employee

bzr revid: mat@openerp.com-20130307155358-z2js7sce3p1w0av3
---
 addons/gamification/plan.py |  4 ++--
 addons/hr/hr_view.xml       | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index edba200a75d..379b556df6c 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -242,11 +242,11 @@ class gamification_goal_plan(osv.Model):
             # goals closed but still opened at the last report date
             closed_goals_to_report = []
             for planline in plan.planline_ids:
-                closed_goals_to_report.extend( goal_obj.search(cr, uid, [
+                closed_goals_to_report.extend(goal_obj.search(cr, uid, [
                     ('planline_id','=',planline.id),
                     ('start_date', '>=', plan.last_report_date),
                     ('end_date', '<=', plan.last_report_date)
-                    ]) )
+                    ]))
 
             if len(closed_goals_to_report) > 0:
                 # some goals need a final report
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 109bbd0cf92..b3f8628ccc1 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -31,15 +31,9 @@
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
                         </div>
-                        <div class="oe_right" name="info_box">
-                            <field name="message_follower_ids" widget="mail_followers"/>
-                        </div>
                         <notebook>
                             <page string="Public Profile">
-                                <div class="oe_chatter">
-                                    <field name="message_follower_ids" widget="mail_followers"/>
-                                    <field name="message_ids" widget="mail_thread"/>
-                                </div>
+                                
                             </page>
                             <page string="Public Information">
                                 <group>
@@ -91,6 +85,10 @@
                                 </group>
                             </page>
                         </notebook>
+                        <div class="oe_chatter">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
+                        </div>
                     </sheet>
                 </form>
             </field>

From ae947f52373c7f19f78f0299b5a20e8108433ff4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 8 Mar 2013 10:07:26 +0100
Subject: [PATCH 129/547] [IMP] hr mail sent overwrite from message_post

bzr revid: mat@openerp.com-20130308090726-kbn4avi4uqpp4pu5
---
 addons/hr/hr.py            | 33 ++++++++++++++++++++-------------
 addons/hr/mail_hr_view.xml |  4 ++--
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d5e7f010bf8..a7c084cf18c 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -264,7 +264,6 @@ class hr_employee(osv.osv):
         image_path = addons.get_module_resource('hr', 'static/src/img', 'default_image.png')
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
-
     def action_follow(self, cr, uid, ids, context=None):
         """ Wrapper because message_subscribe_users take a user_ids=None
             that receive the context without the wrapper. """
@@ -275,25 +274,33 @@ class hr_employee(osv.osv):
             that receive the context without the wrapper. """
         return self.message_unsubscribe_users(cr, uid, ids, context=context)
 
+    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
+        """Overwrite the message_post method when using the send to my
+        followers screen
 
-    def message_post_user_api(self, cr, uid, thread_id, context=None, **kwargs):
-        """Overwrite the message_post method when using the send to my followers screen
+        When a message is sent to a hr.employee using the action
+        action_mail_inbox_feeds, the context is extended with res_users_id
+        containing the user id of the user linked to the employee and
+        default_res_id contains 0 (to avoid misused of the function called from
+        the inbox page).
+        In these conditions, the thread_id used to send the message is the id
+        of the employee instead of the res_users (or partner_id).
+        If several employee are linked to the same user_id, the message is
+        duplicated and sent to every user.
 
-        The context should be extended with sent_from_action_mail_inbox_feeds 
-        and default_res_id contains the id of the user linked to the employee 
-        that will be linked the message (done from the action_mail_inbox_feeds
-        view)"""
-
-        print("message_post_user_api", uid, thread_id, context)
-        if 'sent_from_action_mail_inbox_feeds' in context and 'default_res_id' in context:
-            employee_ids = self.search(cr, uid, [('user_id','=',context['default_res_id'])], context=context)
+        :return: the result of message_post from mail_thread, last call if
+        several messages are sent.
+        """
+        
+        if 'res_users_id' in context and context['default_res_id'] == 0:
+            employee_ids = self.search(cr, uid, [('user_id', '=', context['res_users_id'])], context=context)
             if len(employee_ids) > 0:
                 for employee_id in employee_ids:
-                    res = super(hr_employee, self).message_post_user_api(cr, uid, employee_id, context=context, **kwargs)
+                    res = super(hr_employee, self).message_post(cr, uid, employee_id, context=context, **kwargs)
                 return res
 
         # if no overwrite or no linked employee, send message as usual
-        return super(hr_employee, self).message_post_user_api(cr, uid, thread_id, context=context, **kwargs)
+        return super(hr_employee, self).message_post(cr, uid, thread_id, context=context, **kwargs)
 
     _defaults = {
         'active': 1,
diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
index d49b2b0c891..4e02076bd5d 100644
--- a/addons/hr/mail_hr_view.xml
+++ b/addons/hr/mail_hr_view.xml
@@ -5,8 +5,8 @@
         <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
             <field name="context">{
               'default_model': 'hr.employee', 
-              'default_res_id': uid,
-              'sent_from_action_mail_inbox_feeds': True,
+              'default_res_id': 0,
+              'res_users_id': uid,
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [

From f83d65f14d44dce0a9202d6e9b779c1ef49b7926 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 11 Mar 2013 10:39:30 +0100
Subject: [PATCH 130/547] [ADD] add basic badges gamification

bzr revid: mat@openerp.com-20130311093930-8tw9dmkf45mj9x33
---
 addons/gamification/__init__.py               |   1 +
 addons/gamification/__openerp__.py            |   3 +-
 addons/gamification/badge.py                  | 209 ++++++++++++++++++
 addons/gamification/badge_view.xml            |  64 ++++++
 addons/gamification/goal.py                   |   1 +
 addons/gamification/goal_view.xml             |   1 +
 addons/gamification/plan.py                   |  10 +-
 .../templates/badge_received.mako             |  18 ++
 8 files changed, 301 insertions(+), 6 deletions(-)
 create mode 100644 addons/gamification/badge.py
 create mode 100644 addons/gamification/badge_view.xml
 create mode 100644 addons/gamification/templates/badge_received.mako

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index 26ed2972356..b7f7efeac07 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -1,3 +1,4 @@
 import goal
 import plan
 import res_users
+import badge
diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index cfff5ec0c53..9ee7e59624c 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -23,11 +23,12 @@
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'depends': ['mail', 'report_webkit'],
+    'depends': ['mail', 'report_webkit', 'hr'],
     'description': """Gamification of goals""",
 
     'data': [
         'plan_view.xml',
+        'badge_view.xml',
         'goal_view.xml',
         'cron.xml',
         ],
diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
new file mode 100644
index 00000000000..6c8c7bc90b2
--- /dev/null
+++ b/addons/gamification/badge.py
@@ -0,0 +1,209 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+from openerp import tools
+
+from templates import TemplateHelper
+
+
+class gamification_badge_user(osv.Model):
+    """User having received a badge"""
+
+    _name = 'gamification.badge.user'
+    _description = 'Gamification user badge'
+
+    _columns = {
+        'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
+        'user_id': fields.related('employee_id', 'user_id', string="User"),
+        'badge_ids': fields.many2many('gamification.badge', 'rel_badge_users', string='Badge'),  # or many2one ??
+    }
+
+
+class gamification_badge(osv.Model):
+    """Badge object that users can send and receive"""
+
+    _name = 'gamification.badge'
+    _description = 'Gamification badge'
+
+    def _get_image(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = tools.image_get_resized_images(obj.image)
+        return result
+
+    _columns = {
+        'name': fields.char('Badge', required=True, translate=True),
+        'description': fields.text('Description'),
+        'image' : fields.binary("Image",
+            help="This field holds the image used for the badge, limited to 256x256"),
+        # image_select: selection with a on_change to fill image with predefined picts
+        'rule_auth': fields.selection([
+                ('everyone', 'Everyone'),
+                ('list', 'A selected list of users'),
+                ('having', 'People having some badges'),
+                ('computed', 'Nobody, Computed'),
+            ],
+            string="Authorization Rule",
+            help="Who can give this badge",
+            required=True),
+        'rule_auth_user_ids': fields.many2many('res.users', 'rel_badge_auth_users',
+            string='Authorized Users',
+            help="Only these people can give this badge"),
+        'rule_auth_badge_ids': fields.many2many('gamification.badge',
+            'rel_badge_badge', 'badge1_id', 'badge2_id',
+            string='Required Badges',
+            help="Only the people having these badges can give this badge"),
+        'rule_max': fields.boolean('Limited',
+            help="This badge can not be send indefinitely"),
+        'rule_max_number': fields.integer('Limitation Number',
+            help="The maximum number of time this badge can be sent per month."),
+        'goal_type_ids': fields.many2many('gamification.goal.type',
+            string='Goals Linked',
+            help="The users that have succeeded theses goals will receive automatically the badge."),
+        'public': fields.boolean('Public',
+            help="A message will be posted on the user profile or just sent to him"),
+        'owner_ids': fields.many2many('gamification.badge.user', 'rel_badge_users',
+            string='Owners',
+            help='The list of users having receive this badge'),
+        'stat_count': fields.integer('Total Count',
+            help="The number of time this badge has been received."),
+        'stat_count_distinct': fields.integer('Uniaue Count',
+            help="The number of time this badge has been received by individual users."),
+        'stat_this_month': fields.integer('Monthly Count',
+            help="The number of time this badge has been received this month."),
+        # stat_my
+        # stat_my_this_month
+        'compute_code': fields.text('Compute Code',
+            help="The python code that will be executed to verify if a user can receive this badge.")
+    }
+
+    _default = {
+        'stat_count': 0,
+        'stat_count_distinct': 0,
+        'stat_this_month': 0,
+    }
+
+    def send_badge(self, cr, uid, badge_id, user_ids, employee_from=None, context=None):
+        """Send a badge to a user
+
+        The users are added to the owner_ids (create badge_user if needed)
+        The stats counters are incremented
+        :param badge_id: id of the badge to deserve
+        :param user_ids: list(int) of res.users that will receive the badge
+        """
+        bade_user_obj = self.pool.get('gamification.badge.user')
+        res_users_obj = self.pool.get('res.users')
+        badge = self.browse(cr, uid, badge_id, context=context)
+        template_env = TemplateHelper()
+
+        res = None
+        for user_id in user_ids:
+            badge_users = bade_user_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)
+            if len(badge_users) == 0:
+                user = res_users_obj.browse(cr, uid, user_id, context=context)
+                badge_user = bade_user_obj.create(cr, uid,
+                    {'user_id': user_id, 'badge_ids': [(4, badge.id)]}, context=context)
+                badge_users = [badge_user.id]
+
+            values = {
+                'badge': badge,
+                'badgeb64': badge.image.encode('base64'),
+            }
+            if employee_from:
+                values['employee_from'] = employee_from
+            else:
+                values['employee_from'] = False
+            body_html = template_env.get_template('badge_received.mako').render(values)
+            res = self.pool.get('hr.employee').message_post(cr, uid, badge_users[0].employee_id,
+                                                            body=body_html,
+                                                            context=context)
+        return res
+
+    def check_condition(self, cr, uid, badge_id, context=None):
+        """Check if the badge should be deserved to users
+
+        Only badges with the rule_auth == 'computed' can be automatically
+        granted and other type of badge will always return an empty list
+        :return: list of res.users ids that should receive the badge"""
+
+        context = context or {}
+
+        badge = self.browse(cr, uid, badge_id, context=context)
+        if badge.rule_auth != 'computed':
+            return []
+
+        code_obj = compile(badge.compute_code, '<string>', 'exec')
+        code_globals = {}
+        code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
+        exec code_obj in code_globals, code_locals
+        if 'result' in code_locals and type(code_locals['result']) == list:
+            user_badge_ids = self.pool.get('gamification.badge.user').search(
+                cr, uid, [('user_id', 'in', code_locals['result'])], context=context)
+            self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
+
+        return True
+
+    def grant_badge(self, cr, uid, user_from_id, user_to_id, badge_id, context=None):
+        """A user wants to grant a badge to another user
+
+        :param user_from_id: the id of the res.users trying to send the badge
+        :param user_to_id: the id of the res.users that should recieve it
+        :param badge_id: the granted badge id
+        :return: boolean, True if succeeded to send, False otherwise"""
+        context = context or {}
+        badge = self.browse(cr, uid, badge_id, context=context)
+
+        if badge.rule_auth == 'computed':
+            return False
+        elif badge.rule_auth == 'list':
+            if user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
+                return False
+
+        elif badge.rule_auth == 'having':
+            badge_users = self.pool.get('gamification.badge.user').search(
+                cr, uid, [('user_id', '=', user_from_id)], context=context)
+
+            if len(badge_users) == 0:
+                # the user_from has no badges
+                return False
+
+            owners = [owner.id for owner in badge.owner_ids]
+            granted = False
+            for badge_user in badge_users:
+                if badge_user.id in owners:
+                    granted = True
+            if not granted:
+                return False
+
+        # else badge.rule_auth == 'everyone' -> no check
+
+        if badge.rule_max and badge.stat_this_month >= badge.rule_max_number:
+            # sent the maximum number of time this month
+            return False
+
+        user_from = self.pool.get('res.users').browse(cr, uid, user_from_id, context=context)
+        if len(user_from.employee_ids) > 0:
+            self.send_badge(cr, uid, badge_id, [user_to_id], employee_from=user_from.employee_ids[0], context=context)
+        else:
+            self.send_badge(cr, uid, badge_id, [user_to_id], context=context)
+
+        return True
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
new file mode 100644
index 00000000000..0030709736f
--- /dev/null
+++ b/addons/gamification/badge_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <!-- Goal views -->
+        <record id="badge_list_action" model="ir.actions.act_window">
+            <field name="name">Badges</field>
+            <field name="res_model">gamification.badge</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a badge. 
+                </p>
+                <p>
+                    A badge is a symbolic token granted to a user as a sign of reward.
+                    It can be deserved automatically when some conditions are met or manually by users.
+                </p>
+            </field>
+        </record>
+
+        <record id="badge_list_view" model="ir.ui.view">
+            <field name="name">Badge List</field>
+            <field name="model">gamification.badge</field>
+            <field name="arch" type="xml">
+                <tree string="Badge List"> 
+                    <field name="name"/>
+                    <field name="stat_count"/>
+                    <field name="rule_auth"/>
+                </tree>
+            </field>
+        </record>
+		
+		<record id="badge_form_view" model="ir.ui.view">
+            <field name="name">Badge Form</field>
+            <field name="model">gamification.badge</field>
+            <field name="arch" type="xml">
+                <form string="Badge" version="7.0">
+                    <sheet>
+                        <div class="oe_right oe_button_box">
+                            <button string="Send Badge" type="object" name="action_send" class="oe_highlight"/>
+                        </div>
+                        <field name="image" widget='image' class="oe_left oe_avatar"/>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <field name="description" />
+                        <group string="Rules">
+                            <field name="rule_auth"/>
+                            <field name="rule_auth_user_ids"/>
+                            <field name="rule_auth_badge_ids"/>
+                            <field name="rule_max"/>
+                            <field name="rule_max_number"/>
+                            <field name="compute_code"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 959f921b741..04030037796 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -26,6 +26,7 @@ from templates import TemplateHelper
 
 from datetime import date, datetime, timedelta
 
+
 class gamification_goal_type(osv.Model):
     """Goal type definition
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index d3cabd26396..10a81e8b1ed 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -251,6 +251,7 @@
             <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
             <menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
             <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>
+            <menuitem id="gamification_badge_menu" parent="gamification_menu" action="badge_list_action" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 379b556df6c..29516c2501f 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -48,9 +48,9 @@ def start_end_date_for_period(period):
         start_date = today.replace(month=1, day=1)
         end_date = today.replace(month=12, day=31)
     else: # period == 'once':
-        start_date = False # for manual goal, start each time
+        start_date = False  # for manual goal, start each time
         end_date = False
-    
+
     return (start_date, end_date)
 
 
@@ -61,8 +61,8 @@ class gamification_goal_plan(osv.Model):
     quickly apply several goals manually to a group of users
 
     If 'user_ids' is defined and 'period' is different than 'one', the set will
-    be assigned to the users for each period (eg: every 1st of each month if 
-        'monthly' is selected)
+    be assigned to the users for each period (eg: every 1st of each month if
+    'monthly' is selected)
     """
 
     _name = 'gamification.goal.plan'
@@ -84,7 +84,7 @@ class gamification_goal_plan(osv.Model):
                 next = last.replace(day=month_range[1]) + timedelta(days=1)
             elif plan.report_message_frequency == 'yearly':
                 next = last.replace(year=last.year + 1)
-            else: # frequency == 'once':
+            else:  # frequency == 'once':
                 next = False
             res[plan.id] = next.isoformat()
         return res
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
new file mode 100644
index 00000000000..48f1c565dd3
--- /dev/null
+++ b/addons/gamification/templates/badge_received.mako
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <style type="text_css">${css}</style>
+  </head>
+  <body>
+    <p>Congratulation, you have received the badge <strong>${badge.name}</strong> !
+        % if employee_from
+            This badge was granted by <strong>${employee_from.name}</strong>.
+        % endif
+    </p>
+
+	  <p><img src="data:image/png;base64,${badgeb64}" alt="badge ${badge.name}" /></p>
+
+    <p><em>${description}</em></p>
+    
+  </body>
+</html>
\ No newline at end of file

From d8c8475949dc0e5fb575438e21f164e2cef604ba Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 11 Mar 2013 12:04:23 +0100
Subject: [PATCH 131/547] [ADD] function for compute badge counts

bzr revid: mat@openerp.com-20130311110423-d1g44gngitmrxull
---
 addons/gamification/badge.py       | 78 +++++++++++++++++++++++++-----
 addons/gamification/badge_view.xml |  9 ++--
 addons/gamification/goal.py        | 39 +++++++--------
 addons/gamification/res_users.py   |  1 +
 4 files changed, 93 insertions(+), 34 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 6c8c7bc90b2..7c505cbf094 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -23,6 +23,7 @@ from openerp.osv import fields, osv
 from openerp import tools
 
 from templates import TemplateHelper
+from datetime import date
 
 
 class gamification_badge_user(osv.Model):
@@ -34,7 +35,7 @@ class gamification_badge_user(osv.Model):
     _columns = {
         'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
         'user_id': fields.related('employee_id', 'user_id', string="User"),
-        'badge_ids': fields.many2many('gamification.badge', 'rel_badge_users', string='Badge'),  # or many2one ??
+        'badge_id': fields.many2one('gamification.badge', string='Badge'),  # or many2one ??
     }
 
 
@@ -50,15 +51,63 @@ class gamification_badge(osv.Model):
             result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
 
+    def _get_global_count(self, cr, uid, ids, name, args, context=None):
+        """Return the number of time this badge has been granted"""
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
+                cr, uid, [('badge_id', '=', obj.id)], context=context))
+        return result
+
+    def _get_unique_global_count(self, cr, uid, ids, name, args, context=None):
+        """Return the number of time this badge has been granted to individual users"""
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            res = self.pool.get('gamification.badge.user').read_group(
+                                   cr, uid, domain=[('badge_id', '=', obj.id)],
+                                   fields=['badge_id', 'employee_id'],
+                                   groupby=['employee_id'], context=context)
+            result[obj.id] = len(res)
+        return result
+
+    def _get_month_count(self, cr, uid, ids, name, args, context=None):
+        """Return the number of time this badge has been granted this month"""
+        result = dict.fromkeys(ids, False)
+        first_month_day = date.today().replace(day=1).isoformat()
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
+                cr, uid, [('badge_id', '=', obj.id),
+                          ('create_date', '>=', first_month_day)], context=context))
+        return result
+
+    def _get_global_my_count(self, cr, uid, ids, name, args, context=None):
+        """Return the number of time this badge has been granted to the current user"""
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
+                    cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)],
+                    context=context))
+        return result
+
+    def _get_month_my_count(self, cr, uid, ids, name, args, context=None):
+        """Return the number of time this badge has been granted to the current user this month"""
+        result = dict.fromkeys(ids, False)
+        first_month_day = date.today().replace(day=1).isoformat()
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
+                cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)
+                          ('create_date', '>=', first_month_day)], context=context))
+        return result
+
     _columns = {
         'name': fields.char('Badge', required=True, translate=True),
         'description': fields.text('Description'),
-        'image' : fields.binary("Image",
+        'image': fields.binary("Image",
             help="This field holds the image used for the badge, limited to 256x256"),
         # image_select: selection with a on_change to fill image with predefined picts
         'rule_auth': fields.selection([
                 ('everyone', 'Everyone'),
-                ('list', 'A selected list of users'),
+                ('users', 'A selected list of users'),
                 ('having', 'People having some badges'),
                 ('computed', 'Nobody, Computed'),
             ],
@@ -76,24 +125,31 @@ class gamification_badge(osv.Model):
             help="This badge can not be send indefinitely"),
         'rule_max_number': fields.integer('Limitation Number',
             help="The maximum number of time this badge can be sent per month."),
+        'compute_code': fields.text('Compute Code',
+            help="The python code that will be executed to verify if a user can receive this badge."),
         'goal_type_ids': fields.many2many('gamification.goal.type',
             string='Goals Linked',
             help="The users that have succeeded theses goals will receive automatically the badge."),
+
         'public': fields.boolean('Public',
             help="A message will be posted on the user profile or just sent to him"),
         'owner_ids': fields.many2many('gamification.badge.user', 'rel_badge_users',
             string='Owners',
             help='The list of users having receive this badge'),
-        'stat_count': fields.integer('Total Count',
+
+        'stat_count': fields.function(_get_global_count, string='Total',
             help="The number of time this badge has been received."),
-        'stat_count_distinct': fields.integer('Uniaue Count',
-            help="The number of time this badge has been received by individual users."),
-        'stat_this_month': fields.integer('Monthly Count',
+        'stat_count_distinct': fields.function(_get_unique_global_count,
+            string='Unique Count',
+            help="The number of time this badge has been received by individual employees."),
+        'stat_this_month': fields.function(_get_month_count,
+            string='Monthly Count',
             help="The number of time this badge has been received this month."),
-        # stat_my
-        # stat_my_this_month
-        'compute_code': fields.text('Compute Code',
-            help="The python code that will be executed to verify if a user can receive this badge.")
+        'stat_my': fields.function(_get_global_my_count, string='My Total',
+            help="The number of time the current user has received this badge."),
+        'stat_my_this_month': fields.function(_get_month_my_count,
+            string='My Monthly Total',
+            help="The number of time the current user has received this badge this month."),
     }
 
     _default = {
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 0030709736f..3d88dbcd68a 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -25,6 +25,7 @@
                 <tree string="Badge List"> 
                     <field name="name"/>
                     <field name="stat_count"/>
+                    <field name="stat_my"/>
                     <field name="rule_auth"/>
                 </tree>
             </field>
@@ -49,11 +50,11 @@
                         <field name="description" />
                         <group string="Rules">
                             <field name="rule_auth"/>
-                            <field name="rule_auth_user_ids"/>
-                            <field name="rule_auth_badge_ids"/>
+                            <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}"/>
+                            <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}"/>
+                            <field name="compute_code" attrs="{'invisible': [('rule_auth','!=','computed')]}"/>
                             <field name="rule_max"/>
-                            <field name="rule_max_number"/>
-                            <field name="compute_code"/>
+                            <field name="rule_max_number" attrs="{'invisible': [('rule_max','=',False)]}"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 04030037796..50927fa1b47 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -40,11 +40,12 @@ class gamification_goal_type(osv.Model):
     _columns = {
         'name': fields.char('Type Name', required=True, translate=True),
         'description': fields.text('Description'),
-        'unit': fields.char('Unit', help="The unit of the target and current values", translate=True),
+        'unit': fields.char('Unit',
+            help="The unit of the target and current values", translate=True),
         'computation_mode': fields.selection([
-                ('sum','Sum'),
-                ('count','Count'),
-                ('manually','Manually')
+                ('sum', 'Sum'),
+                ('count', 'Count'),
+                ('manually', 'Manually')
             ],
             string="Mode of Computation",
             help="""How is computed the goal value :\n
@@ -54,24 +55,24 @@ class gamification_goal_type(osv.Model):
             required=True),
         'model_id': fields.many2one('ir.model',
             string='Model',
-            help='The model object for the field to evaluate' ),
+            help='The model object for the field to evaluate'),
         'field_id': fields.many2one('ir.model.fields',
             string='Evaluated Field',
-            help='The field containing the value to evaluate' ),
+            help='The field containing the value to evaluate'),
         'field_date_id': fields.many2one('ir.model.fields',
             string='Evaluated Date Field',
             help='The date to use for the time period evaluated'),
         'domain': fields.char("Domain",
             help="Technical filters rules to apply",
             required=True), # how to apply it ?
-        'condition' : fields.selection([
-                ('lower','<='),
-                ('higher','>=')
+        'condition': fields.selection([
+                ('lower', '<='),
+                ('higher', '>=')
             ],
             string='Validation Condition',
             help='A goal is considered as completed when the current value is compared to the value to reach',
             required=True),
-        'sequence' : fields.integer('Sequence',
+        'sequence': fields.integer('Sequence',
             help='Sequence number for ordering',
             required=True),
     }
@@ -144,7 +145,7 @@ class gamification_goal(osv.Model):
             ],
             string='State',
             required=True,
-            track_visibility = 'always'),
+            track_visibility='always'),
 
         'computation_mode': fields.related('type_id','computation_mode',
             type='char', 
@@ -153,7 +154,7 @@ class gamification_goal(osv.Model):
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
         'last_update' : fields.date('Last Update',
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
-        
+
         'type_description': fields.related('type_id','description',
             type='char',
             string='Type Description'),
@@ -207,12 +208,12 @@ class gamification_goal(osv.Model):
                             partner_ids=[goal.user_id.partner_id.id],
                             context=context,
                             subtype='mail.mt_comment')
-                        
-            else: # count or sum
+
+            else:  # count or sum
                 obj = self.pool.get(goal.type_id.model_id.model)
                 field_date_name = goal.type_id.field_date_id.name
-                
-                domain = safe_eval(goal.type_id.domain, 
+
+                domain = safe_eval(goal.type_id.domain,
                     {'user_id': goal.user_id.id})
                 if goal.start_date:
                     domain.append((field_date_name, '>=', goal.start_date))
@@ -224,11 +225,11 @@ class gamification_goal(osv.Model):
                     res = obj.read_group(cr, uid, domain, [field_name],
                         [''], context=context)
                     towrite = {'current': res[0][field_name]}
-                
-                else: # computation mode = count
+
+                else:  # computation mode = count
                     res = obj.search(cr, uid, domain, context=context)
                     towrite = {'current': len(res)}
-                
+
             # check goal target reached
             if (goal.type_id.condition == 'higher' \
                 and towrite['current'] >= goal.target_goal) \
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 38d4950b185..22aaf89ce57 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -1,5 +1,6 @@
 from openerp.osv import osv
 
+
 class res_users_gamification_group(osv.Model):
     """ Update of res.users class
         - if adding groups to an user, check gamification.goal.plan linked to 

From 893c83dcf4de6150f6c3baa438d62bc6f2053f6f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 11 Mar 2013 17:48:29 +0100
Subject: [PATCH 132/547] [IMP] better follow buttons

bzr revid: mat@openerp.com-20130311164829-vd8wuwh1657s0vjt
---
 addons/hr/hr.py                 |  2 +-
 addons/hr/hr_view.xml           | 18 +++++++++++-------
 addons/hr/static/src/css/hr.css |  5 +++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a7c084cf18c..d257c6d5d2e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -291,7 +291,7 @@ class hr_employee(osv.osv):
         :return: the result of message_post from mail_thread, last call if
         several messages are sent.
         """
-        
+
         if 'res_users_id' in context and context['default_res_id'] == 0:
             employee_ids = self.search(cr, uid, [('user_id', '=', context['res_users_id'])], context=context)
             if len(employee_ids) > 0:
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b3f8628ccc1..4ccb4425f2d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -85,11 +85,12 @@
                                 </group>
                             </page>
                         </notebook>
-                        <div class="oe_chatter">
-                            <field name="message_follower_ids" widget="mail_followers"/>
-                            <field name="message_ids" widget="mail_thread"/>
-                        </div>
+                        
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -159,9 +160,12 @@
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
                                     <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
                                 </ul>
-                                <div class="oe_group_button">
-                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_group_join">Unfollow</button>
-                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object">Follow</button>
+                                <div class="oe_followers">
+                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_follower oe_following">
+                                        <span class="oe_unfollow">Unfollow</span>
+                                        <span class="oe_following">Following</span>
+                                    </button>
+                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object" class="oe_follower oe_notfollow">Follow</button>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 16657394736..be21ca7e7a6 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -68,3 +68,8 @@
   margin: 2px 0;
   padding: 0;
 }
+
+.openerp .oe_employee_vignette .oe_followers {
+  width: auto;
+  float: none;
+}
\ No newline at end of file

From 1ddd1bf30097d9e6bfb9aedc4272a57a0424fcfe Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 11 Mar 2013 17:57:16 +0100
Subject: [PATCH 133/547] [ADD] add wizard andremove employee references

bzr revid: mat@openerp.com-20130311165716-o8jc52xiraysu7jb
---
 addons/gamification/__openerp__.py            |   2 +-
 addons/gamification/badge.py                  | 100 +++++++++++-------
 addons/gamification/badge_view.xml            |  32 +++++-
 .../templates/badge_received.mako             |   4 +-
 4 files changed, 96 insertions(+), 42 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 9ee7e59624c..a60b560866a 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'depends': ['mail', 'report_webkit', 'hr'],
+    'depends': ['mail', 'report_webkit','hr'],
     'description': """Gamification of goals""",
 
     'data': [
diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 7c505cbf094..40cc9b2354f 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -33,9 +33,8 @@ class gamification_badge_user(osv.Model):
     _description = 'Gamification user badge'
 
     _columns = {
-        'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
-        'user_id': fields.related('employee_id', 'user_id', string="User"),
-        'badge_id': fields.many2one('gamification.badge', string='Badge'),  # or many2one ??
+        'user_id': fields.many2one('res.users', string="User", required=True),
+        'badge_id': fields.many2one('gamification.badge', string='Badge'),
     }
 
 
@@ -65,8 +64,8 @@ class gamification_badge(osv.Model):
         for obj in self.browse(cr, uid, ids, context=context):
             res = self.pool.get('gamification.badge.user').read_group(
                                    cr, uid, domain=[('badge_id', '=', obj.id)],
-                                   fields=['badge_id', 'employee_id'],
-                                   groupby=['employee_id'], context=context)
+                                   fields=['badge_id', 'user_id'],
+                                   groupby=['user_id'], context=context)
             result[obj.id] = len(res)
         return result
 
@@ -109,7 +108,7 @@ class gamification_badge(osv.Model):
                 ('everyone', 'Everyone'),
                 ('users', 'A selected list of users'),
                 ('having', 'People having some badges'),
-                ('computed', 'Nobody, Computed'),
+                ('computed', 'Nobody'),
             ],
             string="Authorization Rule",
             help="Who can give this badge",
@@ -125,6 +124,16 @@ class gamification_badge(osv.Model):
             help="This badge can not be send indefinitely"),
         'rule_max_number': fields.integer('Limitation Number',
             help="The maximum number of time this badge can be sent per month."),
+        
+        'auto_rule': fields.selection([
+                ('manual', 'Given by User Only'),
+                ('goals', 'List of Goals'),
+                ('python', 'Python Code'),
+            ],
+            string="Authorization Rule",
+            help="Who can give this badge",
+            required=True),
+
         'compute_code': fields.text('Compute Code',
             help="The python code that will be executed to verify if a user can receive this badge."),
         'goal_type_ids': fields.many2many('gamification.goal.type',
@@ -133,15 +142,14 @@ class gamification_badge(osv.Model):
 
         'public': fields.boolean('Public',
             help="A message will be posted on the user profile or just sent to him"),
-        'owner_ids': fields.many2many('gamification.badge.user', 'rel_badge_users',
-            string='Owners',
-            help='The list of users having receive this badge'),
+        'owner_ids': fields.one2many('gamification.badge.user', 'badge_id',
+            string='Owners', help='The list of instances of this badge granted to users'),
 
         'stat_count': fields.function(_get_global_count, string='Total',
             help="The number of time this badge has been received."),
         'stat_count_distinct': fields.function(_get_unique_global_count,
             string='Unique Count',
-            help="The number of time this badge has been received by individual employees."),
+            help="The number of time this badge has been received by individual users."),
         'stat_this_month': fields.function(_get_month_count,
             string='Monthly Count',
             help="The number of time this badge has been received this month."),
@@ -158,38 +166,33 @@ class gamification_badge(osv.Model):
         'stat_this_month': 0,
     }
 
-    def send_badge(self, cr, uid, badge_id, user_ids, employee_from=None, context=None):
-        """Send a badge to a user
+    def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=None, context=None):
+        """Send a notification to a user for receiving a badge
 
+        Does NOT verify constrains on badge granting.
         The users are added to the owner_ids (create badge_user if needed)
         The stats counters are incremented
         :param badge_id: id of the badge to deserve
-        :param user_ids: list(int) of res.users that will receive the badge
+        :param badge_user_ids: list(int) of badge users that will receive the badge
+        :param user_from: res.users object that has sent the badge
         """
-        bade_user_obj = self.pool.get('gamification.badge.user')
-        res_users_obj = self.pool.get('res.users')
         badge = self.browse(cr, uid, badge_id, context=context)
         template_env = TemplateHelper()
 
         res = None
-        for user_id in user_ids:
-            badge_users = bade_user_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)
-            if len(badge_users) == 0:
-                user = res_users_obj.browse(cr, uid, user_id, context=context)
-                badge_user = bade_user_obj.create(cr, uid,
-                    {'user_id': user_id, 'badge_ids': [(4, badge.id)]}, context=context)
-                badge_users = [badge_user.id]
-
+        for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context=context):
             values = {
                 'badge': badge,
                 'badgeb64': badge.image.encode('base64'),
             }
-            if employee_from:
-                values['employee_from'] = employee_from
+
+            if user_from:
+                values['user_from'] = user_from
             else:
-                values['employee_from'] = False
+                values['user_from'] = False
             body_html = template_env.get_template('badge_received.mako').render(values)
-            res = self.pool.get('hr.employee').message_post(cr, uid, badge_users[0].employee_id,
+            # TODO change for classic email
+            res = self.pool.get('res.users').message_post(cr, uid, badge_user.user_id.id,
                                                             body=body_html,
                                                             context=context)
         return res
@@ -218,11 +221,10 @@ class gamification_badge(osv.Model):
 
         return True
 
-    def grant_badge(self, cr, uid, user_from_id, user_to_id, badge_id, context=None):
-        """A user wants to grant a badge to another user
+    def can_grant_badge(self, cr, uid, user_from_id, badge_id, context=None):
+        """Check if a user can grant a badge to another user
 
         :param user_from_id: the id of the res.users trying to send the badge
-        :param user_to_id: the id of the res.users that should recieve it
         :param badge_id: the granted badge id
         :return: boolean, True if succeeded to send, False otherwise"""
         context = context or {}
@@ -256,10 +258,36 @@ class gamification_badge(osv.Model):
             # sent the maximum number of time this month
             return False
 
-        user_from = self.pool.get('res.users').browse(cr, uid, user_from_id, context=context)
-        if len(user_from.employee_ids) > 0:
-            self.send_badge(cr, uid, badge_id, [user_to_id], employee_from=user_from.employee_ids[0], context=context)
-        else:
-            self.send_badge(cr, uid, badge_id, [user_to_id], context=context)
-
         return True
+
+
+class grant_badge_wizard(osv.TransientModel):
+    _name = 'gamification.badge.user.wizard'
+    _columns = {
+        'user_id': fields.many2one("res.users", string='User', required=True),
+        'badge_id': fields.many2one("gamification.badge", string='Badge'),
+    }
+
+    def action_grant_badge(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        badge_obj = self.pool.get('gamification.badge')
+        badge_user_obj = self.pool.get('gamification.badge.user')
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            if badge_obj.can_grant_badge(cr, uid,
+                                         user_from_id=uid,
+                                         badge_id=wiz.badge_id.id,
+                                         context=context):
+
+                badge_user = badge_user_obj.create(cr, uid,
+                        {'user_id': wiz.user_id.id, 'badge_id': wiz.badge_id.id}, context=context)
+                #badge_obj.write(cr, uid, [badge.id], {'owner_ids': [(1, badge_user.id)]}, context=context)
+
+                user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+
+                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
+                
+        return {}
+grant_badge_wizard()
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 3d88dbcd68a..c160c264a0b 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -18,6 +18,32 @@
             </field>
         </record>
 
+
+        <record id="view_badge_wizard_grant" model="ir.ui.view">
+            <field name="name">Grant Badge User Form</field>
+            <field name="model">gamification.badge.user.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Grant Badge To" version="7.0">
+                    Select the user that will receive this badge
+                    <group>
+                        <field name="user_id" />
+                        <field name="badge_id" invisible="1"/>
+                    </group>
+                    <footer>
+                        <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <act_window domain="[]" id="action_grant_wizard"
+            name="Grant Badge"
+            target="new"
+            res_model="gamification.badge.user.wizard"
+            context="{'default_badge_id': active_id, 'badge_id': active_id}"
+            view_type="form" view_mode="form"/>
+
         <record id="badge_list_view" model="ir.ui.view">
             <field name="name">Badge List</field>
             <field name="model">gamification.badge</field>
@@ -38,7 +64,7 @@
                 <form string="Badge" version="7.0">
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button string="Send Badge" type="object" name="action_send" class="oe_highlight"/>
+                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight"/>
                         </div>
                         <field name="image" widget='image' class="oe_left oe_avatar"/>
                         <div class="oe_title">
@@ -50,8 +76,8 @@
                         <field name="description" />
                         <group string="Rules">
                             <field name="rule_auth"/>
-                            <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}"/>
-                            <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}"/>
+                            <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
+                            <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="compute_code" attrs="{'invisible': [('rule_auth','!=','computed')]}"/>
                             <field name="rule_max"/>
                             <field name="rule_max_number" attrs="{'invisible': [('rule_max','=',False)]}"/>
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
index 48f1c565dd3..b745a33a9ca 100644
--- a/addons/gamification/templates/badge_received.mako
+++ b/addons/gamification/templates/badge_received.mako
@@ -5,8 +5,8 @@
   </head>
   <body>
     <p>Congratulation, you have received the badge <strong>${badge.name}</strong> !
-        % if employee_from
-            This badge was granted by <strong>${employee_from.name}</strong>.
+        % if user_from
+            This badge was granted by <strong>${user_from.name}</strong>.
         % endif
     </p>
 

From 3bb68922c2eae723e55ad07bfe25eb438165df62 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 11 Mar 2013 18:32:29 +0100
Subject: [PATCH 134/547] [ADD] automatic checking of goals

bzr revid: mat@openerp.com-20130311173229-xn2g2ce3su1b6au1
---
 addons/gamification/badge.py | 59 +++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 40cc9b2354f..76b20ae2738 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -108,10 +108,10 @@ class gamification_badge(osv.Model):
                 ('everyone', 'Everyone'),
                 ('users', 'A selected list of users'),
                 ('having', 'People having some badges'),
-                ('computed', 'Nobody'),
+                ('nobody', 'Nobody'),
             ],
-            string="Authorization Rule",
-            help="Who can give this badge",
+            string="User Authorization Rule",
+            help="Who can grant this badge",
             required=True),
         'rule_auth_user_ids': fields.many2many('res.users', 'rel_badge_auth_users',
             string='Authorized Users',
@@ -124,14 +124,14 @@ class gamification_badge(osv.Model):
             help="This badge can not be send indefinitely"),
         'rule_max_number': fields.integer('Limitation Number',
             help="The maximum number of time this badge can be sent per month."),
-        
-        'auto_rule': fields.selection([
-                ('manual', 'Given by User Only'),
+
+        'rule_automatic': fields.selection([
+                ('manual', 'Given by Users Only'),
                 ('goals', 'List of Goals'),
                 ('python', 'Python Code'),
             ],
-            string="Authorization Rule",
-            help="Who can give this badge",
+            string="Automatic Rule",
+            help="Can this badge be automatically rewarded",
             required=True),
 
         'compute_code': fields.text('Compute Code',
@@ -164,6 +164,7 @@ class gamification_badge(osv.Model):
         'stat_count': 0,
         'stat_count_distinct': 0,
         'stat_this_month': 0,
+        'rule_automatic': 'manual',
     }
 
     def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=None, context=None):
@@ -205,21 +206,37 @@ class gamification_badge(osv.Model):
         :return: list of res.users ids that should receive the badge"""
 
         context = context or {}
-
         badge = self.browse(cr, uid, badge_id, context=context)
-        if badge.rule_auth != 'computed':
-            return []
 
-        code_obj = compile(badge.compute_code, '<string>', 'exec')
-        code_globals = {}
-        code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
-        exec code_obj in code_globals, code_locals
-        if 'result' in code_locals and type(code_locals['result']) == list:
-            user_badge_ids = self.pool.get('gamification.badge.user').search(
-                cr, uid, [('user_id', 'in', code_locals['result'])], context=context)
-            self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
+        if badge.rule_automatic == 'python':
+            code_obj = compile(badge.compute_code, '<string>', 'exec')
+            code_globals = {}
+            code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
+            exec code_obj in code_globals, code_locals
+            if 'result' in code_locals and type(code_locals['result']) == list:
+                return self.pool.get('gamification.badge.user').search(
+                    cr, uid, [('user_id', 'in', code_locals['result'])], context=context)
+                # self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
 
-        return True
+        elif badge.rule_automatic == 'goals':
+            common_users = None
+            for goal_type in badge.goal_type_ids:
+                res = self.pool.get('gamification.goal').read_group(cr, uid, [
+                    ('type_id', '=', goal_type.id),
+                    ('state', '=', 'reached'),
+                ], ['user_id', 'state', 'type_id'], ['user_id'], context=context)
+                users = [goal.user_id.id for goal in res]
+                if common_users is None:
+                    # first type, include all
+                    common_users = users
+                else:
+                    merged_list = [user_id for user_id in users if user_id in common_users]
+                    common_users = merged_list
+            return common_users
+
+        # else  badge.rule_automatic == 'manual':
+
+        return []
 
     def can_grant_badge(self, cr, uid, user_from_id, badge_id, context=None):
         """Check if a user can grant a badge to another user
@@ -230,7 +247,7 @@ class gamification_badge(osv.Model):
         context = context or {}
         badge = self.browse(cr, uid, badge_id, context=context)
 
-        if badge.rule_auth == 'computed':
+        if badge.rule_auth == 'nobody':
             return False
         elif badge.rule_auth == 'list':
             if user_from_id not in [user.id for user in badge.rule_auth_user_ids]:

From 67aa009dfc0e2bd4d9f3e2d759142f8149501bae Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 09:30:43 +0100
Subject: [PATCH 135/547] [IMP] adapt badge view to new structure of rules

bzr revid: mat@openerp.com-20130312083043-748w2k70rho8xka2
---
 addons/gamification/badge.py       |  3 ++-
 addons/gamification/badge_view.xml | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 76b20ae2738..9d83687e102 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -160,10 +160,11 @@ class gamification_badge(osv.Model):
             help="The number of time the current user has received this badge this month."),
     }
 
-    _default = {
+    _defaults = {
         'stat_count': 0,
         'stat_count_distinct': 0,
         'stat_this_month': 0,
+        'rule_auth': 'everyone',
         'rule_automatic': 'manual',
     }
 
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index c160c264a0b..d45df776d86 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -74,14 +74,18 @@
                             </h1>
                         </div>
                         <field name="description" />
-                        <group string="Rules">
-                            <field name="rule_auth"/>
+                        <group string="User Rules">
+                            <field name="rule_auth" string="Allowed to Grant" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
-                            <field name="compute_code" attrs="{'invisible': [('rule_auth','!=','computed')]}"/>
                             <field name="rule_max"/>
                             <field name="rule_max_number" attrs="{'invisible': [('rule_max','=',False)]}"/>
                         </group>
+                        <group string="Automatic Rules">
+                            <field name="rule_automatic"/>
+                            <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
+                            <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
+                        </group>
                     </sheet>
                 </form>
             </field>

From c7bc1345d45bbe424f227bb25395f1284dda5487 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 11:10:23 +0100
Subject: [PATCH 136/547] [IMP] sendt badge message with usual mail.thread to
 partners

bzr revid: mat@openerp.com-20130312101023-ymrrdchox3jg8vy3
---
 addons/gamification/badge.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 9d83687e102..6f4e062e34a 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -43,6 +43,7 @@ class gamification_badge(osv.Model):
 
     _name = 'gamification.badge'
     _description = 'Gamification badge'
+    _inherit = ['mail.thread']
 
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
@@ -193,10 +194,14 @@ class gamification_badge(osv.Model):
             else:
                 values['user_from'] = False
             body_html = template_env.get_template('badge_received.mako').render(values)
-            # TODO change for classic email
-            res = self.pool.get('res.users').message_post(cr, uid, badge_user.user_id.id,
-                                                            body=body_html,
-                                                            context=context)
+
+            res = self.message_post(cr, uid, 0,
+                                    body=body_html,
+                                    partner_ids=[(4, badge_user.user_id.partner_id.id)],
+                                    type='comment',
+                                    subtype='mt_comment',
+                                    context=context)
+            print(res)
         return res
 
     def check_condition(self, cr, uid, badge_id, context=None):
@@ -250,6 +255,7 @@ class gamification_badge(osv.Model):
 
         if badge.rule_auth == 'nobody':
             return False
+
         elif badge.rule_auth == 'list':
             if user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
                 return False
@@ -306,6 +312,6 @@ class grant_badge_wizard(osv.TransientModel):
                 user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
                 badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
-                
+
         return {}
 grant_badge_wizard()

From 7b26922c30f4e4606024c892b7f5cd618d6325a3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 11:53:26 +0100
Subject: [PATCH 137/547] [ADD] cron checking of badges

bzr revid: mat@openerp.com-20130312105326-ivoexqx0njrfs264
---
 addons/gamification/badge.py | 79 +++++++++++++++++++++---------------
 addons/gamification/cron.xml | 11 +++++
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 6f4e062e34a..2cb7b1ec810 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -204,45 +204,60 @@ class gamification_badge(osv.Model):
             print(res)
         return res
 
-    def check_condition(self, cr, uid, badge_id, context=None):
-        """Check if the badge should be deserved to users
+    def check_automatic(self, cr, uid, context=None, badge_ids=None,):
+        """Check if the badges should be deserved to users
 
-        Only badges with the rule_auth == 'computed' can be automatically
-        granted and other type of badge will always return an empty list
-        :return: list of res.users ids that should receive the badge"""
+        Only badges with an automatic rule specified are checked to be
+        granted, other type of badge will be skipped. Send alert messages to
+        the one validating the condition.
+        :param badge_ids: the list of ids of the badges to check"""
 
         context = context or {}
-        badge = self.browse(cr, uid, badge_id, context=context)
+        if badge_ids is None:
+            badge_ids = self.search(cr, uid, [('rule_automatic', '!=', 'manual')], context=context)
+        badge_user_obj = self.pool.get('gamification.badge.user')
 
-        if badge.rule_automatic == 'python':
-            code_obj = compile(badge.compute_code, '<string>', 'exec')
-            code_globals = {}
-            code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
-            exec code_obj in code_globals, code_locals
-            if 'result' in code_locals and type(code_locals['result']) == list:
-                return self.pool.get('gamification.badge.user').search(
-                    cr, uid, [('user_id', 'in', code_locals['result'])], context=context)
-                # self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
+        for badge in self.browse(cr, uid, badge_ids, context=context):
 
-        elif badge.rule_automatic == 'goals':
-            common_users = None
-            for goal_type in badge.goal_type_ids:
-                res = self.pool.get('gamification.goal').read_group(cr, uid, [
-                    ('type_id', '=', goal_type.id),
-                    ('state', '=', 'reached'),
-                ], ['user_id', 'state', 'type_id'], ['user_id'], context=context)
-                users = [goal.user_id.id for goal in res]
-                if common_users is None:
-                    # first type, include all
-                    common_users = users
-                else:
-                    merged_list = [user_id for user_id in users if user_id in common_users]
-                    common_users = merged_list
-            return common_users
+            if badge.rule_automatic == 'python':
+                code_obj = compile(badge.compute_code, '<string>', 'exec')
+                code_globals = {}
+                code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
+                exec code_obj in code_globals, code_locals
+                if 'result' in code_locals and type(code_locals['result']) == list:
+                    # user_badge_ids = self.pool.get('gamification.badge.user').search(
+                    #     cr, uid, [('user_id', 'in', code_locals['result'])], context=context)
+                    # create badge users for user_id as result of the code
+                    user_badge_ids = [
+                        badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
+                        for user_id in code_locals['result']
+                    ]
+                    self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
 
-        # else  badge.rule_automatic == 'manual':
+            elif badge.rule_automatic == 'goals':
+                common_users = None
+                for goal_type in badge.goal_type_ids:
+                    res = self.pool.get('gamification.goal').read_group(cr, uid, [
+                        ('type_id', '=', goal_type.id),
+                        ('state', '=', 'reached'),
+                    ], ['user_id', 'state', 'type_id'], ['user_id'], context=context)
+                    users = [goal.user_id.id for goal in res]
+                    if common_users is None:
+                        # first type, include all
+                        common_users = users
+                    else:
+                        merged_list = [user_id for user_id in users if user_id in common_users]
+                        common_users = merged_list
+                # create badge users for common users
+                user_badge_ids = [
+                    badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
+                    for user_id in common_users
+                ]
+                self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
 
-        return []
+            # else  badge.rule_automatic == 'manual':
+
+        return True
 
     def can_grant_badge(self, cr, uid, user_from_id, badge_id, context=None):
         """Check if a user can grant a badge to another user
diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index 52726176841..b3a87e2afe2 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -12,5 +12,16 @@
             <field name="function">_cron_update</field>
             <field name="args">()</field>
         </record>
+        <record forcecreate="True" id="ir_cron_check_badge"
+            model="ir.cron">
+            <field name="name">Run Bagde Checker</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall" />
+            <field name="model">gamification.goal.badge</field>
+            <field name="function">check_automatic</field>
+            <field name="args">()</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file

From 710560e71f4d68cda7f65e732cf61c10e647fa7e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 12:38:08 +0100
Subject: [PATCH 138/547] [FIX] cron parameters order and base64 image

bzr revid: mat@openerp.com-20130312113808-zpvagt192c5vu8h7
---
 addons/gamification/badge.py       | 25 ++++++++++++++-----------
 addons/gamification/badge_view.xml |  3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 2cb7b1ec810..cf4da83f79b 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -184,10 +184,9 @@ class gamification_badge(osv.Model):
 
         res = None
         for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context=context):
-            values = {
-                'badge': badge,
-                'badgeb64': badge.image.encode('base64'),
-            }
+            values = {'badge': badge}
+            if badge.image:
+                values['badgeb64'] = badge.image.encode('base64'),
 
             if user_from:
                 values['user_from'] = user_from
@@ -201,23 +200,26 @@ class gamification_badge(osv.Model):
                                     type='comment',
                                     subtype='mt_comment',
                                     context=context)
-            print(res)
+
         return res
 
-    def check_automatic(self, cr, uid, context=None, badge_ids=None,):
+    def _cron_check(self, cr, uid, context):
+        """Run cron on all automatic goals"""
+        ids = self.search(cr, uid, [('rule_automatic', '!=', 'manual')], context=context)
+        self.check_automatic(cr, uid, ids, context=context)
+
+    def check_automatic(self, cr, uid, ids, context=None):
         """Check if the badges should be deserved to users
 
         Only badges with an automatic rule specified are checked to be
         granted, other type of badge will be skipped. Send alert messages to
         the one validating the condition.
-        :param badge_ids: the list of ids of the badges to check"""
+        :param ids: the list of id of the badges to check"""
 
         context = context or {}
-        if badge_ids is None:
-            badge_ids = self.search(cr, uid, [('rule_automatic', '!=', 'manual')], context=context)
         badge_user_obj = self.pool.get('gamification.badge.user')
 
-        for badge in self.browse(cr, uid, badge_ids, context=context):
+        for badge in self.browse(cr, uid, ids, context=context):
 
             if badge.rule_automatic == 'python':
                 code_obj = compile(badge.compute_code, '<string>', 'exec')
@@ -241,7 +243,8 @@ class gamification_badge(osv.Model):
                         ('type_id', '=', goal_type.id),
                         ('state', '=', 'reached'),
                     ], ['user_id', 'state', 'type_id'], ['user_id'], context=context)
-                    users = [goal.user_id.id for goal in res]
+
+                    users = [goal['user_id'][0] for goal in res]
                     if common_users is None:
                         # first type, include all
                         common_users = users
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index d45df776d86..4c583acfb76 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -64,7 +64,8 @@
                 <form string="Badge" version="7.0">
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight"/>
+                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight"  />
+                            <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
                         </div>
                         <field name="image" widget='image' class="oe_left oe_avatar"/>
                         <div class="oe_title">

From 226343cf63a936f017b93ce897c072311ee47b29 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 15:15:31 +0100
Subject: [PATCH 139/547] [REF] user related field goal -> plan

bzr revid: mat@openerp.com-20130312141531-vp1gfrc5xvh5dd8s
---
 addons/gamification/goal.py |  55 ++++++-----
 addons/gamification/plan.py | 176 +++++++++++++++++-------------------
 2 files changed, 114 insertions(+), 117 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 50927fa1b47..5f72c92db79 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -116,20 +116,24 @@ class gamification_goal(osv.Model):
         return ret
 
     _columns = {
-        'type_id' : fields.many2one('gamification.goal.type', 
+        'type_id': fields.many2one('gamification.goal.type', 
             string='Goal Type',
             required=True,
             ondelete="cascade"),
-        'user_id' : fields.many2one('res.users', string='User', required=True),
+        'user_id': fields.many2one('res.users', string='User', required=True),
         'planline_id' : fields.many2one('gamification.goal.planline',
             string='Goal Planline',
             ondelete="cascade"),
-        'start_date' : fields.date('Start Date'),
-        'end_date' : fields.date('End Date'), # no start and end = always active
-        'target_goal' : fields.float('To Reach',
+        'plan_id': fields.related('planline_id', 'plan_id',
+            string="Plan",
+            type='many2one',
+            store=True),
+        'start_date': fields.date('Start Date'),
+        'end_date': fields.date('End Date'), # no start and end = always active
+        'target_goal': fields.float('To Reach',
             required=True,
             track_visibility = 'always'), # no goal = global index
-        'current' : fields.float('Current',
+        'current': fields.float('Current',
             required=True,
             track_visibility = 'always'),
         'completeness': fields.function(_get_completeness,
@@ -150,7 +154,7 @@ class gamification_goal(osv.Model):
         'computation_mode': fields.related('type_id','computation_mode',
             type='char', 
             string="Type computation mode"),
-        'remind_update_delay' : fields.integer('Remind delay',
+        'remind_update_delay': fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
         'last_update' : fields.date('Last Update',
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
@@ -173,7 +177,6 @@ class gamification_goal(osv.Model):
     }
     _order = 'last_update desc, end_date, type_id'
 
-
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
 
@@ -182,9 +185,9 @@ class gamification_goal(osv.Model):
         If a goal reaches the target value, the status is set to reached
         If the end date is passed (at least +1 day, time not considered) without
         the target value being reached, the goal is set as failed."""
-        
+
         for goal in self.browse(cr, uid, ids, context=context or {}):
-            if goal.state in ('draft','canceled'):
+            if goal.state in ('draft', 'canceled'):
                 # skip if goal draft or canceled
                 continue
             if goal.last_update and goal.end_date and goal.last_update > goal.end_date:
@@ -192,11 +195,11 @@ class gamification_goal(osv.Model):
                 continue
 
             if goal.type_id.computation_mode == 'manually':
-                towrite = {'current':goal.current}
+                towrite = {'current': goal.current}
                 # check for remind to update
                 if goal.remind_update_delay and goal.last_update:
                     delta_max = timedelta(days=goal.remind_update_delay)
-                    last_update = datetime.strptime(goal.last_update,'%Y-%m-%d').date()
+                    last_update = datetime.strptime(goal.last_update, '%Y-%m-%d').date()
                     if date.today() - last_update > delta_max and goal.state == 'inprogress':
                         towrite['state'] = 'inprogress_update'
 
@@ -214,7 +217,7 @@ class gamification_goal(osv.Model):
                 field_date_name = goal.type_id.field_date_id.name
 
                 domain = safe_eval(goal.type_id.domain,
-                    {'user_id': goal.user_id.id})
+                                   {'user_id': goal.user_id.id})
                 if goal.start_date:
                     domain.append((field_date_name, '>=', goal.start_date))
                 if goal.end_date:
@@ -223,8 +226,12 @@ class gamification_goal(osv.Model):
                 if goal.type_id.computation_mode == 'sum':
                     field_name = goal.type_id.field_id.name
                     res = obj.read_group(cr, uid, domain, [field_name],
-                        [''], context=context)
-                    towrite = {'current': res[0][field_name]}
+                                         [''], context=context)
+                    if res[0][field_name]:
+                        towrite = {'current': res[0][field_name]}
+                    else:
+                        # avoid false when no result
+                        towrite = {'current': 0}
 
                 else:  # computation mode = count
                     res = obj.search(cr, uid, domain, context=context)
@@ -240,7 +247,7 @@ class gamification_goal(osv.Model):
             # check goal failure
             elif goal.end_date and fields.date.today() > goal.end_date:
                 towrite['state'] = 'failed'
-            
+
             self.write(cr, uid, [goal.id], towrite, context=context)
         return True
 
@@ -268,7 +275,7 @@ class gamification_goal(osv.Model):
         """Reset the completion after setting a goal as reached or failed.
 
         This is only the current state, if the date and/or target criterias
-        match the conditions for a change of state, this will be applied at the 
+        match the conditions for a change of state, this will be applied at the
         next goal update."""
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
@@ -277,22 +284,22 @@ class gamification_goal(osv.Model):
         context = context or {}
         context['just_created'] = True
         return super(gamification_goal, self).create(cr, uid, vals, context=context)
-        
+
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to update the last_update field to today
 
-        If the current value is changed and the report frequency is set to On 
+        If the current value is changed and the report frequency is set to On
         change, q report is generated"""
-        for goal in self.browse(cr, uid, ids, vals):
-            vals['last_update'] = fields.date.today()
+
+        vals['last_update'] = fields.date.today()
+        for goal in self.browse(cr, uid, ids, context=context):
 
             if 'current' in vals:
                 if 'just_created' in context:
                     # new goals should not be reported
                     continue
 
-                if goal.planline_id and goal.planline_id.plan_id.report_message_frequency == 'onchange':
+                if goal.plan_id and goal.plan_id.report_message_frequency == 'onchange':
                     plan_obj = self.pool.get('gamification.goal.plan')
-                    plan_obj.report_progress(cr, uid, goal.planline_id.plan_id, users=[goal.user_id], context=context)
+                    plan_obj.report_progress(cr, uid, goal.plan_id, users=[goal.user_id], context=context)
         return super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
-        
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 29516c2501f..b771e5aed34 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -206,7 +206,9 @@ class gamification_goal_plan(osv.Model):
         if not context: context = {}
 
         # start planned plans
-        planned_plan_ids = self.search(cr, uid, [('state', '=', 'draft'),('start_date','=',fields.date.today())])
+        planned_plan_ids = self.search(cr, uid, [
+            ('state', '=', 'draft'),
+            ('start_date', '=', fields.date.today())])
         self.action_start(cr, uid, planned_plan_ids, context=context)
 
         if not ids:
@@ -217,21 +219,20 @@ class gamification_goal_plan(osv.Model):
         yesterday = date.today() - timedelta(days=1)
         # TOCHECK conflict with date rule in goal update() function
         goal_ids = goal_obj.search(cr, uid, [
-                '&',
-                    ('state', 'not in', ('draft','canceled')),
-                    '|',
-                        ('end_date', '>=', yesterday.isoformat()),
-                        ('end_date', '=', False)
-                ], context=context)
+            '&',
+                ('state', 'not in', ('draft', 'canceled')),
+                '|',
+                    ('end_date', '>=', yesterday.isoformat()),
+                    ('end_date', '=', False)
+        ], context=context)
         goal_obj.update(cr, uid, goal_ids, context=context)
 
         return self._update_all(cr, uid, ids, context=context)
 
-
     def _update_all(self, cr, uid, ids, context=None):
         """Update the plans and related goals
 
-        :param list(int) ids: the ids of the plans to update, if False will 
+        :param list(int) ids: the ids of the plans to update, if False will
         update only plans in progress."""
         if not context: context = {}
         goal_obj = self.pool.get('gamification.goal')
@@ -240,22 +241,20 @@ class gamification_goal_plan(osv.Model):
 
         for plan in self.browse(cr, uid, ids, context=context):
             # goals closed but still opened at the last report date
-            closed_goals_to_report = []
-            for planline in plan.planline_ids:
-                closed_goals_to_report.extend(goal_obj.search(cr, uid, [
-                    ('planline_id','=',planline.id),
-                    ('start_date', '>=', plan.last_report_date),
-                    ('end_date', '<=', plan.last_report_date)
-                    ]))
+            closed_goals_to_report = goal_obj.search(cr, uid, [
+                ('plan_id', '=', plan.id),
+                ('start_date', '>=', plan.last_report_date),
+                ('end_date', '<=', plan.last_report_date)
+            ])
 
             if len(closed_goals_to_report) > 0:
                 # some goals need a final report
                 self.report_progress(cr, uid, plan, subset_goal_ids=closed_goals_to_report, context=context)
-                self.write(cr, uid, plan.id, {'last_report_date':fields.date.today}, context=context)
+                self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
 
             if fields.date.today() == plan.next_report_date:
                 self.report_progress(cr, uid, plan, context=context)
-                self.write(cr, uid, plan.id, {'last_report_date':fields.date.today}, context=context)
+                self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
 
 
     def action_start(self, cr, uid, ids, context=None):
@@ -298,12 +297,8 @@ class gamification_goal_plan(osv.Model):
         Change the state of the plan to draft
         Cancel the related goals"""
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
-        for plan in self.browse(cr, uid, ids, context):
-            for planline in plan.planline_ids:
-                goal_obj = self.pool.get('gamification.goal')
-
-                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
-                goal_obj.write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
+        goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('plan_id', 'in', ids)], context=context)
+        self.pool.get('gamification.goal').write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
 
         return True
 
@@ -314,6 +309,7 @@ class gamification_goal_plan(osv.Model):
         # get ids of related goals 
         goal_obj = self.pool.get('gamification.goal')
         related_goal_ids = []
+        goal_ids = goal_obj.search(cr, uid, [('plan_id', 'in', ids)], context=context)
         for plan in self.browse(cr, uid, ids, context=context):
             for planline in plan.planline_ids:
                 goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
@@ -339,23 +335,22 @@ class gamification_goal_plan(osv.Model):
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the list of goals linked to a plan.
 
-        If goals already exist for this planline, the planline is skipped. This 
+        If goals already exist for this planline, the planline is skipped. This
         can be called after each change in the user or planline list.
         :param list(int) ids: the list of plan concerned"""
 
         for plan in self.browse(cr, uid, ids, context):
             (start_date, end_date) = start_end_date_for_period(plan.period)
-            
+
             for planline in plan.planline_ids:
                 for user in plan.user_ids:
-                    
+
                     goal_obj = self.pool.get('gamification.goal')
-                    domain = [('planline_id', '=', planline.id),
-                            ('user_id', '=', user.id)]
+                    domain = [('planline_id', '=', planline.id), ('user_id', '=', user.id)]
                     if start_date:
                         domain.append(('start_date', '=', start_date))
-                    
-                    # goal existing for this planline ?
+
+                    # goal already existing for this planline ?
                     if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
 
                         # resume canceled goals
@@ -363,18 +358,18 @@ class gamification_goal_plan(osv.Model):
                         canceled_goal_ids = goal_obj.search(cr, uid, domain, context=context)
                         goal_obj.write(cr, uid, canceled_goal_ids, {'state': 'inprogress'}, context=context)
                         goal_obj.update(cr, uid, canceled_goal_ids, context=context)
-                        
+
                         # skip to next user
                         continue
 
                     values = {
-                        'type_id':planline.type_id.id,
-                        'planline_id':planline.id,
-                        'user_id':user.id,
-                        'target_goal':planline.target_goal,
-                        'state':'inprogress',
+                        'type_id': planline.type_id.id,
+                        'planline_id': planline.id,
+                        'user_id': user.id,
+                        'target_goal': planline.target_goal,
+                        'state': 'inprogress',
                     }
-            
+
                     if start_date:
                         values['start_date'] = start_date.isoformat()
                     if end_date:
@@ -384,19 +379,18 @@ class gamification_goal_plan(osv.Model):
                         values['remind_update_delay'] = planline.plan_id.remind_update_delay
 
                     new_goal_id = goal_obj.create(cr, uid, values, context)
-                    
+
                     goal_obj.update(cr, uid, [new_goal_id], context=context)
 
         return True
 
-
     def plan_subscribe_users(self, cr, uid, ids, new_user_ids, context=None):
         """ Add the following users to plans
 
         :param ids: ids of plans to which the users will be added
         :param new_user_ids: ids of the users to add"""
 
-        for plan in self.browse(cr,uid, ids, context):
+        for plan in self.browse(cr, uid, ids, context):
             subscription = [user.id for user in plan.user_ids]
             subscription.extend(new_user_ids)
             # remove duplicates
@@ -405,20 +399,21 @@ class gamification_goal_plan(osv.Model):
             self.write(cr, uid, ids, {'user_ids': [(4, user) for user in unified_subscription]}, context=context)
         return True
 
-
     def report_progress(self, cr, uid, plan, context=None, users=False, subset_goal_ids=False):
         """Post report about the progress of the goals
 
         :param plan: the plan object that need to be reported
-        :param list(res.users) users: the list of users that are concerned by
+        :param users: the list(res.users) of users that are concerned by
           the report. If False, will send the report to every user concerned
           (goal users and group that receive a copy). Only used for plan with
           a visibility mode set to 'personal'.
-        :param list(int) goal_ids: the list of goal ids linked to the plan for 
-          the report. If not specified, use the goals for the current plan 
+        :param goal_ids: the list(int) of goal ids linked to the plan for
+          the report. If not specified, use the goals for the current plan
           period. This parameter can be used to produce report for previous plan
-          periods."""
-        
+          periods.
+        :param subset_goal_ids: a list(int) of goal ids to restrict the report
+        """
+
         context = context or {}
         goal_obj = self.pool.get('gamification.goal')
         template_env = TemplateHelper()
@@ -430,16 +425,16 @@ class gamification_goal_plan(osv.Model):
             planlines_boards = []
 
             for planline in plan.planline_ids:
-                
+
                 domain = [
                     ('planline_id', '=', planline.id),
                     ('state', 'in', ('inprogress', 'inprogress_update',
-                        'reached', 'failed')),
+                                     'reached', 'failed')),
                 ]
-                
+
                 if subset_goal_ids:
                     goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                    common_goal_ids = [goal.id for goal in goal_ids if goal in subset_goal_ids]
+                    common_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
                 else:
                     # if no subset goals, use the dates for restriction
                     if start_date:
@@ -447,7 +442,7 @@ class gamification_goal_plan(osv.Model):
                     if end_date:
                         domain.append(('end_date', '=', end_date.isoformat()))
                     common_goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                
+
                 board_goals = []
                 for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context):
                     board_goals.append({
@@ -459,10 +454,10 @@ class gamification_goal_plan(osv.Model):
 
                 # most complete first, current if same percentage (eg: if several 100%)
                 sorted_board = enumerate(sorted(board_goals, key=lambda k: (k['completeness'], k['current']), reverse=True))
-                planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
+                planlines_boards.append({'goal_type': planline.type_id.name, 'board_goals': sorted_board})
+
+            body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards})
 
-            body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
-            
             self.message_post(cr, uid, plan.id,
                 body=body_html,
                 partner_ids=[(6, 0, [user.partner_id.id for user in plan.user_ids])],
@@ -473,52 +468,48 @@ class gamification_goal_plan(osv.Model):
                     body=body_html,
                     context=context,
                     subtype='mail.mt_comment')
-            
+
         else:
             # generate individual reports
             for user in users or plan.user_ids:
-                related_goal_ids = []
-                for planline in plan.planline_ids:
-                    domain = [
-                        ('planline_id', '=', planline.id),
-                        ('user_id', '=', user.id),
-                        ('state', 'in', ('inprogress', 'inprogress_update',
-                            'reached', 'failed')),
-                    ]
-                    
-                    if subset_goal_ids:
-                        goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                        related_goal_ids.extend( [goal.id for goal in goal_ids if goal in subset_goal_ids] )
-
-                    else:
-                        # if no subset goals, use the dates for restriction
-                        if start_date:
-                            domain.append(('start_date', '=', start_date.isoformat()))
-                        if end_date:
-                            domain.append(('end_date', '=', end_date.isoformat()))
-
-                        related_goal_ids.extend( goal_obj.search(cr, uid, domain, context=context) )
+                domain = [
+                    ('plan_id', '=', plan.id),
+                    ('user_id', '=', user.id),
+                    ('state', 'in', ('inprogress', 'inprogress_update',
+                                     'reached', 'failed')),
+                ]
+                if subset_goal_ids:
+                    # use the domain for safety, don't want irrelevant report if wrong argument
+                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                    related_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
+                else:
+                    # if no subset goals, use the dates for restriction
+                    if start_date:
+                        domain.append(('start_date', '=', start_date.isoformat()))
+                    if end_date:
+                        domain.append(('end_date', '=', end_date.isoformat()))
+                related_goal_ids = goal_obj.search(cr, uid, domain, context=context)
 
                 if len(related_goal_ids) == 0:
                     continue
 
                 variables = {
-                    'object':plan,
-                    'user':user,
-                    'goals':goal_obj.browse(cr, uid, related_goal_ids, context=context)
+                    'object': plan,
+                    'user': user,
+                    'goals': goal_obj.browse(cr, uid, related_goal_ids, context=context)
                 }
                 body_html = template_env.get_template('personal_progress.mako').render(variables)
-                
+
                 self.message_post(cr, uid, plan.id,
-                    body=body_html,
-                    partner_ids=[(6, 0, [user.partner_id.id])],
-                    context=context,
-                    subtype='mail.mt_comment')
+                                  body=body_html,
+                                  partner_ids=[(4, user.partner_id.id)],
+                                  context=context,
+                                  subtype='mail.mt_comment')
                 if plan.report_message_group_id:
                     self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
-                        body=body_html,
-                        context=context,
-                        subtype='mail.mt_comment')
+                                                             body=body_html,
+                                                             context=context,
+                                                             subtype='mail.mt_comment')
         return True
 
 
@@ -534,7 +525,6 @@ class gamification_goal_planline(osv.Model):
     _description = 'Gamification generic goal for plan'
     _order = "sequence_type"
 
-
     def _get_planline_types(self, cr, uid, ids, context=None):
         """Return the ids of planline items related to the gamification.goal.type
         objects in 'ids (used to update the value of 'sequence_type')'"""
@@ -548,16 +538,16 @@ class gamification_goal_planline(osv.Model):
         return result.keys()
 
     _columns = {
-        'plan_id' : fields.many2one('gamification.goal.plan',
+        'plan_id': fields.many2one('gamification.goal.plan',
             string='Plan',
             ondelete="cascade"),
-        'type_id' : fields.many2one('gamification.goal.type',
+        'type_id': fields.many2one('gamification.goal.type',
             string='Goal Type',
             required=True,
             ondelete="cascade"),
-        'target_goal' : fields.float('Target Value to Reach',
+        'target_goal': fields.float('Target Value to Reach',
             required=True),
-        'sequence_type' : fields.related('type_id','sequence',
+        'sequence_type': fields.related('type_id', 'sequence',
             type='integer',
             string='Sequence',
             readonly=True,

From 3c9694de45f83d5be7e9fea06c514f22f5de3659 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 15:34:51 +0100
Subject: [PATCH 140/547] [FIX] relation for related field

bzr revid: mat@openerp.com-20130312143451-41fi98xgw4bmikdq
---
 addons/gamification/goal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 5f72c92db79..b8298707264 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -86,7 +86,6 @@ class gamification_goal_type(osv.Model):
     }
 
 
-
 class gamification_goal(osv.Model):
     """Goal instance for a user
 
@@ -127,6 +126,7 @@ class gamification_goal(osv.Model):
         'plan_id': fields.related('planline_id', 'plan_id',
             string="Plan",
             type='many2one',
+            relation='gamification.goal.plan',
             store=True),
         'start_date': fields.date('Start Date'),
         'end_date': fields.date('End Date'), # no start and end = always active

From 6aa0d91cb8f34fad0418d4f530b3807381fcadda Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 16:27:12 +0100
Subject: [PATCH 141/547] [ADD] hr_gamification: use employee for badges

bzr revid: mat@openerp.com-20130312152712-mfxxs3s3binv8cs0
---
 addons/hr_gamification/__init__.py    |  1 +
 addons/hr_gamification/__openerp__.py | 33 +++++++++++
 addons/hr_gamification/badge.py       | 85 +++++++++++++++++++++++++++
 addons/hr_gamification/badge_view.xml | 24 ++++++++
 4 files changed, 143 insertions(+)
 create mode 100644 addons/hr_gamification/__init__.py
 create mode 100644 addons/hr_gamification/__openerp__.py
 create mode 100644 addons/hr_gamification/badge.py
 create mode 100644 addons/hr_gamification/badge_view.xml

diff --git a/addons/hr_gamification/__init__.py b/addons/hr_gamification/__init__.py
new file mode 100644
index 00000000000..16a4761cb3f
--- /dev/null
+++ b/addons/hr_gamification/__init__.py
@@ -0,0 +1 @@
+import badge
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
new file mode 100644
index 00000000000..7453d1e2d51
--- /dev/null
+++ b/addons/hr_gamification/__openerp__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'HR Gamification',
+    'version': '1.0',
+    'author': 'OpenERP SA',
+    'category': 'HR',
+    'depends': ['gamification', 'hr'],
+    'description': """Use the HR ressources for the gamification process of goals.
+
+This allow the user to send badges to employees instead of simple users.
+Badge received are displayed on the user profile.""",
+    'data': ['badge_view.xml'],
+    'auto_install': True,
+}
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
new file mode 100644
index 00000000000..08a2c5d6238
--- /dev/null
+++ b/addons/hr_gamification/badge.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+
+class gamification_badge_user(osv.Model):
+    """User having received a badge"""
+
+    _name = 'gamification.badge.user'
+    _inherit = ['gamification.badge.user']
+
+    _columns = {
+        'employee_id': fields.many2one("hr.employee", string='Employee'),
+    }
+
+    def _check_employee_related_user(self, cr, uid, ids, context=None):
+        for badge_user in self.browse(cr, uid, ids, context=context):
+            if badge_user.user_id and badge_user.employee_id:
+                if badge_user.employee_id not in badge_user.user_id.employee_ids:
+                    return False
+        return True
+
+    _constraints = [
+        (_check_employee_related_user, "The selected employee does not correspond to the selected user.", ['employee_id']),
+    ]
+
+
+class grant_badge_wizard(osv.TransientModel):
+    _name = 'gamification.badge.user.wizard'
+    _inherit = ['gamification.badge.user.wizard']
+
+    _columns = {
+        'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
+        'user_id': fields.related("employee_id", "user_id",
+                                  type="many2one", relation="res.users",
+                                  store=True, string='User'),
+        'badge_id': fields.many2one("gamification.badge", string='Badge'),
+    }
+
+    def action_grant_badge(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        badge_obj = self.pool.get('gamification.badge')
+        badge_user_obj = self.pool.get('gamification.badge.user')
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            if badge_obj.can_grant_badge(cr, uid,
+                                         user_from_id=uid,
+                                         badge_id=wiz.badge_id.id,
+                                         context=context):
+
+                values = {
+                    'user_id': wiz.user_id.id,
+                    'badge_id': wiz.badge_id.id,
+                    'employee_id': wiz.employee_id.id,
+                }
+                badge_user = badge_user_obj.create(cr, uid, values, context=context)
+                #badge_obj.write(cr, uid, [badge.id], {'owner_ids': [(1, badge_user.id)]}, context=context)
+
+                user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+
+                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
+
+        return {}
+grant_badge_wizard()
\ No newline at end of file
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
new file mode 100644
index 00000000000..7f616850fec
--- /dev/null
+++ b/addons/hr_gamification/badge_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="gamification.view_badge_wizard_grant" model="ir.ui.view">
+            <field name="name">Grant Badge Employee Form</field>
+            <field name="model">gamification.badge.user.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Grant Badge To" version="7.0">
+                    Select the employee that will receive this badge
+                    <group>
+                        <field name="employee_id" />
+                        <field name="badge_id" invisible="1"/>
+                    </group>
+                    <footer>
+                        <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 1cf4d9173040a3d8726c2acea22e1f4e287041d7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 12 Mar 2013 17:15:56 +0100
Subject: [PATCH 142/547] [IMP] overwrite message_post to send mail to employee

bzr revid: mat@openerp.com-20130312161556-cy1w6lxistdwjeys
---
 addons/gamification/badge.py       |  1 +
 addons/gamification/badge_view.xml |  5 ++++-
 addons/hr_gamification/badge.py    | 22 +++++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index cf4da83f79b..9ea8a0b572a 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -193,6 +193,7 @@ class gamification_badge(osv.Model):
             else:
                 values['user_from'] = False
             body_html = template_env.get_template('badge_received.mako').render(values)
+            context['badge_user'] = badge_user
 
             res = self.message_post(cr, uid, 0,
                                     body=body_html,
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 4c583acfb76..9ec13682df1 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -74,7 +74,10 @@
                                 <field name="name"/>
                             </h1>
                         </div>
-                        <field name="description" />
+                        <group>
+                            <field name="description" />
+                            <field name="public" />
+                        </group>
                         <group string="User Rules">
                             <field name="rule_auth" string="Allowed to Grant" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 08a2c5d6238..d1aba7b84f2 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -22,7 +22,7 @@
 from openerp.osv import fields, osv
 
 
-class gamification_badge_user(osv.Model):
+class hr_gamification_badge_user(osv.Model):
     """User having received a badge"""
 
     _name = 'gamification.badge.user'
@@ -44,7 +44,23 @@ class gamification_badge_user(osv.Model):
     ]
 
 
-class grant_badge_wizard(osv.TransientModel):
+class hr_gamification_badge(osv.Model):
+    _name = 'gamification.badge'
+    _inherit = ['gamification.badge', 'mail.thread']
+
+    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
+        """Overwrite the message_post method to send the badge to the employee"""
+        # badge_user included in the send_badge method and 'badge_id' in the wizard view
+        if 'badge_user' in context and 'badge_id' in context:
+            badge = self.browse(cr, uid, context['badge_id'], context=context)
+            badge_user = context['badge_user']
+            if badge.public and badge_user.employee_id:
+                return self.pool.get('hr.employee').message_post(cr, uid,
+                    badge_user.employee_id.id, context=context, **kwargs)
+        return super(hr_gamification_badge, self).message_post(cr, uid, thread_id, context=context, **kwargs)
+
+
+class hr_grant_badge_wizard(osv.TransientModel):
     _name = 'gamification.badge.user.wizard'
     _inherit = ['gamification.badge.user.wizard']
 
@@ -82,4 +98,4 @@ class grant_badge_wizard(osv.TransientModel):
                 badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
 
         return {}
-grant_badge_wizard()
\ No newline at end of file
+hr_grant_badge_wizard()

From 976c46d2b19a4013362405788170253cc3693f1f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 10:04:00 +0100
Subject: [PATCH 143/547] [IMP] non-employee warning when sending message to
 followers

bzr revid: mat@openerp.com-20130313090400-ayn3gty461srxhyl
---
 addons/hr/hr.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d257c6d5d2e..315a3306d15 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -298,8 +298,10 @@ class hr_employee(osv.osv):
                 for employee_id in employee_ids:
                     res = super(hr_employee, self).message_post(cr, uid, employee_id, context=context, **kwargs)
                 return res
+            else:
+                raise osv.except_osv('Warning!', 'You need to be an employee to send messages to your followers.')
 
-        # if no overwrite or no linked employee, send message as usual
+        # if no overwrite, send message as usual
         return super(hr_employee, self).message_post(cr, uid, thread_id, context=context, **kwargs)
 
     _defaults = {

From 888dcb585084688d8b681fb299ae99ae21d30c0b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 10:38:04 +0100
Subject: [PATCH 144/547] [IMP] visibility of goal buttons depending of state

bzr revid: mat@openerp.com-20130313093804-q0x7j76o4x6seqzg
---
 addons/gamification/goal_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 10a81e8b1ed..d1fa5673a0d 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -73,8 +73,8 @@
                                 <label for="current" />
                                 <div>
                                     <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}" class="oe_inline"/>
-                                    <button string="Refresh state" type="object" name="update" states="inprogress,inprogress_update,failed,reached" class="oe_highlight oe_inline"/>
-                                    <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
+                                    <button string="Refresh state" type="object" name="update" class="oe_highlight oe_inline" attrs="{'invisible':['|',('computation_mode', '=', 'manually'),('state', '=', 'draft')]}"/>
+                                    <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders" attrs="{'invisible':['|',('computation_mode','!=', 'manually'),('state','=','draft')]}"/>
                                 </div>
                             </group>
                         </group>

From 95c244d35a97aa094d0fe6029ef33593bc121937 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 10:51:54 +0100
Subject: [PATCH 145/547] [ADD] gamification: security rules

bzr revid: mat@openerp.com-20130313095154-b5wi1ohu0wo6hz5w
---
 addons/gamification/__openerp__.py            |  6 ++-
 addons/gamification/goal.py                   |  2 +-
 .../security/gamification_security.xml        | 43 +++++++++++++++++++
 .../gamification/security/ir.model.access.csv |  5 +++
 addons/hr_evaluation/hr_evaluation_view.xml   |  4 +-
 5 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 addons/gamification/security/gamification_security.xml
 create mode 100644 addons/gamification/security/ir.model.access.csv

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index a60b560866a..466cc356016 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'depends': ['mail', 'report_webkit','hr'],
+    'depends': ['mail', 'hr'],
     'description': """Gamification of goals""",
 
     'data': [
@@ -31,7 +31,9 @@
         'badge_view.xml',
         'goal_view.xml',
         'cron.xml',
-        ],
+        'security/gamification_security.xml',
+        'security/ir.model.access.csv',
+    ],
     'installable': True,
     'application': True,
     'css': ['static/src/css/goal.css'],
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index b8298707264..3e7013ab0c2 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -151,7 +151,7 @@ class gamification_goal(osv.Model):
             required=True,
             track_visibility='always'),
 
-        'computation_mode': fields.related('type_id','computation_mode',
+        'computation_mode': fields.related('type_id', 'computation_mode',
             type='char', 
             string="Type computation mode"),
         'remind_update_delay': fields.integer('Remind delay',
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
new file mode 100644
index 00000000000..3ec0690531b
--- /dev/null
+++ b/addons/gamification/security/gamification_security.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record model="ir.module.category" id="module_goal_category">
+            <field name="name">Goal</field>
+            <field name="description">Helps you handle your lunch needs, if you are a manager you will be able to create new products, cashmoves and to confirm or cancel orders.</field>
+            <field name="sequence">17</field>
+        </record>
+        <record id="group_goal_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_goal_category"/>
+        </record>
+        <record id="group_goal_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_goal_user'))]"/>
+            <field name="category_id" ref="module_goal_category"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <record id="goal_user_visibility" model="ir.rule">
+            <field name="name">User can only see his/her goals</field>
+            <field name="model_id" ref="model_gamification_goal"/>
+            <field name="groups" eval="[(4, ref('group_goal_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('user_id','=',user.id)]</field>
+        </record>
+        <record id="goal_manager_visibility" model="ir.rule">
+            <field name="name">Manager has all rights on user's goals</field>
+            <field name="model_id" ref="model_gamification_goal"/>
+            <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
+        </record>
+        <record id="goal_plan_manager_visibility" model="ir.rule">
+            <field name="name">Manager has all rights on goal plans</field>
+            <field name="model_id" ref="model_gamification_goal_plan"/>
+            <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
new file mode 100644
index 00000000000..e83148a503b
--- /dev/null
+++ b/addons/gamification/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
+goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
+goal_user,"Goal User",model_gamification_goal,group_goal_user,1,1,0,0
+plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
+plan_user,"Goal Plan User",model_gamification_goal_plan,group_goal_user,1,0,0,0
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e01121c9e8e..88b97517847 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -147,7 +147,7 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
             </xpath>
-            <xpath expr="//page[@string='Public Information']" position="before">
+            <xpath expr="//page[@string='Public Information']" position="after">
                 <page string="Goals">
                     <field name="goal_ids" widget="many2many_kanban" />
                 </page>
@@ -415,7 +415,7 @@
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" />
+        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager" />
 
       <!-- Email Compose message Action-->
       <act_window

From e0b0bd2c14e9ddadeb8e258ea2d62e50778576ef Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 11:12:58 +0100
Subject: [PATCH 146/547] [IMP] add manager plan to manager group

bzr revid: mat@openerp.com-20130313101258-1zuqwkapeef1pvty
---
 addons/gamification/goal.py | 2 +-
 addons/gamification/plan.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 3e7013ab0c2..885524ca8d2 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -289,7 +289,7 @@ class gamification_goal(osv.Model):
         """Overwrite the write method to update the last_update field to today
 
         If the current value is changed and the report frequency is set to On
-        change, q report is generated"""
+        change, a report is generated"""
 
         vals['last_update'] = fields.date.today()
         for goal in self.browse(cr, uid, ids, context=context):
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index b771e5aed34..df8bcfb73a1 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -193,6 +193,12 @@ class gamification_goal_plan(osv.Model):
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
             if new_group:
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
+
+        # add the selected manager to the goal_manager group
+        if 'manager_id' in vals:
+            group_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'group_goal_manager')
+            self.pool.get('res.users').write(cr, uid, [vals['manager_id']], {'groups_id': [(4, group_ref[1])]}, context=context)
+
         return write_res
 
 

From c36cd97b79d48589655aaf67b0227344dccea0c3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 11:26:14 +0100
Subject: [PATCH 147/547] [FIX] next report date and no need for hr in
 gamification

bzr revid: mat@openerp.com-20130313102614-7abnizlqwq73pjqu
---
 addons/gamification/__openerp__.py |  2 +-
 addons/gamification/plan.py        | 38 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 466cc356016..e8e8e36ea6e 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
-    'depends': ['mail', 'hr'],
+    'depends': ['mail'],
     'description': """Gamification of goals""",
 
     'data': [
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index df8bcfb73a1..06323f65597 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -74,37 +74,37 @@ class gamification_goal_plan(osv.Model):
         period. Return a string in isoformat."""
         res = {}
         for plan in self.browse(cr, uid, ids, context):
-            last = datetime.strptime(plan.last_report_date,'%Y-%m-%d').date()
+            last = datetime.strptime(plan.last_report_date, '%Y-%m-%d').date()
             if plan.report_message_frequency == 'daily':
-                next = last + timedelta(days=1)
+                res[plan.id] = last + timedelta(days=1).isoformat()
             elif plan.report_message_frequency == 'weekly':
-                next = last + timedelta(days=7)
+                res[plan.id] = last + timedelta(days=7).isoformat()
             elif plan.report_message_frequency == 'monthly':
                 month_range = calendar.monthrange(last.year, last.month)
-                next = last.replace(day=month_range[1]) + timedelta(days=1)
+                res[plan.id] = last.replace(day=month_range[1]) + timedelta(days=1).isoformat()
             elif plan.report_message_frequency == 'yearly':
-                next = last.replace(year=last.year + 1)
+                res[plan.id] = last.replace(year=last.year + 1).isoformat()
             else:  # frequency == 'once':
-                next = False
-            res[plan.id] = next.isoformat()
+                res[plan.id] = False
+
         return res
 
     _columns = {
-        'name' : fields.char('Plan Name', required=True, translate=True),
-        'user_ids' : fields.many2many('res.users',
+        'name': fields.char('Plan Name', required=True, translate=True),
+        'user_ids': fields.many2many('res.users',
             string='Users',
             help="List of users to which the goal will be set"),
-        'manager_id' : fields.many2one('res.users', required=True,
+        'manager_id': fields.many2one('res.users', required=True,
             string='Manager', help="The user that will be able to access the user goals and modify the plan."),
-        'planline_ids' : fields.one2many('gamification.goal.planline',
+        'planline_ids': fields.one2many('gamification.goal.planline',
             'plan_id',
             string='Planline',
             help="list of goals that will be set",
             required=True),
-        'autojoin_group_id' : fields.many2one('res.groups',
+        'autojoin_group_id': fields.many2one('res.groups',
             string='Auto-join Group',
             help='Group of users whose members will automatically be added to the users'),
-        'period' : fields.selection([
+        'period': fields.selection([
                 ('once', 'No Periodicity'),
                 ('daily', 'Daily'),
                 ('weekly', 'Weekly'),
@@ -114,7 +114,7 @@ class gamification_goal_plan(osv.Model):
             string='Periodicity',
             help='Period of automatic goal assigment. If none is selected, should be launched manually.',
             required=True),
-        'start_date' : fields.date('Starting Date', help="The day a new plan will be automatically started. The start and end dates for goals are still defined by the periodicity (eg: weekly goals run from Monday to Sunday)."),
+        'start_date': fields.date('Starting Date', help="The day a new plan will be automatically started. The start and end dates for goals are still defined by the periodicity (eg: weekly goals run from Monday to Sunday)."),
         'state': fields.selection([
                 ('draft', 'Draft'),
                 ('inprogress', 'In progress'),
@@ -122,14 +122,14 @@ class gamification_goal_plan(osv.Model):
             ],
             string='State',
             required=True),
-        'visibility_mode':fields.selection([
+        'visibility_mode': fields.selection([
                 ('board','Leader board'),
                 ('progressbar','Personal progressbar')
             ],
             string="Visibility",
             help='How are displayed the results, shared or in a single progressbar',
             required=True),
-        'report_message_frequency':fields.selection([
+        'report_message_frequency': fields.selection([
                 ('never','Never'),
                 ('onchange','On change'),
                 ('daily','Daily'),
@@ -139,11 +139,11 @@ class gamification_goal_plan(osv.Model):
             ],
             string="Report Frequency",
             required=True),
-        'report_message_group_id' : fields.many2one('mail.group',
+        'report_message_group_id': fields.many2one('mail.group',
             string='Send a copy to',
             help='Group that will receive a copy of the report in addition to the user'),
-        'report_header' : fields.text('Report Header'),
-        'remind_update_delay' : fields.integer('Remind delay',
+        'report_header': fields.text('Report Header'),
+        'remind_update_delay': fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value or zero is specified."),
         'last_report_date': fields.date('Last Report Date'),
         'next_report_date': fields.function(_get_next_report_date,

From 25d6dc30a8367af5ab3df51ef760005afea9370a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 11:33:34 +0100
Subject: [PATCH 148/547] [IMP] add install checkboxes in hr

bzr revid: mat@openerp.com-20130313103334-3b6zknk4g90exkdg
---
 addons/hr/res_config.py       | 4 +++-
 addons/hr/res_config_view.xml | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 147c4e4d5b9..2eec37726e2 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -40,8 +40,10 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_recruitment."""),
         'module_hr_contract': fields.boolean('Record contracts per employee',
             help ="""This installs the module hr_contract."""),
-        'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation',
+        'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation and goals',
             help ="""This installs the module hr_evaluation."""),
+        'module_hr_gamification': fields.boolean('Manage badges',
+            help ="""This installs the module hr_gamification."""),
         'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (the sale application will be installed)',
             help ="""This installs the module account_analytic_analysis, which will install sales management too."""),
         'module_hr_payroll': fields.boolean('Manage payroll',
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 632ceb56918..3dc1795139c 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -56,6 +56,10 @@
                                 <field name="module_hr_expense" class="oe_inline"/>
                                 <label for="module_hr_expense"/>
                             </div>
+                            <div>
+                                <field name="module_hr_gamification" class="oe_inline"/>
+                                <label for="module_hr_gamification"/>
+                            </div>
                         </div>
                     </group>
                     <group name="timesheet_grp">

From eeb6d2ea0be30c115c287a101ff9e672aafa7aa7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 11:49:00 +0100
Subject: [PATCH 149/547] [FIX] next report date and isoformat

bzr revid: mat@openerp.com-20130313104900-5h306omqclwfgqmi
---
 addons/gamification/plan.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 06323f65597..856c19598ad 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -76,12 +76,15 @@ class gamification_goal_plan(osv.Model):
         for plan in self.browse(cr, uid, ids, context):
             last = datetime.strptime(plan.last_report_date, '%Y-%m-%d').date()
             if plan.report_message_frequency == 'daily':
-                res[plan.id] = last + timedelta(days=1).isoformat()
+                next = last + timedelta(days=1)
+                res[plan.id] = next.isoformat()
             elif plan.report_message_frequency == 'weekly':
-                res[plan.id] = last + timedelta(days=7).isoformat()
+                next = last + timedelta(days=7)
+                res[plan.id] = next.isoformat()
             elif plan.report_message_frequency == 'monthly':
                 month_range = calendar.monthrange(last.year, last.month)
-                res[plan.id] = last.replace(day=month_range[1]) + timedelta(days=1).isoformat()
+                next = last.replace(day=month_range[1]) + timedelta(days=1)
+                res[plan.id] = next.isoformat()
             elif plan.report_message_frequency == 'yearly':
                 res[plan.id] = last.replace(year=last.year + 1).isoformat()
             else:  # frequency == 'once':

From 00d4fa790b2eefe190cd51633d84843eecc2be3c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 12:02:25 +0100
Subject: [PATCH 150/547] [ADD] badge menu and related security rules

bzr revid: mat@openerp.com-20130313110225-bjxs9rn3shux9rqh
---
 addons/gamification/security/ir.model.access.csv | 8 ++++++++
 addons/hr_gamification/badge_view.xml            | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index e83148a503b..6ef63f3ba55 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -1,5 +1,13 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
 goal_user,"Goal User",model_gamification_goal,group_goal_user,1,1,0,0
+goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
+goal_type_user,"Goal Type User",model_gamification_goal_type,group_goal_user,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
 plan_user,"Goal Plan User",model_gamification_goal_plan,group_goal_user,1,0,0,0
+planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
+planline_user,"Goal Planline User",model_gamification_goal_planline,group_goal_user,1,0,0,0
+badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
+badge_user,"Badge User",model_gamification_badge,group_goal_user,1,1,0,0
+badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1
+badge_user_user,"Badge-user User",model_gamification_badge_user,group_goal_user,1,1,1,0
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 7f616850fec..626e8c2fa8d 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -20,5 +20,7 @@
             </field>
         </record>
 
+        <menuitem id="gamification_badge_menu_hr" parent="hr.menu_hr_main" action="gamification.badge_list_action" groups="gamification.group_goal_user" />
+
     </data>
 </openerp>

From 45179641d67e6cde3dfca5916456cf0ef68591ea Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 12:19:13 +0100
Subject: [PATCH 151/547] [ADD] badge demo

bzr revid: mat@openerp.com-20130313111913-fdk2fmr6mzrdou9i
---
 addons/gamification/__openerp__.py |   3 +
 addons/gamification/badge_demo.xml | 233 +++++++++++++++++++++++++++++
 2 files changed, 236 insertions(+)
 create mode 100644 addons/gamification/badge_demo.xml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index e8e8e36ea6e..4ada7dfac7f 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -34,6 +34,9 @@
         'security/gamification_security.xml',
         'security/ir.model.access.csv',
     ],
+    'demo': [
+        'badge_demo.xml',
+    ],
     'installable': True,
     'application': True,
     'css': ['static/src/css/goal.css'],
diff --git a/addons/gamification/badge_demo.xml b/addons/gamification/badge_demo.xml
new file mode 100644
index 00000000000..de8d9d2b486
--- /dev/null
+++ b/addons/gamification/badge_demo.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="badge" model="gamification.badge">
+            <field name="name">Good Job Reward</field>
+            <field name="description">Send this badge to people you believe did a good job and deserve a reward.</field>
+            <field name="rule_auth">everyone</field>
+            <field name="rule_automatic">manual</field>
+            <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
+                                WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMNCwcLA3in8gAAIABJREFUeNrtnXm8XVV96L+/vfeZ
+                                7pR5DoQkhLGEUSAgyOhQEVAUFYc+XhUpH621llZbW7WDrX1IbZ8TreLEq6htQYsUEyCAzIEQBpkh
+                                gYTkZrj35o5n2nv93h9r7eGcexISknsT5a7P53z22fvss4f1m8cFzeNUtz2P7/F2ypzHTbyN05kY
+                                v5VDWh59B9eiXOr21J23BbiekOu4hVXJuTOArRMT+duBAMuAdiZTpA9BUXeOgNsT948yET8g4mcU
+                                uIefMzAxlbs5zsQDSnRQoo8ZdHIQPrOIOIAcRSCgwr+ynBfGlwOcx8eAbzmgIwKqDWdbRDAoHuL2
+                                1mF4BI/7UFZzE/cC5dctcI9jFgcyiyqLKDKLCtPJcQB15hIwH6ULYSqGLgQ/nuvMSElvO3l+RX08
+                                EeB24AwE8T0oliCKIKxDGCbgj7lBvKfJHoAHGADuQ3kQw8sEPE03zzKXbnqocvfYvdReGf8LYS0B
+                                Qo7JBGxkKu3Mo4tpVJlFwBygk4iF5JhPxAEIc/Hdu+sOZruRk8bg1gQWkpljRYi4iP/hv8YPAc5H
+                                Mfbm+SIEgT3J8y03MJFFhHodorq7gpd5YWn6FiNH9uWUCh79KL149BPSD2wmYDshA0Rsp0Q/QkRE
+                                nYgyhjKGCh5VlBCfMLmD5UgeBh+PHCF5AgpAEZ8iPgU8hIiAGl0Infh0IJQI6USZis8kPAoY2lE6
+                                8WjH0AYU8RqevZlS7S9Zcmjkla2BboAQqAERUICOTpjUBZt6HP0oEHIpt/C9sUKAoEn5OxeTPqrn
+                                NZ6sahEiyEF7O3hiEaFWs58wAkwG2Dgx0TxRQhGlCMxyogQHRItMnpuc7PDdJzv12oTKgTuWbzov
+                                bLoOmf96mT3TgKjps2uiEUnmfllA22c3yRsSfzwFL0Amt8PkSTCtS5jUKUzpgimTYdo0YeokKObA
+                                qJ3Hz1wdYaLkTmOqXzUigMfphOlriuzkn2ofOJ+3n8BxiChyIsOKDQlDqEdIWHOTE0+6JBMpDQDJ
+                                8qWYomQH1oqMfia8FsdklHRt/k1G/ceyX4jcVhF88ArQVoSOEtJegELJ7re1QUe70NkutBWEthL2
+                                0walgp3MKLRzoygigifg+xboUWgfJqwr9VoGUUu8Mn4IEHKqY+fq+cjuXEjVzpvvW2Qo+SQv6Ql4
+                                voV+PYQodNsYWUKHMG4bZWWo7uQ59FWOtfrdh8CDXACFHORzFoFLeSjmhHzB7rcVoFiEUpvQ0WaB
+                                nM+l7xrjrniO2D3H3MQe9zxLEGGoDIWC5wDqe/afnrTG5mroOJbvDm1m03hygCNjmS2efVGR165e
+                                qKMwo4CxZJwLIB9Am6d4YifKUoLie3aiPGmyPuKHctdLOKykn/g68f89h4i+J3Yb7/vpf5JnTKhe
+                                EQeZ5HoOkJGBSjUVi368FYf4jgC8eMJk566WHY2hYY1FiRVB9/Ly+CDAW5mCMgOxsqxZ/u917VNS
+                                bdEoiBGMsROZTLDjHgL4vkUgzx333bx6vvu9CTCW49iTwsgiUxhaBGi+fnq9lDLj4zvkJGM0tm13
+                                UBEnesZ4eBn2Py9RX2TsEWBsXZm7T3n7y+jtU8v+Lbd7cvwQoMQxGbm7B6x/Yrx2rggDfRnLxPDU
+                                +CGA4YhY3Iqflb8TY7yG70N3r6b2iTe2buBGBFAOi288Qf37YiilAqzvzlg+wvPjhwAeR8eCU7wJ
+                                cOwbbUYZ2Z4xfod5bvwQQFj0m60+/YbTv0J3T+IksyZSOy+ONTBiBGhPjOtW3rSJMS5jc7dCMdmt
+                                EdE71iaoBfWFHO6id4mjZWKMvw7Q3aOpBSD0cTND4yMC6hw1AYB9bQEIm3syAlnZMh73tQjgM6tl
+                                MGZijNvI52DTVmcCWlg8MX4IEHFQJrA5Af99MIwqff0J9YOMvRMoqwTOiy3P/dsH8No0ItmV8PYe
+                                3mNPR7kMI1Xi8DdErB2P+wYO5w5KYuOybwDbEPRPInyK50kSmJEkpyT1VJrIhV1tIguRjd2nIdtM
+                                cC6OGsYZTr5vE1xyLtmkUABjQETHeSKUShXqFSCf5Ew8PH4I4DE5zniJJ3c8OIHvK7lAqNWEyrBS
+                                d3mHUd2lnEU2nh6GoMagagFk3FbdJ8kO0l0gYG2x4wE5mNoF553njT8ViNDbb3CJJzYM/PPxEQEB
+                                4KF0ZNyPY/++njI8CD2bYXhAU9/DzjiQ7OBYc5qY7CJXl9H/6R2ENY8oxx0v480A2bxVIeeeJRq/
+                                NPuAd1KiTilJAx/zl1WGB2D9Cw79fHacstUK8DGVR00fk9maJuA2p11nEzxzwLTMT/5OEGkMMWBb
+                                D+A7WQiPjB8CDNFOnkKse451HEA8YWBAU8o1QN0CwgMCgUIbzJkK06fBtA6Y7rJlS3noKkJXG3R2
+                                QlsH5NuhVLQpW6WiTeMqFCCXS/NIvRZEH9/23ofgvX8IlOyBhQtG53+Ohw9gyzaNXcCKN54I0E7J
+                                Zc2OzxuL2nRyB4mjD4EvfRymT4XJ02Bq0XpD44zpmvtucKllzRlXMddqOh6n1jVwlQwGKFASuOYH
+                                QJs93N4BM2dBtTq+IqBUgHWbSMtBdOyjgCkCDDCF9pRhjrXyJyLUqklWJccfCkceRZL9NAgMxEpo
+                                E8A9gVEK+q48r7TYV9iyFW6/F5hkMezoo4VKRcY9GUYEhnrBaWLCyPgogBYBPGaPp/9PjdXqYyAs
+                                mQuhA7g02e3NTyR74SljC6co8OmvAZMdF/Fg0SJv3E1AVecBtLqQFcQFnstUV42xI6idqePn+7Ds
+                                Pyl6qMDSw52Nr2M7yZrxDRgDPQNw4x2peFiy2Jql420CKtDdrVBIDlXx6BkP4FsECJk8ni6wSjWj
+                                gQ/BiUc7JU32PtCbt8Y4/wFw7b9ntMMqnHC8Z51I4zwEpXtbQxSwl5sYGa/7e0RMT55Fxv51RwZT
+                                m3/x4Y1A2pvAjindaPpRp0jmFb76nRQBDjksThcffzdoEAibeuIHRzCsH9f7k6M9iT+N8Qz4vjKU
+                                cXG85SRb+PZala6sxzIL9AZkiL8rqFi37+evdoqfMxd+Z6mH6r7wgSu5nNC9NeO18MYnCpgigJCL
+                                zY+x1n6NQm3YOV+G4dRT4LW4npsBn6V8beIKsckX7w8PwfdvSql//jxo7xB0H7B/EMJQGRzKEJ/w
+                                zPgiQMhkVwU75trOYB+pu7MIxxyxa8DX5kYVsU+gGfjSeCw5L/YXCFzz/YyyU4OTTvYIQ8XfR2HQ
+                                chmGqxnvZDR+JiCODiaNvQqoeL4ysD0FxmEHwIzOHQO/WS9oZulqUopPPqZR4zcZ6jcKYRm+/oOU
+                                +hcfbL2G+yoDQkQpV8BUEg0AelkzvhzAo2s8WJ0xSnkkxfTzT4ehHbD/ZopvYPNZhMiy9wz1a5b1
+                                u/MLOfjDvwa6Ekpj6bFO9u+zHAhhW1+UKoAC3DfeSiB0JgqIjB0HqIxg5awPbIf3nd9aiduR7a47
+                                0vjj30wj4MmKBGDtS3DLnVifP7BwkY0bsC8roBS2bMuIRR1f4FsEUBcJHFNWBwO9KetdtBgWzITt
+                                TfJ6lwGeof4G5c9xguQ67tPWBn/+9w74CtThpBM9jKFFnf54MgClt5e4GFQxPLovEKCYdPsaK0XD
+                                FwbjqtcQPnghbG+m9izApdF0a6Dq7LkttPyYE2TP+cUKePgprLfNwHEnuJL0fZz/FgTCpm2a4rs3
+                                9tXArURAcUy5nCr9PaRx/zpccG6jEjeK0rOcwDSx+p1xguZj7ofPXEXiai0UYckhsm9Zv3vaUlF4
+                                ubEW8NnfOgTwfaG/L4Xa4Utg7gwYihopdxTrb6ZyabLtW3GCpmPt7fD7n4RK6MRPDZadJkRR3Ehi
+                                /H3/WQUwipRaP9CZRAHHhgMcy2wm8ybgcISXuJ3vchTwuHUE5ceOGmzDo9qI4wAGfu9t0B+BNLPq
+                                JsptSO+Lzb5XAXijX0C4daVyz5oM9bdBtaaMDAulkk0ayeVimQPGaOIRbO74Ngb6H5u2JAqg7TJW
+                                4qXXfMHTaMeni5AjyHEkwsEIy1BOGJURdRYlbucbqSdQxooYhMHtmvYRHIIPvxcG6hnbvYVCNwqg
+                                0igCWh1DbTKNuh/EU+57hGyUjWod7rsPG38O1GYP5aGjw/bo62oTSu1KZ7tQarfHiyWlWJBEL0ki
+                                mXENh0pisopk+uFlTNlkmz1uoHtzJgoolPlvNraEwRHM5kBmUGYBeeYTMgWPgwhZQMABwDQMUxFy
+                                FBJga6bBlmYTqlEugBgB0u56ex38fqD0bSXJy/vQhTAYphG5BqXPNMnxZsugWes3jW+mCRK446Hw
+                                h7+vrLwPNm7G9g6MexDm7T0rdajUoH8I6G7SKONGjq53oRSgo2R1iDgFrZizXCQIwAtA/LQhlS82
+                                xyBrZcQOKRPZ51/fbXUip7wKZ7GSs+nCMB2Yi0eQEGfcOi7KeA0D0ox6LwF1bNJbiqi7SgP3zi7M
+                                /HI2FuDttBXba9f+GNqeYDeMwCXvdvn7tLDZ2QEn0BZiQhzgHVlpFvAZDmKM8IsfKo88Bnc+CE8+
+                                CauexEagOhx3aGaP8UT6jj1nnmuwAoNVoH8HPL2VLN0RaY3OSi4gnNHUoJIGH01z51FIk0jqdo4R
+                                ZPJsWDwfZs9G5s0Tpk+BL12t1gy2zaf+J6sESotmxXvO/D3Yvo2E/S9cAIcdAsOVJirfgT2fde/m
+                                cmngRDWjwYvge7bYo1aHMJs06K4xXBaWHKwcusS2pOtoU7b1w9PPwHPr4JWNsHYjrN8IPf1gQpdL
+                                GGcZx5eMuYfQunx+d9LZW//e3HVUHLVK9v4B4AfItMkweybMnSHMmAHzZ8H8BcKBc2zORU8fvPCS
+                                srUXfrZCYx+I5SUj/CJu8x+MlZZTjytdnPL3v99lKYid2PfN5p4xUK7At38Ajz+rbNsOI2XL7vM5
+                                y4Ynd8KMqbBwPixeAIcvVpYcJPQNKPV6OqeR2nZxvf12Rg89RDnkYMuuCwWhmLcco39IGRiAkSEY
+                                qMDQEAwOwfYhZWgIyiMwXIZKBeo1+6nVoB5ZJKxHlstFkYtFaNqX0PfSJpX5wG5zOdt6N8hDsWC7
+                                ixbaoKMNJrULbe1CewnaS7YraUcHtJVsf8NqFSoVpdQm9PYqDz6qfPtHyroNsK3XxjnyORgYJNvT
+                                +SFWUU2x7h2uL6WCBLaZImRKqDKlVJD214v79LXquydA/1YYHHA3Hob190HfSCbNTVs7ctRhhlHo
+                                H4C3Xw6d7XYCq3X7DoUAprbZZ+ivwVDFTrq6XrvFPJxxIpx+Iiw71jZvrIVOT0h0BnHRQkkwUjPH
+                                G72LjXw8PjTKN+G0POtfci2G3T2zru0kcJVpVKk6WimOs5hGx0DU9k0UZdVjyn/fpry0wQJcBGqR
+                                fT4RiyRhlWwBzQDKOdxmF/0IxsIbLuJCv476P/F70DOyY0pHwUg8g3ZbLCif+KoFviosngF/ewGc
+                                sgjaXRZv8uShpewXe+CZbrhvLTywFq68FXIlWHa0cu6p8JbThYEh5wE0goo2AUhaRh/RFICJwirN
+                                rmtNrmMB6DUgdGyd7NB0ddfVTNFKo5lsr5EPbBXxzSsj7nzQttwt5KyOOC0Hv7sIzlgAh04TZpes
+                                uf3SAHxnteq1jzBCwADwl8D59s3Poxr7AvYKB/BgcBtp6LcGv/qJNbN0lM9fGicumXhlWy+855OW
+                                zS+YBg99EapDGWFp0kmSjBURdw31BEYi+H8PwDV3w5Pdlu1e/j7hHWdZORn3hEZbKKYtdJLRsQlt
+                                4FxZMzQWPaMSU15N2d3BNu47/L2fGu5/1JqvRi21v2UhfOYUYdkcqIdCZBQTx/YMqChtAXzuTu3/
+                                u7sZRpjJK7TzJDXhPMqxPry3RMDGF9MXO/0YuObLMFLOvrgDvMoo+z7+/tP/Ub57A5RrcNefwdI5
+                                GU6sGQ4gaQygufBDnMlV7BCe2ah88y742l1w0Cz4m08LBy+QhJpbKaTZfeIWvjo6WmkSLmFFiMnm
+                                I8Rb07hvjCbHkuOm6XyTvuK9q5Uf3qCUinZ/sAxXvAGuPEmY12V1JREZ7dLJcKtSSSl8XjfWrJH4
+                                16zgW8J5DLiQMOLKpfcEASpD0LfZPcEQ/Py7MGe+JAtgqGba7O8g+lcswEf+Qlm30cr65/4WqrXd
+                                Q4BEVkegzkMTeMpwCO+7Fu56EeZOs7pDMvHGVSCZxqQSo6NTz1rK7QzPlmbr0KW+7yz1MPubQHb1
+                                EHzHXashvPEAuP6d0BkIdeMAv6M08mReVFWFq+8xA5+7m2GUu7iN9wcY6klv2j2O+lnlL3b8HHsU
+                                LDnEdsA2ccBRZacyD6x2vPrXMGUSnHWYPe+1mCrZ+hJ1Hb8LItz8CeWqX8JP16TNpVv9V1vY8qKt
+                                K8xlJ42ld6svRatCWXf/yMD7j4Q/PEkoV4XQaNqd/FXdMiIi8PbDpO1zt+ogJY6JlcDq3vJtj/Rn
+                                6vdG4JMfhYFhaSnzkrCtaWKzCmuesuaQAsuWOO1fRvtVdsd9mdS+C1RGhE+eDp86vcG50gg808JJ
+                                pC2iVe67tAJaFqhG7UuYHUQi3f2MMVZJbQJ+bD6FEZSrssM4xY5yLO0llYWT8UvteOWQqZzJ9IC9
+                                tLqXFyd9uIc+4EA4dqmVTS3TuGgd2TMKT72gFAowMAKnH9z4QvFc+om3Ly0r00auuVNsiJtMtBQj
+                                2lqkZFYoavy91fdW11Yay71a/C9+n5a/08TSsrGFTDZMMSdxjEFrQ4pJVkcQJpXUO7AL/5nttFNj
+                                boBQ3huxgEoZothfHcIVlzjFT1oEeKTJ20f6g+fB+k2uT0IdFs2D2mAKBE/gzhdh5VPWFz9rCpww
+                                H45fYCcprDkiM7+9Hc+F5rW4lGJReHar8tMn4FcvGx7vRvtr1K69QMILlmibxs1fIpGjZ2numT7K
+                                FDkiQKjsqfwX35p+sbNhcgkufLvQu71Fxs6oxM2s/ayU8rCh254zb8poMdNfhQu+bnsFgJWLQxWI
+                                qnDofHjjwXDGEjhlISyaDeEwRBobZb/ZGNEQaQSKBeWBV+BHv1Z+9KSyZbOz5zTBk+1X3KTmnX8i
+                                7XatIqQWKodOkwB0COWQwIVGZEcKzC7EfKiPWJcoYjWKP/0k9PSl8dGWET6a7WmHzZ6wtc8yrbnT
+                                GzUUAX7566aIoweT2sAUYcsQ3LAG/n2V1ZpndcK7joE/OF1ZOA2qlX2cA7I3wK9QKipfuU/52irY
+                                OAR53+leebLrn3koYc8AunGQaGYJTwSJVHR2l3pYvXx2gGFgT3oDex4M9qaTOnkqnH0a1OqyAzNP
+                                M4CXjIfMBbXqMOxKI6d3goYpxgM8/LKl/vjavg+T2u0Clx1t9jejNsTb2w//shL+zworIv70HOWi
+                                o6y//jcRCxTl/z4Mf3mH9fF7Yj19hxwsrF6ddF0xCGWeZBpHsg5DtHGQaFZb4gyW2W14Dp/mBjTm
+                                Z+72qFUgzAR9PvJua6tqxkEe+8gVMhk34o5Jgzu0WlfqoWUeU0uWxcfNIgIPXu5NZfsBc+AfrrR6
+                                gx84375JswTKVdjaK/z7jcr9jyof/iFc2QlffRe8c6naZhD7NUuwnLGUV378BHz8lzBUt67feh0O
+                                XiB86CKf5bcb8DVevNLDcBEbqXI4a/A5amu5cfWhmSV85yqc5hHQB68tI8DzYbAnlf1F4IMXgxpJ
+                                HCuRqt0awRgPo4JxC0TZ76mzJTKuVZx73ELQyAA9H7YOW2QpV+CS84V6KFRrwvCIMjysjJSVkbIw
+                                NOIRRsKUScKnLxMufbeQ82yE773fhcuuB9/TMUmF2HvgtwGfD90Il9wI1QhyniWKD77L4+OX+gyP
+                                KLfdadL+QsKdrOSXTmZ2Wz2pUbZ35JNQ8yQP6GvizrsskWplq3WjVlZfeQX09du2pzbrV9yimySL
+                                b2a9Z80RMlSsZ04bczOyDDtGDgPMn427pmbu5TVcTw2MVIQ3nyZM6rDco70A/3YvrOvdz7V9gSe3
+                                wXWPQrtTevM5+PwfBSw93CPIwdf/NYpXSrUcoM75nJYAqYhCvqnwMfCTMoBZATWMSzza7Ycb6ksh
+                                0zkJ3nyGUA8zQZAsi5dMVC3j2GiOBZiMvVttUbEbu54LgV0T0MTeRJMN40pTtE0xxnYc1diEFiiH
+                                +78mEDb1SfrrTwfUXXfUG35m6In7Ldhlby/jrkyPQWE+BqY2lf4Yk0xR2SNn2cTuWgH1irP7nXz+
+                                yHtsaFJVUKMJIEYVbjZn/DRl/Gafpb/amFNnDEwppRzAmFiXkPRatOIwkgA9nk9foK+y/yt+1TBN
+                                KJky2RaTCLbV3i9WmOw6x0+ykn/juAa2ORPQGSV8TXtAUKkn7nrxXosS6Hkw3JcCv92HD7zbyvZI
+                                M7I9+9HU+xZ/Ik0jXsYtGSueNe0MsG3IJlvGuBkZmNvhqrtq9kWMsf9tuJ423dekXMvlauD7sG14
+                                /0eAcpRyqVxg36dYVL757QiX0B87OH6X04HVwAzgHGZimEoB6czbJNEYA3qrRHG6QsAg3TYWuBua
+                                /4hbOt4DKvCnV0LPdhqaOO88jp5yhQZnEBB4QuBZDrKl19m29fTa0yal3KSnDzo7duRbGJ1u5mWW
+                                ww082DoAoxpV72djuJ4u4pXL2QbaN//SsGEzJKLbcCUrMzUFWwHDUjxyU4rUOgt4kroRdGOZyJUD
+                                1jw6MyKAV+/XIwIjGeqfPgPetExsHNw0UbnSpOVntsbGxNPzFaOK70PO2fkvbrPhqixAl0y3bLFQ
+                                gLUb1HKOTAw9ynCE7D1Rm3sXXyjnw/qB2EO+n1oBak3ZeBXXfE7o64Of3WziXC6D8AIruYqjm9k0
+                                70AZnNOB31YQSfUIle1DSTb9iEeVYaeQ7ZIGUB1xxRGuzu+KD7rOX46OR8ngFt9psAYyGrzaev1J
+                                jqpNHSqDjUrQ4XNtbkDgw7NrXXw2RrJm/SKjd0RGaSs2WhXb+vfveIEAA1WXeyEwbbLw1W+EWdbv
+                                EXEO58CoumLh/Xh4y+aTd51ZFSDnCy/0a4jNWuvzKDGITSmTV+MAng/l7SlAZk+Ht5xtywoiIw0U
+                                ry1kvjoqtxQbZ884n4HaJhKVGsyabm9RaIOH1zUWjcyfbFurGoUHH1W6Ouwayw1dQZzvwahN0lKj
+                                hJFHe6lRJDzVY9PE9uextWLFlRq450FDdx9k7OpPcwfruDXzh2XAOZzjHEJ66oGSr4ZpFk4QwFNb
+                                iNw1tnj8jBGEEfTVRUBlMNONo2Lt/u392pBBE2v1BgvwlMrVAUeSTxb4sd+gVlfmzrIYVsrBqpca
+                                S67mdFkXMVhO8NQL6mr6MsBXkgxfYwSjHvUQOtslMQONwvObgOL+uUZu/FR9I87KU/u+GQp/mtu5
+                                etRyX/cBwu8DVYbQ8w+lJIJoUi6mPNdL6FwmG6wF6TFAWmW1Q7ZYHUyfbuFCOOYoL+m91yD3iald
+                                nGyPge05TtAE/EzqlYmEA+cKYWSv89BamwApqWzj+APs11IRVt5rrNVgNLmnJl5HHKIp9VCZ7Jrh
+                                xOrwpj4aysn2N/bvifV8igcjw2RLRwSfs3gT8HgT9Z/BFJRzEGThHIJpHXiCxDkD0lPGbLRCP8Cw
+                                zqoXIZtjXWhHk1EbTp03jMCffEwYHrYOlgZ5bjQBesLaVZJu33HSpGlKlkzy7lCOPNQWZAjwwIuN
+                                rvpKBd5yVOotfOBRUrdyfE+k4V6qQhgJk7rSdDTrEoO1mxX204Wy8wG80A8jIw35hoLhIyxnE3e2
+                                oP6ATwIhBr3sBNrK5dTbLQgvbic0ZdssnZDHPTcRz+90yRUPqgMkpVEnHAcHL7TJlpblptSXULoD
+                                ROLoMdKQKRsv99JsKagK+TzMm2M50YY+eKUvk4wjcOmprugEGBqGhx5LRUsSZ2jSRVDbkj7K+ATa
+                                irBq/WuMg4+HCMgrz2+2gZ+MR/0eVvKdUX84DTiTyQhXAoY6+v6l0gYJ+0dVuWOtVig6v3yepz1n
+                                Rz4f8x1tJgiBan+Gaipw+f8Sm+qlMaVbOZt4/5QEEJqh/sTpo2n/f9OsO6gtxTrx6NRmX/FUJh4g
+                                kFO48A2u0DcPP7zBUChoktWrTZU1MWeZP1dsllLMADx4ZrPNqtX9UAQgwtbuBqWgiuFtnNx08hzg
+                                V0DAdah17J2+mPyCSQQJ+1ellBf+8wkqrkxsKyvo9hyFd2dCzg0YoJHtrxc/xLITYd4cSVl7wuYb
+                                o3uazXU3af588rsZnTevzjowRjhhqUWyQgDfuzvu5+dyTkL4zFuhv+y8ghF8/z8NQaAN12/kMMKU
+                                SdablkXyx16BQn7/iwmqwroeza6jJBjexkoGub/p5E3AOVyGOtQYwVzzDplcrkvGFyc6UFN94EVq
+                                DpZr0oCbsrop6Jbs1YYyR4fhU5d5jJRdEauJFa6mQojsxNO4yldL4MeOIk2RYME8j6lddv/Op+CV
+                                /sYk25MOcgmjTln61QPKI79WRNKCi6gJwYaGhcUL0vwCBR7b5C6wn/EAVWX1euK2doqwmZXc0fLk
+                                czgb4SsIVUL0b95G18GTCeJ1QBXFE+WbD+ogna7O2ON/SJqU/zdrXOWoNtTvRRBlqP+97xSCXAz8
+                                Fl05TRP7pTWws0Eg43QI6xeIdQVrBZx8nHXed3XAF2+wiRAxN6xW4aZPQM4hZz4P37rO8MJLloUZ
+                                Hf181RosPNAphi7AsmUI+oZ0HzWL3onPRYQnurFruikR2qKB1OeA01mMcD3KAArvOZLin58mXaGK
+                                xF3QBNHAR762yrWhF6aynO8iaci94jpPSJLFKy4b153hKVx0oW2w1Fw100DFLRQwzchmYzRx/Uaa
+                                2urqdIjIiZYoEi54i0fZIeD/exC2DmVS+gQChcf/KkWCQgH+5VrD+k0WCbQh4GSRbPECj1otdQht
+                                H4H12/c/j2Axr6zakLClbTSvJHYu8CBTKHAPShUDv7uQ/E/eL9OqoWgm+qeqysp1WtnQm6xM+P2M
+                                fp/w1dVxfraqdcNqPWX/F58nLpjSotS5+Tt8xgbdAAAQoUlEQVSNAZpmt6wmZWJp+XSsQ5AxB8MI
+                                Ln6H5QaBD5/+jzRLKBaNU4rwxOfBdwpjLgdf+VfDulfUVf9qpuxbOGCO4PtpiLVYgLvX7vmaBXs/
+                                GUhYs8l1D7a+mkeTUO+bgE3kUFahhAhy2gHkfv4BmV6uWC9HXCaoIKUScul/0UcBAdqJ+MfRCAAP
+                                ZANjYcYHX1D40HstVRqTBliy3xPKd4peFDUGeUzsnjXuOhmzLTJpMWSUcBL725nLPKa79PDr7oPl
+                                TzcVighMLsBTX7QBHhEbTPqXaw1rX8bV0YtbjlaYPAmmTU4Bnvfh7hds3eB+pADKlkFlwyCDQAVh
+                                On38jNXAGcCdwBzudhk/ctJsgrsukxm1SFREJQ39IIGofvlOHdgw4nqRCreyMl2VLIsAT8b9ZkzV
+                                9fV1ad4f/6gwMAgmNhKac/sbAjspBceUp8alaiUubEl1A5oKRBpkt1Ktw598zCeKoLME7/kmbBlu
+                                WgdSYFIenvsCdOXsfj4H3/hBxGNPqoumWUWvWheOOkwaehT/7AkIOiSzbsY+NgEFnumhTsWl7Csb
+                                WEUPbwTuAM7lZpQDEOTYWQR3fURmxpSfLWdSRV8cIPzMCgbdtLczxIc4pcHFk2gBq5L/1kh6+8yY
+                                Cae8wVFrJI2hXZOWOqeh3XibJoFGKi5EK61DxSa9XuN17X09D/7qj7ykH9BxX4Rt5dElYyXfcoIZ
+                                JecvyMH3/yPi/tWGfBArmcopJ/gMj6R+hpEaPLNh/8kOVkXvfI6RTBfnnwJwN3Au30I5HkWPnkGw
+                                +gqZGUWiYmugM04fdDhSPeWbutU1AixheBshFe5thQBF5w2MMhZRFT76AbHNFDRD/dnQb/a4pnI9
+                                LgUf1dN/Rz3+Gd1AIg0fC20l4Quf9pk/B4ZDOPzzcPvzlu1nVwr3gSc/D4um2eP5PPz0F4Ybb4nI
+                                5604mDEdDpybIlBnCf7zMdhfjMFSUeXHjzqHDXQS8mOn+P0tyrsRwqNnEjzwMZlZronGWnGcDmmM
+                                6pYK0UFXa3evfaFJGC7mNh6wjWFaIcBN9OCxjWoaFFpyMJx8vCQyOYoyCRdqqT5ygZ3GVO+mtO8m
+                                PUGzx7KBpKhRv2jmLiB8/NIcZ59qo3tv/Rf4zM+seRgjjeeQ6pE/g+Pm2yzifA7uWqV89/o6QaCU
+                                y3DuaR61ejoRNz9hewDuDz7BgQrmiZeou0fZyB08wrl8GOUKlOox0wnWfEJmmljmp4aR+CiP91A/
+                                6Mu6eThyRpPhBG7ntlb38hv25nMsuACjwoxpsOEVZfMW2N5v08DrEXiBUMwLpZJHe5tQKgqFopDL
+                                C0FgY86+7ypXXLsWya4M3tw9ockVq0qDPFaxlCuuRv6QxcIRS4RHf63cvw5ufBQuPtn1f3QNLcIQ
+                                PnoqPLERnthkkWRLDzz8uGHZCR6LFnjcs8oQuqTLrcNw2cmQk0xUbGet33ZUp54tUW5+V5HGLhAt
+                                /qeqeu3DDN/yMnWXtHEdCyjg8W2E8gmz8O+/XGbV6rG27/qQqkjOV73hGcpv/Z72uB6IVSJO4Pa0
+                                MWRLlzMAxwJTuRDlhqRcprlePu6eGZKu9erbqJpfsN25innLdnN5iwhxS7TAcx00nRz3PBdb8iQx
+                                yWTUUzX2bkl7+liLIozggadtGpkfwV2fhePnWySNYVAI4PLr4Jq7wHcLM/gKs6fZ5eJHqg7havCf
+                                l8PvHp721tm75eGZ/gDs+H+FnOGE/8uWh7sJEaZQ5XgK3IOh/IY5BA9eITPLVevHcsikKlDwVP75
+                                fgb/+L91wC0AsJleTuRA6tzwKjGHhnF2U4fKRLzsgB50R3bsTjWqPV+hJAsUL0lS0S+9F/ns220h
+                                qIi1ZgpF+Ieb4bM/oaF3cMPy8sD5h8CNfwC1EAuocUYABXpGTDT/S3STI4fyYzwuQtE3ziN3+0eY
+                                GYbilhm3UTdFtFRU+YMbte9bDzJCQA54gEO5gOdQlu98GhtFwFuBFXyRRawHNjgbtN2BSlIbbteC
+                                Wa8CuqbCgd380MSdQAngtsfh8ZeRS5ZBGKGiSBgKZyyBxXPghgdQgibkc+zimbXw2QtBjajsDIXH
+                                RgSooHx7FUMr1lJHiBAWY/DPOoj8HR9jZq0uKja8ZwPxtmGmXHidbvv3J6jikcdnBSt4Dx3QWurv
+                                OqAax3G0M4N2RphMQCc5CtQoUmcSPp34tBFQwJAnogAUUQrYHrh54r7EfsaRl/IXL0GwV38u01Bt
+                                lo1g2kk7B8O0BZNh9RcptoEnzjUSiOoDLyGnfpkB/KTLLtlI6N+fR/5TZ1DCZFBgjDlAvOZRsU3J
+                                /Ym+EvpJujfnHUb+xg8yvVaTuM2luDRHcgGc+R3dds966ngUEa5hBX/OMbCra4/99vXQmItwJLej
+                                HEadaPUXmXHULPKRiX2jqt1loiM/x5bhaLScn9eJt/7vmFWtiMi4iQAFI/r9NTr8sRt1wLZHQT+w
+                                lNJ1lzC1XLGcLL6YUWv0H/HPunndIAahiPB/WM4/cCjsztKT3m8dAixCWcGZwPfJ037cX7L12vsY
+                                KhQ1aR84s4i/6SpmHzbNtsjNlgi/so3ozueojadLQFU0l1P5/K065LyvesXJtP3wvUwtVxzHJyl/
+                                15EIs/Bq3bxuEEVoI+ITLOcfYPeAP1oH+G0YLwOHAqu4lYW8TI5337SagU3biS44llIYWTnqC/zR
+                                OXQ8so7qM92EeHgIQgDPrKd++Zl0RKE0NKcYCx0gror68eOUf7iKEQx84c10fvltMrlSt5Ru7WSL
+                                wP11MQv/UTdvr2MQOlHex2070/NfbwgA0OO2a3mCg/g5OT788Fpqdz1D9ZJTKGGXi5MwFD50Em2B
+                                DyvXUCFnA+IbthKdcSj5eV34nictE2X2mhKIqBcoJ/2zbjV1+Oo76bryNLpqkSCxA8RpKC8NEC39
+                                CltG0vUF3sKt3LVHcQdeD+MY2pnJKiImTS8hT/8ds9p9BCOCor6v3PkCtXOvZht5q4wumoL3/F/J
+                                rFqYae+5F3UABcQohRxccr32/uhhyj/6kEy56HBtC42T+AZR6+DX57cTHvVPbHEWTBvKKdy65+sM
+                                e68LBJjGMMs5Ao9HtlUJDvo03U9toR54NvUlMiKnLyT/wt8ya3bJ5uC8uIXw2gd12AXV9n7ED1Wj
+                                6J0vafVH9zFy80dl6sVHUgpNEssXBXxRXb2Z2lFfSYAvRBzHkr2zyPTrgwNYB5e1i8/ln4APUaNy
+                                y6eYdtZiipHaaJoa1PPhvK/Ts+JZalQxm7/CnK6c7bCFyl7iAIoa0aqomfpn2v3YZ2Xmki4CIyJq
+                                jFor3wr+RzZRO+UbbHPiKQCOYTmb9hbk/NcNAqwFDgMe5JcspoLPW6+7nb65M/FOOohCZARx0cxL
+                                T6N9SgFueYrajU9Q/uQZdMZm5F7QAVQRPF856+u67f4/lpnz2vFTr77NVgw81V+9TPWMr9HjvJeG
+                                iGMZZjMf3XvT8vpBALCZdQAv8gCLeIQC7//FIwyVQ/StR1GMA0NhXeSkAyj83qmUrrmDkXvWUvvg
+                                ybSFodMG4kKC14AAqlAsIpdfr33Xf1imtXmI5znu4tx7Aty9ntq5/5YAH6oczQFs4+a9LYpez+MM
+                                lpHj51SpfHAZbd//MFPjKJtNUBQtFlQ+9VO2r+8j+o+PMK1STRW03RQBqiLUIrh+NUOXvZHOyjBq
+                                mz+IxBXQvhhd+RLVt3yDbZScxC9zHB49e6bvTyBA63EW8/F5kAhz9hLyt/4xMyplUTEqrrGV5n2V
+                                tdsJr72H4SvPprPoi6CZtad3AQHUKMOhmLXbNTpmluTCUNRFwq0v0KZN6/0btXrmN+lxK4p6DPM7
+                                XEgvfzo2rz+BAB8FXmEude5ByZ08n9xdf8zMKMw4X9UuE1AsqqzdQjivU3zdTQ6gRvE8UWNcJA9V
+                                jEjcONsX1VWbqJ36T7rNpYIpNY5H2DyqCHQCAfbyeCfQTwc+j2IoHD2bYM1fMKtSsRk32dbsSeb0
+                                ztq6v4oVkByOW8Sr6vO9hEuv1q1uIb8iIUtZyStj/ereBPSBG4CAIXK8AY/yo1uIlv4dm31fRVWS
+                                BGiXOtCQ3LSnVKeqummYaOlVusUBPwcsY3DsgT+BANkxBBh68TgGqD7eTXTKVWwulrJuwL0z0rWd
+                                0cE6esRVuoWCXc+BkAtZwbM8ND6vPYEA8bgXuAUQhvE4BQ95qJvwnK+yNR+o7M36YUHVGFQC5fiv
+                                6GbXY6uI8mFWZpO2JxBg/MctwMF0U+MUoHjbs9Q+/hP6ioV0XZM9ZQCKSDGPnPp13bq+Cig54Ovc
+                                yn+N9+v6ExBvMVYBL7Gdg3gan4sfepGROZPxjptP3qYov3ZPoKpIIVA+e5Nu/6lt1iAI93MrH9sX
+                                rzqBADsba3mGRUzC5w03rWHkgydTmlTAc6t6yWtBAFH0F89S+cR/MEDeray8ntOYirIPupdPiICd
+                                jaXArfw52Mrad32L3mIpjdS9FuWvZtCLfqB9FBGgA7iYBRie2zevOIEAOxuPJbN0FYr3682E/7WG
+                                ETWqspu6gIL6wBeW60CU/vOH3MqaV0vdHssx4Qja1XEuPSiVo2fjr/kzZlUrwm56AtUEQvvH9RW6
+                                8BCKVDmMZWzly/vutSY4wK6T8DUAj64jfKmXcDeTRNQT5KrbdICupC/T7dy1b4E/gQC7M0JuROgk
+                                hyx/mupuqgGSz8P3HkpWac3j8Z1snf4EAuzvw2MdhhoB8sTL1Ly0/+4uGP7K5kGitb1JJ6YCy7ll
+                                fF0+EwiwZyMiAkIEXhnE+LLrjaVEhN5hDFW3erDuD6CfQIDdnamFCCUUnT8ZP1R2b5G1bCGaSRLX
+                                JxDgN2YEXAMMMoK+81hKqrveWU4V5nbh5TpcDaTvFnY7YwIB9r9RaNo/m7dyLo+jzKIG7z+Z0mkL
+                                R531KiJApSOH99dvpoMKipLjzfyAMtP29eu+fv0AZwIrM/tn8TvAYeRYSMh8hKUIh6EEKFUq8I0P
+                                0HX5G+ms1mwxd9KObRf9ALmcyE/WMHLJD7WPAA8PH2UrPk8S0YuwDZ8hItbxIjfzIgN8DKwBOoEA
+                                e2+cBgwizODzKO/H4xCUYQzDjFAlgsIk/MXT8JceQO7tR1B43xtoMzVQ48D+WusCIjRfQm5+gvKv
+                                1mp1zSbCrQNEW8pE/SPo4BAGIUc7MzDc6p6vb6y8ha9fDnA2/4xwMba3Pm9aTO6iN1A85kDyh00n
+                                aMvhFX0RT2xvwWQ1lT0uDLHhYDWqOU8kcEu/1yPFKFoJVR/fTP38a+ntjzAIG1nBiWOn2rxeh88p
+                                GCIE79ITKVx7GVPLQ3HXLdvIMjSa5O3uxXQQAfA8kch1RgUUI+IJUvSU0w+icNIBBMttp7B5vJkS
+                                yylPKIF7cxi+DHQBetdaajbZTzOLR2gCrL3IJjV7vcwyeqKggSilIvLJm9i+/HlqwFSUvxkr4L++
+                                RQDAmzkJ5UsIx7dF1P/iPIJzDqftwMn4XQXx2vIIPulaSXETzWyfoubuktq0BSs3YlRSgQhGaqqV
+                                Ktpfw2wYIFqzQWt3v0D1J6sJaKOMcC+Gv+S2vVMEOoEArREAlgNnMJOAN2M4nTJH0caiSUVMZx7a
+                                i8jUIl5XESnlkJxvm0vEExeli19rvBxObPuHrvFlJcSUQxioYsp1qNbRkTo6HKL1Ch4RVfI8RY5H
+                                CFlBxCruZIizgNvHdgr+P1s09m3W5WsJAAAAAElFTkSuQmCC</field>
+      </record>
+
+    </data>
+</openerp>

From 3ad3048ea9c325aa53b428c4ec93dd7f1d0f9ffc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 15:23:44 +0100
Subject: [PATCH 152/547] [IMP] send image message as attachement

bzr revid: mat@openerp.com-20130313142344-00hhvdzcelgs4ptk
---
 addons/gamification/badge.py                      |  5 +++--
 addons/gamification/plan.py                       |  2 --
 addons/gamification/templates/badge_received.mako | 10 ++++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 9ea8a0b572a..de51b7dc019 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -25,6 +25,8 @@ from openerp import tools
 from templates import TemplateHelper
 from datetime import date
 
+import base64
+
 
 class gamification_badge_user(osv.Model):
     """User having received a badge"""
@@ -185,8 +187,6 @@ class gamification_badge(osv.Model):
         res = None
         for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context=context):
             values = {'badge': badge}
-            if badge.image:
-                values['badgeb64'] = badge.image.encode('base64'),
 
             if user_from:
                 values['user_from'] = user_from
@@ -200,6 +200,7 @@ class gamification_badge(osv.Model):
                                     partner_ids=[(4, badge_user.user_id.partner_id.id)],
                                     type='comment',
                                     subtype='mt_comment',
+                                    attachments=[('badge-img', base64.decodestring(badge.image))],
                                     context=context)
 
         return res
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 856c19598ad..367250f1cd9 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -265,7 +265,6 @@ class gamification_goal_plan(osv.Model):
                 self.report_progress(cr, uid, plan, context=context)
                 self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
 
-
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
 
@@ -285,7 +284,6 @@ class gamification_goal_plan(osv.Model):
         Recompute the current value for each goal related"""
         return self._update_all(cr, uid, ids=ids, context=context)
 
-
     def action_close(self, cr, uid, ids, context=None):
         """Close a plan in progress
 
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
index b745a33a9ca..77c110c3ef9 100644
--- a/addons/gamification/templates/badge_received.mako
+++ b/addons/gamification/templates/badge_received.mako
@@ -10,9 +10,11 @@
         % endif
     </p>
 
-	  <p><img src="data:image/png;base64,${badgeb64}" alt="badge ${badge.name}" /></p>
-
-    <p><em>${description}</em></p>
-    
+    % if badge.image
+        <p><img src="cid:badge-img" alt="Badge ${badge.name}" /></p>
+    % endif
+    % if badge.description
+        <p><em>${badge.description}</em></p>
+    % endif
   </body>
 </html>
\ No newline at end of file

From d7af254470cca699c1dc1e4c51928e5274654f1b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 15:51:04 +0100
Subject: [PATCH 153/547] [IMP] default code as working example

bzr revid: mat@openerp.com-20130313145104-90orlzclxw7hqkt2
---
 addons/gamification/badge.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index de51b7dc019..d1ae2064bcd 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -169,6 +169,12 @@ class gamification_badge(osv.Model):
         'stat_this_month': 0,
         'rule_auth': 'everyone',
         'rule_automatic': 'manual',
+        'compute_code': """# Example of python code to execute
+# Use the variable 'result' to store the list of ids that will receive the badge
+from openerp import pooler
+pool = pooler.get_pool(cr.dbname)
+# return the list of ALL users
+result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
     }
 
     def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=None, context=None):

From 53f5b5052267b77c3647070bf9b29c2c07bee98d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 16:11:30 +0100
Subject: [PATCH 154/547] [IMP] show badge list on public profile

bzr revid: mat@openerp.com-20130313151130-5ucd29hhkhrpqi5f
---
 addons/gamification/badge_view.xml    | 29 +++++++++++++++++++++++++++
 addons/hr/hr_view.xml                 |  3 ---
 addons/hr_gamification/badge.py       | 17 ++++++++++++++++
 addons/hr_gamification/badge_view.xml | 13 ++++++++++++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 9ec13682df1..5c8a2c4b559 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -95,5 +95,34 @@
             </field>
         </record>
 
+
+        <record id="badge_kanban_view" model="ir.ui.view" >
+            <field name="name">Badge Kanban View</field>
+            <field name="model">gamification.badge</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_background_grey">
+                    <field name="name"/>
+                    <field name="description"/>
+                    <field name="image"/>
+                    <field name="stat_my"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div tclass="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
+                                <div class="oe_kanban_content">
+                                    <div class="oe_kanban_left">
+                                        <img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" />
+                                    </div>
+                                    <h4><field name="name"/></h4>
+                                    <t t-if="record.description.value">
+                                        <em><field name="description"/></em>
+                                    </t>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4ccb4425f2d..edde367135e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -32,9 +32,6 @@
                             <!-- Put here related buttons -->
                         </div>
                         <notebook>
-                            <page string="Public Profile">
-                                
-                            </page>
                             <page string="Public Information">
                                 <group>
                                     <group string="Contact Information">
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index d1aba7b84f2..2834960f078 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -99,3 +99,20 @@ class hr_grant_badge_wizard(osv.TransientModel):
 
         return {}
 hr_grant_badge_wizard()
+
+
+class hr_employee(osv.osv):
+    _name = "hr.employee"
+    _inherit = "hr.employee"
+
+    def _get_employee_badges(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the list of badges assigned to the employee"""
+        res = {}
+        for employee in self.browse(cr, uid, ids, context=context):
+            badge_users = self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)
+            res[employee.id] = self.pool.get('gamification.badge').search(cr, uid, [('owner_ids', 'in', badge_users)], context=context)
+        return res
+
+    _columns = {
+        'badge_ids': fields.function(_get_employee_badges, type="one2many", obj='gamification.badge', string="Employee Badges")
+    }
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 626e8c2fa8d..210d4aff798 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -22,5 +22,18 @@
 
         <menuitem id="gamification_badge_menu_hr" parent="hr.menu_hr_main" action="gamification.badge_list_action" groups="gamification.group_goal_user" />
 
+
+        <record id="hr_hr_employee_view_form" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+            <xpath expr="//page[@string='Public Information']" position="before">
+                <page string="Public Profile">
+                    <field name="badge_ids" widget="many2many_kanban" />
+                </page>
+            </xpath>
+            </field>
+        </record>
     </data>
 </openerp>

From eeb93dac1abb764852df572cae5cf071671405b4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 16:51:26 +0100
Subject: [PATCH 155/547] [IMP] using .png extension to see image in
 openchatter

bzr revid: mat@openerp.com-20130313155126-wch8en7w8tu9drs0
---
 addons/gamification/badge.py                      | 2 +-
 addons/gamification/templates/badge_received.mako | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index d1ae2064bcd..8abed1e4fc9 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -206,7 +206,7 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
                                     partner_ids=[(4, badge_user.user_id.partner_id.id)],
                                     type='comment',
                                     subtype='mt_comment',
-                                    attachments=[('badge-img', base64.decodestring(badge.image))],
+                                    attachments=[('badge-img.png', base64.decodestring(badge.image))],
                                     context=context)
 
         return res
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
index 77c110c3ef9..d5e25860e4e 100644
--- a/addons/gamification/templates/badge_received.mako
+++ b/addons/gamification/templates/badge_received.mako
@@ -11,7 +11,7 @@
     </p>
 
     % if badge.image
-        <p><img src="cid:badge-img" alt="Badge ${badge.name}" /></p>
+        <p><img src="cid:badge-img.png" alt="Badge ${badge.name}" /></p>
     % endif
     % if badge.description
         <p><em>${badge.description}</em></p>

From 49394a49759fb739f0386727c3f4d38f69ce0efd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 17:04:04 +0100
Subject: [PATCH 156/547] [IMP] move email and phone to top

bzr revid: mat@openerp.com-20130313160404-qxei05n3x8211ak1
---
 addons/hr/hr_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index edde367135e..7883e9929f0 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,6 +27,10 @@
                             </h1>
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
+                            <label for="work_email" class="oe_edit_only"/>
+                            <field name="work_email" widget="email"/>
+                            <label for="work_phone" class="oe_edit_only"/>
+                            <field name="work_phone"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
@@ -36,8 +40,6 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="work_email" widget="email"/>
-                                        <field name="work_phone"/>
                                         <field name="mobile_phone"/>
                                         <field name="work_location"/>
                                     </group>

From b58df69ed6e1b38bd3e2675585fe6928f0f647cf Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 17:42:59 +0100
Subject: [PATCH 157/547] [ADD] base data discovery goal

bzr revid: mat@openerp.com-20130313164259-anlxg6btbkpb7f6n
---
 addons/gamification/__openerp__.py     |  1 +
 addons/gamification/goal_base_data.xml | 39 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 addons/gamification/goal_base_data.xml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 4ada7dfac7f..253a4628416 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -33,6 +33,7 @@
         'cron.xml',
         'security/gamification_security.xml',
         'security/ir.model.access.csv',
+        'goal_base_data.xml',
     ],
     'demo': [
         'badge_demo.xml',
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
new file mode 100644
index 00000000000..bbf43a38d56
--- /dev/null
+++ b/addons/gamification/goal_base_data.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- goal types -->
+        <record model="gamification.goal.type" id="type_base_timezone">
+            <field name="name">Change Timezone</field>
+            <field name="description">Configure your profile and specify your timezone</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="ref('base.model_res_users')" />
+            <field name="field_id" eval="ref('base.field_res_partner_tz')" />
+            <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
+        </record>
+
+
+        <!-- planlines -->
+        <record model="gamification.goal.planline" id="planline_base_discover1">
+            <field name="type_id" eval="ref('type_base_timezone')" />
+            <field name="target_goal">1</field>
+        </record>
+
+
+        <!-- plans -->
+        <record model="gamification.goal.plan" id="plan_base_discover">
+            <field name="name">Discover OpenERP</field>
+            <field name="period">once</field>
+            <field name="visibility_mode">progressbar</field>
+            <field name="report_message_frequency">never</field>
+            <field name="planline_ids" eval="[(4, ref('planline_base_discover1'))]"/>
+        </record>
+
+
+        <!-- link planline -> plan -->
+        <record model="gamification.goal.planline" id="planline_base_discover1">
+            <field name="plan_id" eval="ref('plan_base_discover')" />
+        </record>
+
+    </data>
+</openerp>

From b9f2d689b04375a05d05b6a8f75aa22e12d4e618 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Mar 2013 17:43:25 +0100
Subject: [PATCH 158/547] [FIX] gamification: don't check the date if no
 datefield

bzr revid: mat@openerp.com-20130313164325-wfswwojyrnzygaul
---
 addons/gamification/badge_view.xml | 2 +-
 addons/gamification/goal.py        | 5 +++--
 addons/gamification/plan.py        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 5c8a2c4b559..fd745d1d68c 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -6,7 +6,7 @@
         <record id="badge_list_action" model="ir.actions.act_window">
             <field name="name">Badges</field>
             <field name="res_model">gamification.badge</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,kanban</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a badge. 
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 885524ca8d2..316d848a1dc 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -218,9 +218,9 @@ class gamification_goal(osv.Model):
 
                 domain = safe_eval(goal.type_id.domain,
                                    {'user_id': goal.user_id.id})
-                if goal.start_date:
+                if goal.start_date and field_date_name:
                     domain.append((field_date_name, '>=', goal.start_date))
-                if goal.end_date:
+                if goal.end_date and field_date_name:
                     domain.append((field_date_name, '<=', goal.end_date))
 
                 if goal.type_id.computation_mode == 'sum':
@@ -234,6 +234,7 @@ class gamification_goal(osv.Model):
                         towrite = {'current': 0}
 
                 else:  # computation mode = count
+                    print(uid, domain, type(obj))
                     res = obj.search(cr, uid, domain, context=context)
                     towrite = {'current': len(res)}
 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 367250f1cd9..87f69a44288 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -47,7 +47,7 @@ def start_end_date_for_period(period):
     elif period == 'yearly':
         start_date = today.replace(month=1, day=1)
         end_date = today.replace(month=12, day=31)
-    else: # period == 'once':
+    else:  # period == 'once':
         start_date = False  # for manual goal, start each time
         end_date = False
 

From 5fb909627af5d27796f173cc323217a2c501d806 Mon Sep 17 00:00:00 2001
From: Jagdish Panchal <jap@tinyerp.com>
Date: Thu, 14 Mar 2013 11:55:06 +0530
Subject: [PATCH 159/547] [IMP]hr_recruitment: add working address_id as
 company address and improve kanban view

bzr revid: jap@tinyerp.com-20130314062506-3hnk22rq8gz50sdb
---
 addons/hr_recruitment/hr_recruitment.py       | 7 ++++++-
 addons/hr_recruitment/hr_recruitment_view.xml | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index ff1010a45d5..e212c5c5e6b 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -346,10 +346,12 @@ class hr_applicant(base_stage, osv.Model):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        val = msg.get('from').split('<')[0]
         desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         defaults = {
             'name':  msg.get('subject') or _("No Subject"),
             'description': desc,
+            'partner_name':val,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -429,7 +431,10 @@ class hr_applicant(base_stage, osv.Model):
                 emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or contact_name,
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
-                                                     'department_id': applicant.department_id.id
+                                                     'department_id': applicant.department_id.id,
+                                                     'address_id': applicant.department_id.company_id.id,
+                                                     'work_email': applicant.department_id.company_id.email,
+                                                     'work_phone': applicant.department_id.company_id.phone,
                                                      })
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
                 self.case_close(cr, uid, [applicant.id], context)
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index b6a0bdd4ccf..6c5040045cf 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -254,15 +254,17 @@
                                     <li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
+								                              
                             </div>
                             <div class="oe_kanban_content" tooltip="kanban-tooltip">
                                 <div>
                                     <t t-if="record.partner_name.raw_value"><b><field name="partner_name"/></b><br/></t>
                                     <i><field name="name"/></i><br/>
                                     <field name="job_id"/><br/>
-                                    <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
-                                    <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
                                     <field name="date_action"/>
+                                    <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
+                                    <field name="categ_ids"/><br/>
+                                    <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
                                 </div>
                                 <div class="oe_kanban_right">
                                     <t t-set="priority" t-value="record.priority.raw_value || 5"/>
@@ -284,6 +286,7 @@
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <field name="categ_ids"/>
                                 </div>
+                                
                             </div>
                             <div class="oe_clear"></div>
                         </div>

From bedac40d7e9f24345da9bb8015d09a22ce549cad Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 14 Mar 2013 14:12:21 +0530
Subject: [PATCH 160/547] [IMP]Changed the address_id ,work email and phone

bzr revid: dhr@tinyerp.com-20130314084221-4g6b8x3elwm5oq2j
---
 addons/hr_recruitment/hr_recruitment.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e212c5c5e6b..aedd88c1a15 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -431,10 +431,10 @@ class hr_applicant(base_stage, osv.Model):
                 emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or contact_name,
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
-                                                     'department_id': applicant.department_id.id,
-                                                     'address_id': applicant.department_id.company_id.id,
-                                                     'work_email': applicant.department_id.company_id.email,
-                                                     'work_phone': applicant.department_id.company_id.phone,
+                                                     'department_id': applicant.department_id.id or False,
+                                                     'address_id': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.id or False,
+                                                     'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
+                                                     'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
                                                      })
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
                 self.case_close(cr, uid, [applicant.id], context)

From 1b8027dc9622f61fe2e30c095b708af530816253 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 14 Mar 2013 14:42:30 +0530
Subject: [PATCH 161/547] [IMP]Showing attachment in the kanban as per the
 image in task

bzr revid: dhr@tinyerp.com-20130314091230-5nzifhvt06rkqyms
---
 addons/hr_recruitment/hr_recruitment.py       | 12 ++++++++++++
 addons/hr_recruitment/hr_recruitment_view.xml |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index aedd88c1a15..44f5e42a4e4 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -184,6 +184,16 @@ class hr_applicant(base_stage, osv.Model):
                     duration = float(ans.days)
                     res[issue.id][field] = abs(float(duration))
         return res
+    
+    def _compute_attachments(self, cr, uid, ids, fields, args, context=None):
+        res = {}
+        attachment_pool = self.pool.get('ir.attachment')
+        for issue in self.browse(cr, uid, ids, context=context):
+            res[issue.id] = 0
+            attach = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',issue.id)])
+            if attach:
+                res[issue.id] = len(attach)
+        return res
 
     _columns = {
         'name': fields.char('Subject', size=128, required=True),
@@ -235,6 +245,8 @@ class hr_applicant(base_stage, osv.Model):
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
         'emp_id': fields.many2one('hr.employee', 'employee'),
+        'attachments': fields.function(_compute_attachments, string='Attachments', \
+                                 type="integer"),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ccdaf2d7ed1..89843a3b801 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -290,6 +290,10 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
+                                    <span>
+                                		<span class="oe_e">'</span>
+                                	    <field name="attachments"/>
+                                	</span>
                                 </div>
                                 
                             </div>

From 22c4e54fcdb2d7a25fc1bad59dc5c79a2a569e9d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 10:19:00 +0100
Subject: [PATCH 162/547] [IMP] better comments and avoid double sending for
 list of goals

bzr revid: mat@openerp.com-20130314091900-7avog60d1g5hzcaj
---
 addons/gamification/badge.py | 43 +++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 8abed1e4fc9..e77f1b00988 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -222,7 +222,26 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
         Only badges with an automatic rule specified are checked to be
         granted, other type of badge will be skipped. Send alert messages to
         the one validating the condition.
-        :param ids: the list of id of the badges to check"""
+        :param ids: the list of id of the badges to check
+
+        In case of python code to execute, the code has access to the local
+        variables cr (database cursor), uid (current user id) and context.
+        To access other objects of the database, use a code like :
+            from openerp import pooler
+            pool = pooler.get_pool(cr.dbname)
+            pool.get('object.class.reference').action(...)
+
+        The result should be a list of res.users ids (int) and stored in the
+        local variable 'result' (read after the code execution). A badge_user
+        linked to this badge will be created for each of these users and a
+        notification will be send.
+        Beware that the case of user already having this badge is NOT checked
+        and is the responsability of the python code.
+
+        In case of list of goals to check, the case of a user already having
+        this badge is checked and the user will not receive badge at each run
+        of this method.
+        """
 
         context = context or {}
         badge_user_obj = self.pool.get('gamification.badge.user')
@@ -234,10 +253,8 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
                 code_globals = {}
                 code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
                 exec code_obj in code_globals, code_locals
+
                 if 'result' in code_locals and type(code_locals['result']) == list:
-                    # user_badge_ids = self.pool.get('gamification.badge.user').search(
-                    #     cr, uid, [('user_id', 'in', code_locals['result'])], context=context)
-                    # create badge users for user_id as result of the code
                     user_badge_ids = [
                         badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
                         for user_id in code_locals['result']
@@ -259,10 +276,24 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
                     else:
                         merged_list = [user_id for user_id in users if user_id in common_users]
                         common_users = merged_list
-                # create badge users for common users
+
+                if common_users is None:
+                    # nobody succeeded the goals
+                    continue
+
+                # remove users having already this badge
+                badge_user_not_having = []
+                for user_id in common_users:
+                    badge_user_having = badge_user_obj.search(cr, uid, [
+                        ('user_id', '=', user_id),
+                        ('badge_id', '=', badge.id)], context=context)
+                    if len(badge_user_having) == 0:
+                        badge_user_not_having.append(user_id)
+
+                # create badge users for users deserving the badge
                 user_badge_ids = [
                     badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
-                    for user_id in common_users
+                    for user_id in badge_user_not_having
                 ]
                 self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
 

From dbeb2cade0c632499bf6b886285b03267bd0b458 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 14 Mar 2013 14:51:10 +0530
Subject: [PATCH 163/547] [IMP]Adding manager of the applicant as default to
 invitation on scheduling a meeting

bzr revid: dhr@tinyerp.com-20130314092110-jkaqhmsrzsjd889u
---
 addons/hr_recruitment/hr_recruitment.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 44f5e42a4e4..3c074b4e1ad 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -323,10 +323,15 @@ class hr_applicant(base_stage, osv.Model):
             @return: Dictionary value for created Meeting view
         """
         applicant = self.browse(cr, uid, ids[0], context)
+        applicant_ids = []
+        if applicant.partner_id:
+            applicant_ids.append(applicant.partner_id.id)
+        if applicant.department_id and applicant.department_id.manager_id and applicant.department_id.manager_id.address_id:
+            applicant_ids.append(applicant.department_id.manager_id.address_id.id)
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {
-            'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
+            'default_partner_ids': applicant_ids or False,
             'default_user_id': uid,
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,

From b0623b619dd4c527770aeb8fd94efdbb1d0e617d Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 14 Mar 2013 16:11:57 +0530
Subject: [PATCH 164/547] [IMP]Improved the action for menu Resumes and Letters
 to show hr applicant's attachment

bzr revid: dhr@tinyerp.com-20130314104157-n9x2jt1ve1jhxque
---
 addons/hr_recruitment/__openerp__.py          |  1 +
 addons/hr_recruitment/hr_recruitment_menu.xml | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index e83c546af04..d33bfed6a4d 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -42,6 +42,7 @@ You can define the different phases of interviews and easily rate the applicant
         'base_status',
         'decimal_precision',
         'hr',
+        'document',
         'survey',
         'base_calendar',
         'fetchmail',
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index e86dbce6893..fb10a4f20a0 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -23,6 +23,19 @@
             </field>
         </record>
 
+		<record model="ir.actions.act_window" id="hr_applicant_resumes">
+            <field name="name">Resumes and Letters</field>
+            <field name="res_model">ir.attachment</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="document.view_document_file_tree"/>
+            <field name="domain">[('res_model','=','hr.applicant')]</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                 Search through resumes and motivation letters.
+              </p>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window.view" id="action_hr_sec_kanban_view_act_job">
             <field name="sequence" eval="0"/>
             <field name="view_mode">kanban</field>
@@ -67,7 +80,7 @@
         <menuitem
             name="Resumes and Letters"
             parent="base.menu_crm_case_job_req_main"
-            id="menu_crm_case_categ0_act_job02" action="crm_case_categ0_act_job" sequence="3"/>            
+            id="menu_crm_case_categ0_act_job02" action="hr_applicant_resumes" sequence="3"/>            
     
         <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
 

From df917d317f5869da3f06dc00b2c45554738e3200 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 12:05:29 +0100
Subject: [PATCH 165/547] [ADD] add security rule for badges

bzr revid: mat@openerp.com-20130314110529-pl65an41ds08sazb
---
 .../gamification/security/gamification_security.xml   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 3ec0690531b..d5cf967c1c4 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -39,5 +39,16 @@
             <field name="model_id" ref="model_gamification_goal_plan"/>
             <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
         </record>
+
+        <record id="badge_user_visibility" model="ir.rule">
+            <field name="name">User can only see his/her badges and publics</field>
+            <field name="model_id" ref="model_gamification_badge_user"/>
+            <field name="groups" eval="[(4, ref('group_goal_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">['|',('user_id','=',user.id),('badge_id.public','=',True)]</field>
+        </record>
     </data>
 </openerp>

From 1f5e76f314ab6da0813d866139127ea03ae48f4a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 12:06:49 +0100
Subject: [PATCH 166/547] [IMP] raise warning instead of return false

bzr revid: mat@openerp.com-20130314110649-6hk4g03bkqtpq0on
---
 addons/gamification/badge.py | 12 ++++++------
 addons/gamification/plan.py  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index e77f1b00988..d3a23dd7877 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 from openerp import tools
+from openerp.tools.translate import _
 
 from templates import TemplateHelper
 from datetime import date
@@ -200,7 +201,6 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
                 values['user_from'] = False
             body_html = template_env.get_template('badge_received.mako').render(values)
             context['badge_user'] = badge_user
-
             res = self.message_post(cr, uid, 0,
                                     body=body_html,
                                     partner_ids=[(4, badge_user.user_id.partner_id.id)],
@@ -311,11 +311,11 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
         badge = self.browse(cr, uid, badge_id, context=context)
 
         if badge.rule_auth == 'nobody':
-            return False
+            raise osv.except_osv(_('Warning!'), _('This badge can not be sent by users.'))
 
         elif badge.rule_auth == 'list':
             if user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
-                return False
+                raise osv.except_osv(_('Warning!'), _('You are not in the user allowed list.'))
 
         elif badge.rule_auth == 'having':
             badge_users = self.pool.get('gamification.badge.user').search(
@@ -323,7 +323,7 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
 
             if len(badge_users) == 0:
                 # the user_from has no badges
-                return False
+                raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
 
             owners = [owner.id for owner in badge.owner_ids]
             granted = False
@@ -331,13 +331,13 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
                 if badge_user.id in owners:
                     granted = True
             if not granted:
-                return False
+                raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
 
         # else badge.rule_auth == 'everyone' -> no check
 
         if badge.rule_max and badge.stat_this_month >= badge.rule_max_number:
             # sent the maximum number of time this month
-            return False
+            raise osv.except_osv(_('Warning!'), _('This badge has been already sent too many time this month.'))
 
         return True
 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 87f69a44288..9c218af5a7a 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -313,7 +313,7 @@ class gamification_goal_plan(osv.Model):
         """ This opens goal view with a restriction to the list of goals from this plan only
             @return: the goal view
         """
-        # get ids of related goals 
+        # get ids of related goals
         goal_obj = self.pool.get('gamification.goal')
         related_goal_ids = []
         goal_ids = goal_obj.search(cr, uid, [('plan_id', 'in', ids)], context=context)

From f7693ee66c023a4b4896d34af3b338a311ddd3fa Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 12:24:29 +0100
Subject: [PATCH 167/547] [IMP] no send button if nobody

bzr revid: mat@openerp.com-20130314112429-uopr4o4uxqozsy85
---
 addons/gamification/badge_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index fd745d1d68c..0f70b375cb7 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -64,7 +64,7 @@
                 <form string="Badge" version="7.0">
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight"  />
+                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [('rule_auth', '=', 'nobody')]}" />
                             <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
                         </div>
                         <field name="image" widget='image' class="oe_left oe_avatar"/>

From 09df39578dbdab58dec156a3c171b59a731ab849 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Thu, 14 Mar 2013 17:01:16 +0530
Subject: [PATCH 168/547] [IMP]Search within the content of the resume in the
 search view of an applicant,

bzr revid: dhr@tinyerp.com-20130314113116-lh4v21bm0mt4d9lc
---
 addons/hr_recruitment/hr_recruitment.py       | 13 +++++++++++++
 addons/hr_recruitment/hr_recruitment_view.xml |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3c074b4e1ad..c27f97c27df 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -195,6 +195,17 @@ class hr_applicant(base_stage, osv.Model):
                 res[issue.id] = len(attach)
         return res
 
+    def _get_index_content(self, cr, uid, ids, fields, args, context=None):
+        res = {}
+        attachment_pool = self.pool.get('ir.attachment')
+        for issue in self.browse(cr, uid, ids, context=context):
+            res[issue.id] = 0
+            attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',issue.id)])
+            if attach_id:
+                for attach in attachment_pool.browse(cr, uid, attach_id, context):
+                    res[issue.id] = attach.index_content
+        return res
+
     _columns = {
         'name': fields.char('Subject', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
@@ -247,6 +258,8 @@ class hr_applicant(base_stage, osv.Model):
         'emp_id': fields.many2one('hr.employee', 'employee'),
         'attachments': fields.function(_compute_attachments, string='Attachments', \
                                  type="integer"),
+        'index_content': fields.function(_get_index_content, string='Index Content', \
+                                 type="char",store=True),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 89843a3b801..40c2e7112f2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -58,6 +58,7 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
+                <field name="index_content" invisible="1"/>
                 <field name="state" invisible="1"/>
             </tree>
         </field>
@@ -185,6 +186,7 @@
                 <separator/>
                 <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
+                <field name="index_content" string="Resume Content"/>
                 <field name="job_id"/>
                 <field name="user_id"/>
                 <separator/>

From 7944aed2553ea6d191e11ffce63e703c5bc3f73a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 12:50:25 +0100
Subject: [PATCH 169/547] [FIX] correct domain search

bzr revid: mat@openerp.com-20130314115025-kdxw05brszr32j6b
---
 addons/gamification/badge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index d3a23dd7877..2ba9f5f6c1b 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -98,7 +98,7 @@ class gamification_badge(osv.Model):
         first_month_day = date.today().replace(day=1).isoformat()
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = len(self.pool.get('gamification.badge.user').search(
-                cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)
+                cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid),
                           ('create_date', '>=', first_month_day)], context=context))
         return result
 

From 9f05370cfc6b89d68a46f7d014aa237f12b2766a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 13:01:57 +0100
Subject: [PATCH 170/547] [IMP] remove useless rule auth and better domain

bzr revid: mat@openerp.com-20130314120157-ac8nygcm2p11xu48
---
 addons/gamification/badge_view.xml               | 16 +++++++++++++++-
 .../security/gamification_security.xml           | 12 +-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 0f70b375cb7..f5471beaa58 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -51,6 +51,7 @@
                 <tree string="Badge List"> 
                     <field name="name"/>
                     <field name="stat_count"/>
+                    <field name="stat_this_month"/>
                     <field name="stat_my"/>
                     <field name="rule_auth"/>
                 </tree>
@@ -64,7 +65,13 @@
                 <form string="Badge" version="7.0">
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [('rule_auth', '=', 'nobody')]}" />
+                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
+                                '|',
+                                    ('rule_auth', '=', 'nobody'),
+                                    '&amp;',
+                                        ('rule_max', '=', True),
+                                        ('stat_this_month', '&gt;', 'rule_max_number')
+                                ]}" />
                             <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
                         </div>
                         <field name="image" widget='image' class="oe_left oe_avatar"/>
@@ -90,6 +97,13 @@
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
                             <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
                         </group>
+                        <group string="Stats">
+                            <field name="stat_count"/>
+                            <field name="stat_count_distinct"/>
+                            <field name="stat_this_month"/>
+                            <field name="stat_my"/>
+                            <field name="stat_my_this_month"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index d5cf967c1c4..85e8742c60f 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -18,7 +18,7 @@
         </record>
     </data>
 
-    <data noupdate="1">
+    <data noupdate="0">
         <record id="goal_user_visibility" model="ir.rule">
             <field name="name">User can only see his/her goals</field>
             <field name="model_id" ref="model_gamification_goal"/>
@@ -40,15 +40,5 @@
             <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
         </record>
 
-        <record id="badge_user_visibility" model="ir.rule">
-            <field name="name">User can only see his/her badges and publics</field>
-            <field name="model_id" ref="model_gamification_badge_user"/>
-            <field name="groups" eval="[(4, ref('group_goal_user'))]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">['|',('user_id','=',user.id),('badge_id.public','=',True)]</field>
-        </record>
     </data>
 </openerp>

From c39be93667da42a73a6ea8146fa4ee00c3fee4e8 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 15:24:39 +0100
Subject: [PATCH 171/547] [IMP] small changes

bzr revid: mat@openerp.com-20130314142439-04espxwt7049xzz5
---
 addons/gamification/badge.py                           | 2 ++
 addons/gamification/badge_view.xml                     | 3 ++-
 addons/gamification/security/gamification_security.xml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 2ba9f5f6c1b..2240e4486fa 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -60,6 +60,7 @@ class gamification_badge(osv.Model):
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = len(self.pool.get('gamification.badge.user').search(
                 cr, uid, [('badge_id', '=', obj.id)], context=context))
+            result[obj.id] = len(obj.owner_ids)
         return result
 
     def _get_unique_global_count(self, cr, uid, ids, name, args, context=None):
@@ -154,6 +155,7 @@ class gamification_badge(osv.Model):
         'stat_count_distinct': fields.function(_get_unique_global_count,
             string='Unique Count',
             help="The number of time this badge has been received by individual users."),
+        # TODO store result for working domain stat_this_month >= rule_max_number
         'stat_this_month': fields.function(_get_month_count,
             string='Monthly Count',
             help="The number of time this badge has been received this month."),
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index f5471beaa58..6e7bfa83058 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -70,7 +70,7 @@
                                     ('rule_auth', '=', 'nobody'),
                                     '&amp;',
                                         ('rule_max', '=', True),
-                                        ('stat_this_month', '&gt;', 'rule_max_number')
+                                        ('stat_this_month', '&gt;=', 'rule_max_number')
                                 ]}" />
                             <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
                         </div>
@@ -103,6 +103,7 @@
                             <field name="stat_this_month"/>
                             <field name="stat_my"/>
                             <field name="stat_my_this_month"/>
+                            <field name="owner_ids"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 85e8742c60f..1862961f3e3 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -18,7 +18,7 @@
         </record>
     </data>
 
-    <data noupdate="0">
+    <data noupdate="1">
         <record id="goal_user_visibility" model="ir.rule">
             <field name="name">User can only see his/her goals</field>
             <field name="model_id" ref="model_gamification_goal"/>

From 3dc9d61747a036254722b3e393561c652bd1ec88 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 16:09:55 +0100
Subject: [PATCH 172/547] [IMP] description of module

bzr revid: mat@openerp.com-20130314150955-198nzh4546y5a292
---
 addons/gamification/__openerp__.py | 20 +++++++++++++++++++-
 addons/gamification/badge_view.xml |  1 -
 addons/gamification/plan.py        |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 253a4628416..c01b1a31a90 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -24,7 +24,25 @@
     'author': 'OpenERP SA',
     'category': 'Human Resources',
     'depends': ['mail'],
-    'description': """Gamification of goals""",
+    'description': """
+Gamification process
+====================
+The Gamification module provide ways to evaluate and motivate the users of OpenERP.
+The two main functions are goals and badges.
+
+Goals
+-----
+A **Goal** is an objective applied to an user with a numerical target to reach. It can have starting and end date. Users usually do not create goals but relies on goal plans.
+
+A **Goal Type** is a generic objective that can be applied to any structure stored in the database and use numerical value. The creation of goal types is quite technical and should rarely be done. Once a generic goal is created, it can be associated to several goal plans with different numerical targets.
+
+A **Goal Plan** is a a set of goal types with a target value to reach applied to a group of users. It can be periodic to create and evaluate easily the performances of a team.
+
+Badges
+------
+A **Badge** is a symbolic token granted to a user as a sign of reward. It can be offered by a user to another or automatically offered when some conditions are met. The conditions can either be a list of goal types succeeded or a user definied python code executed.
+
+""",
 
     'data': [
         'plan_view.xml',
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 6e7bfa83058..6157096f585 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -103,7 +103,6 @@
                             <field name="stat_this_month"/>
                             <field name="stat_my"/>
                             <field name="stat_my_this_month"/>
-                            <field name="owner_ids"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 9c218af5a7a..928127446a1 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -35,7 +35,7 @@ def start_end_date_for_period(period):
     today = date.today()
     if period == 'daily':
         start_date = today
-        end_date = start_date # ? + timedelta(days=1)
+        end_date = start_date
     elif period == 'weekly':
         delta = timedelta(days=today.weekday())
         start_date = today - delta

From 85be742b1a506fa16370797f0833ade18e4ca999 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 14 Mar 2013 17:27:35 +0100
Subject: [PATCH 173/547] [ADD] create an employee when create user in group
 Employee

bzr revid: mat@openerp.com-20130314162735-tztyexxl0fe2pxas
---
 addons/hr/__init__.py  |  1 +
 addons/hr/res_users.py | 62 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 addons/hr/res_users.py

diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 02ac7f16fd9..fbd01761f39 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -23,5 +23,6 @@ import hr_department
 import hr
 
 import res_config
+import res_users
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/res_users.py b/addons/hr/res_users.py
new file mode 100644
index 00000000000..db0c634bd9f
--- /dev/null
+++ b/addons/hr/res_users.py
@@ -0,0 +1,62 @@
+from openerp.osv import osv
+
+
+class res_users_employee_group(osv.Model):
+    """ Update of res.users class
+        - if adding groups to an user, check if base.group_user is in it
+        (member of 'Employee'), create an employee form linked to it.
+    """
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    def write(self, cr, uid, ids, vals, context=None):
+        write_res = super(res_users_employee_group, self).write(cr, uid, ids, vals, context=context)
+        if vals.get('groups_id'):
+            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
+            user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4]
+            user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
+
+            (model, group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+            emp_obj = self.pool.get('hr.employee')
+            if group_id in user_group_ids:
+                # base.group_user in it, checking users
+                for user in self.browse(cr, uid, ids, context=context):
+                    if len(emp_obj.search(cr, uid, [('user_id', '=', user.id)], context=context)) == 0:
+                        # no employee already linked to this user, create it
+                        emp_obj.create(cr, uid, {
+                            'user_id': user.id,
+                            'name': user.name,
+                            'image': user.image,
+                        }, context=context)
+        return write_res
+
+
+class res_groups_employee_group(osv.Model):
+    """ Update of res.groups class
+        - if adding users to a group, check if base.group_user and if the case,
+        create a employee profile
+    """
+    _name = 'res.groups'
+    _inherit = 'res.groups'
+
+    def write(self, cr, uid, ids, vals, context=None):
+        write_res = super(res_groups_employee_group, self).write(cr, uid, ids, vals, context=context)
+        (model, group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+
+        # check adding users to base.group_user
+        if vals.get('users') and group_id in ids:
+            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
+            user_ids = [command[1] for command in vals['users'] if command[0] == 4]
+            user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
+
+            emp_obj = self.pool.get('hr.employee')
+            for user_id in user_ids:
+                if len(emp_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)) == 0:
+                    # no employee already linked to this user, create it
+                    user = self.pool.get('res.users').browse(cr, uid, [user_id], context=context)
+                    emp_obj.create(cr, uid, {
+                        'user_id': user.id,
+                        'name': user.name,
+                        'image': user.image,
+                    }, context=context)
+        return write_res

From bb21ba4334ace1a8fbb3295fb483e98275fd6e4f Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Fri, 15 Mar 2013 10:52:37 +0530
Subject: [PATCH 174/547] [IMP]Added demo data for need action(unread email)

bzr revid: dhr@tinyerp.com-20130315052237-wy854vqr64cdzh9z
---
 addons/hr_recruitment/hr_recruitment_demo.xml | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index c15e0deb188..fb54eaab1e3 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -125,5 +125,28 @@
     <record id="hr.job_developer" model="hr.job">
         <field name="survey_id" ref="survey_job_0"/>
     </record>
+
+     <record id="message_application_demo" model="mail.message">
+            <field name="model">hr.applicant</field>
+            <field name="res_id" ref="hr_case_advertisement"/>
+            <field name="body">Please do refer to this application for sure.</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.res_partner_2"/>
+        </record>
+         <record id="msg_case18_aplicant" model="mail.message">
+            <field name="subject">Regarding reference</field>
+            <field name="model">hr.applicant</field>
+            <field name="res_id" ref="hr_case_advertisement"/>
+            <field name="body"><![CDATA[<p>Hello!<br />
+            I will surely refer to this application as it is by your reference and <br />
+            will try to conduct an interview within a very short time<br />
+            Thanks,</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
+        </record>
+       <function model="mail.message" name="set_message_starred"
+            eval="[ ref('msg_case18_aplicant')], True, {}"
+        />
   </data>
-</openerp>
\ No newline at end of file
+</openerp>

From 21e5abe8a289810b172cbf98bd4477d1ad45fe3a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Mar 2013 12:09:38 +0100
Subject: [PATCH 175/547] [ADD] add test data for goal plan

bzr revid: mat@openerp.com-20130315110938-np60znn9ffjiymzc
---
 addons/gamification/__openerp__.py     |  3 ++
 addons/gamification/goal.py            |  1 -
 addons/gamification/plan.py            |  3 +-
 addons/gamification/test/goal_demo.yml | 39 ++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 addons/gamification/test/goal_demo.yml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index c01b1a31a90..8ba96c5e564 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -56,6 +56,9 @@ A **Badge** is a symbolic token granted to a user as a sign of reward. It can be
     'demo': [
         'badge_demo.xml',
     ],
+    'test': [
+        'test/goal_demo.yml'
+    ],
     'installable': True,
     'application': True,
     'css': ['static/src/css/goal.css'],
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 316d848a1dc..de9802c5688 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -234,7 +234,6 @@ class gamification_goal(osv.Model):
                         towrite = {'current': 0}
 
                 else:  # computation mode = count
-                    print(uid, domain, type(obj))
                     res = obj.search(cr, uid, domain, context=context)
                     towrite = {'current': len(res)}
 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 928127446a1..6778083df2a 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -268,7 +268,8 @@ class gamification_goal_plan(osv.Model):
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
 
-        Change the state of the plan to in progress"""
+        Change the state of the plan to in progress and genereate related goals
+        """
         # subscribe users if autojoin group
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
diff --git a/addons/gamification/test/goal_demo.yml b/addons/gamification/test/goal_demo.yml
new file mode 100644
index 00000000000..8499dbf510e
--- /dev/null
+++ b/addons/gamification/test/goal_demo.yml
@@ -0,0 +1,39 @@
+-
+  In order to test process of the Goals, I assign the discovery goal plan to all users
+-
+  !record {model: gamification.goal.plan, id: plan_base_discover}:
+    autojoin_group_id: base.group_user
+-
+  I verify that the users of the group are added (at least admin and demo)
+-
+  !assert {model: gamification.goal.plan, id: plan_base_discover, string: The autojoin function was not successful}:
+    - len(user_ids) >= 2
+-
+  I start the goal plan and verify the change of state
+-
+  !python {model: gamification.goal.plan}: |
+    plan = self.browse(cr, uid, ref('plan_base_discover'))
+    self.action_start(cr, uid, [plan.id], context=context)
+    assert plan.state == 'inprogress', "Plan failed the change of state"
+-
+  I verify the goals are generated correctly
+-
+  !python {model: gamification.goal}: |
+    goal_ids = self.search(cr, uid, [('plan_id', '=', ref('plan_base_discover'))], context=context)
+    assert len(goal_ids) >= 2, "Not enough goals have been generated"
+    for goal in self.browse(cr, uid, goal_ids, context=context):
+      assert goal.state != 'draft', "Draft goal have been generated"
+      assert goal.planline_id.plan_id.id == ref('plan_base_discover'), "Linked planline incorrect"
+-
+  I change timezone for demo user
+-
+  !record {model: res.users, id: base.user_demo}:
+    tz: "Europe/Brussels"
+-
+  I check the goal for demo user is successful
+-
+  !python {model: gamification.goal}: |
+    goal_ids = self.search(cr, uid, [('user_id', '=', ref('base.user_demo'))])
+    self.update(cr, uid, goal_ids, context=context)
+    for goal in self.browse(cr, uid, goal_ids, context=context):
+      assert goal.state == "reached", "Goal not successful %s" % goal.state
\ No newline at end of file

From 98e0e7edc68ce72007596c857041238362536d5f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Mar 2013 13:17:57 +0100
Subject: [PATCH 176/547] [FIX] correct browse for creating employee

bzr revid: mat@openerp.com-20130315121757-2x2sh9fcteuatgj4
---
 addons/hr/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/res_users.py b/addons/hr/res_users.py
index db0c634bd9f..17abfe30f55 100644
--- a/addons/hr/res_users.py
+++ b/addons/hr/res_users.py
@@ -53,7 +53,7 @@ class res_groups_employee_group(osv.Model):
             for user_id in user_ids:
                 if len(emp_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)) == 0:
                     # no employee already linked to this user, create it
-                    user = self.pool.get('res.users').browse(cr, uid, [user_id], context=context)
+                    user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
                     emp_obj.create(cr, uid, {
                         'user_id': user.id,
                         'name': user.name,

From e3e177d5f02cfabcd93af95f1edcf1f59d5e9c32 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Fri, 15 Mar 2013 17:56:06 +0530
Subject: [PATCH 177/547] [IMP]Changed the typo and string in templates

bzr revid: dhr@tinyerp.com-20130315122606-v6arcu6dr978zk8w
---
 addons/hr_recruitment/hr_recruitment_data.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 2a444bcb503..577e77592c6 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -219,9 +219,9 @@
 	<!-- Templates DATA for  refuse and approve -->
 		 
     <record id="email_template_refuse_applicant" model="email.template">
-        <field name="name">For Refuse Application</field>
+        <field name="name">Refuse Application</field>
         <field name="email_from">${object.user.email or ''}</field>
-        <field name="subject">We refuse your Application</field>
+        <field name="subject">We refuse your application</field>
         <field name="email_to">${object.email_from}</field>
         <field name="lang">${object.lang}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
@@ -237,10 +237,10 @@
     </record>
 
     <record id="email_template_approve_applicant" model="email.template">
-        <field name="name">Intrested in Applicastion</field>
+        <field name="name">Interested in Application</field>
         <field name="email_from">${object.user.email or ''}</field>
         <field name="email_to">{object.email_from}</field>
-        <field name="subject">We Intrested in your Application</field>
+        <field name="subject">We are interested in your application</field>
         <field name="lang">${object.lang}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field eval="0" name="user_signature"/>

From 2ae7717edbb5ff9ec78a984da3623be798461e78 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Fri, 15 Mar 2013 18:07:24 +0530
Subject: [PATCH 178/547] [IMP]Changed the partner_id for manager

bzr revid: dhr@tinyerp.com-20130315123724-hv05rkub1agooz6h
---
 addons/hr_recruitment/hr_recruitment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c27f97c27df..38ae03fb2bf 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -339,8 +339,8 @@ class hr_applicant(base_stage, osv.Model):
         applicant_ids = []
         if applicant.partner_id:
             applicant_ids.append(applicant.partner_id.id)
-        if applicant.department_id and applicant.department_id.manager_id and applicant.department_id.manager_id.address_id:
-            applicant_ids.append(applicant.department_id.manager_id.address_id.id)
+        if applicant.department_id and applicant.department_id.manager_id and applicant.department_id.manager_id.user_id and applicant.department_id.manager_id.user_id.partner_id:
+            applicant_ids.append(applicant.department_id.manager_id.user_id.partner_id.id)
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {

From db73be36da7e419bb075031a1e8e8115ba9a1900 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Mar 2013 14:39:29 +0100
Subject: [PATCH 179/547] [IMP] the manager of plan is not added to group

bzr revid: mat@openerp.com-20130315133929-ti40as243kbw115b
---
 addons/gamification/plan.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 6778083df2a..458174a10b6 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -30,7 +30,7 @@ import calendar
 def start_end_date_for_period(period):
     """Return the start and end date for a goal period based on today
 
-    :return (start_date, end_date), datetime.date objects, False if the period is
+    :return: (start_date, end_date), datetime.date objects, False if the period is
     not defined or unknown"""
     today = date.today()
     if period == 'daily':
@@ -71,7 +71,9 @@ class gamification_goal_plan(osv.Model):
 
     def _get_next_report_date(self, cr, uid, ids, field_name, arg, context=None):
         """Return the next report date based on the last report date and report
-        period. Return a string in isoformat."""
+        period.
+
+        :return: a string in isoformat representing the date"""
         res = {}
         for plan in self.browse(cr, uid, ids, context):
             last = datetime.strptime(plan.last_report_date, '%Y-%m-%d').date()
@@ -98,7 +100,7 @@ class gamification_goal_plan(osv.Model):
             string='Users',
             help="List of users to which the goal will be set"),
         'manager_id': fields.many2one('res.users', required=True,
-            string='Manager', help="The user that will be able to access the user goals and modify the plan."),
+            string='Manager', help="The user responsible for the plan."),
         'planline_ids': fields.one2many('gamification.goal.planline',
             'plan_id',
             string='Planline',
@@ -197,11 +199,6 @@ class gamification_goal_plan(osv.Model):
             if new_group:
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
 
-        # add the selected manager to the goal_manager group
-        if 'manager_id' in vals:
-            group_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'group_goal_manager')
-            self.pool.get('res.users').write(cr, uid, [vals['manager_id']], {'groups_id': [(4, group_ref[1])]}, context=context)
-
         return write_res
 
 

From 8c7c72efd3a85fc0547cb258e72b0ed7d1636cb8 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Mar 2013 15:04:22 +0100
Subject: [PATCH 180/547] [IMP] badge demo is now in data and added comment
 field

bzr revid: mat@openerp.com-20130315140422-eh0nhi8bbgbkhahb
---
 addons/gamification/__openerp__.py                     | 4 +---
 addons/gamification/badge.py                           | 5 +++--
 addons/gamification/{badge_demo.xml => badge_data.xml} | 0
 addons/gamification/templates/badge_received.mako      | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename addons/gamification/{badge_demo.xml => badge_data.xml} (100%)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 8ba96c5e564..b8abb625d72 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -52,9 +52,7 @@ A **Badge** is a symbolic token granted to a user as a sign of reward. It can be
         'security/gamification_security.xml',
         'security/ir.model.access.csv',
         'goal_base_data.xml',
-    ],
-    'demo': [
-        'badge_demo.xml',
+        'badge_data.xml',
     ],
     'test': [
         'test/goal_demo.yml'
diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 2240e4486fa..b77d5362f58 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -38,6 +38,7 @@ class gamification_badge_user(osv.Model):
     _columns = {
         'user_id': fields.many2one('res.users', string="User", required=True),
         'badge_id': fields.many2one('gamification.badge', string='Badge'),
+        'comment': fields.text('Comment'),
     }
 
 
@@ -349,6 +350,7 @@ class grant_badge_wizard(osv.TransientModel):
     _columns = {
         'user_id': fields.many2one("res.users", string='User', required=True),
         'badge_id': fields.many2one("gamification.badge", string='Badge'),
+        'comment': fields.text('Comment'),
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
@@ -365,8 +367,7 @@ class grant_badge_wizard(osv.TransientModel):
                                          context=context):
 
                 badge_user = badge_user_obj.create(cr, uid,
-                        {'user_id': wiz.user_id.id, 'badge_id': wiz.badge_id.id}, context=context)
-                #badge_obj.write(cr, uid, [badge.id], {'owner_ids': [(1, badge_user.id)]}, context=context)
+                        {'user_id': wiz.user_id.id, 'badge_id': wiz.badge_id.id, 'comment': wiz.comment}, context=context)
 
                 user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
diff --git a/addons/gamification/badge_demo.xml b/addons/gamification/badge_data.xml
similarity index 100%
rename from addons/gamification/badge_demo.xml
rename to addons/gamification/badge_data.xml
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
index d5e25860e4e..d1b81502c5b 100644
--- a/addons/gamification/templates/badge_received.mako
+++ b/addons/gamification/templates/badge_received.mako
@@ -13,8 +13,8 @@
     % if badge.image
         <p><img src="cid:badge-img.png" alt="Badge ${badge.name}" /></p>
     % endif
-    % if badge.description
-        <p><em>${badge.description}</em></p>
+    % if badge.comment
+        <p><em>${badge.comment}</em></p>
     % endif
   </body>
 </html>
\ No newline at end of file

From 4c70a9c9de088916214ad467f5e311c72711703b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 15 Mar 2013 16:02:30 +0100
Subject: [PATCH 181/547] [IMP] badge kanban clickable and default

bzr revid: mat@openerp.com-20130315150230-czzvf7zw1kq03gpj
---
 addons/gamification/badge_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 6157096f585..e0e4d528b99 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -6,7 +6,7 @@
         <record id="badge_list_action" model="ir.actions.act_window">
             <field name="name">Badges</field>
             <field name="res_model">gamification.badge</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a badge. 
@@ -124,9 +124,9 @@
                             <div tclass="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
-                                        <img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" />
+                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" /></a>
                                     </div>
-                                    <h4><field name="name"/></h4>
+                                    <h4><a type="open"><field name="name"/></a></h4>
                                     <t t-if="record.description.value">
                                         <em><field name="description"/></em>
                                     </t>

From 0306b355d0e6460712d7b5ccba319ae64e892c14 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (Open ERP)" <dhr@tinyerp.com>
Date: Mon, 18 Mar 2013 11:50:44 +0530
Subject: [PATCH 182/547] [IMP]Improved the demo data for template to send mail
 and now mails are sent when Refuse application or Contract signed

bzr revid: dhr@tinyerp.com-20130318062044-0qmp56vibva2fcra
---
 addons/hr_recruitment/hr_recruitment.py       | 23 ++++++++++++++++++-
 addons/hr_recruitment/hr_recruitment_data.xml |  6 ++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 38ae03fb2bf..0710b3e22bd 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -442,6 +442,11 @@ class hr_applicant(base_stage, osv.Model):
 
     def case_close(self, cr, uid, ids, context=None):
         res = super(hr_applicant, self).case_close(cr, uid, ids, context)
+        try:
+            template = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_approve_applicant')
+        except ValueError:
+            pass
+        self._get_mail_template(cr, uid, ids, template, context)
         return res
 
     def case_close_with_emp(self, cr, uid, ids, context=None):
@@ -483,8 +488,24 @@ class hr_applicant(base_stage, osv.Model):
         """
         res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
         self.write(cr, uid, ids, {'probability': 0.0})
+        template = False
+        try:
+            template = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_refuse_applicant')
+        except ValueError:
+            pass
+        self._get_mail_template(cr, uid, ids, template, context)
         return res
-
+    
+    def _get_mail_template(self, cr, uid, ids, template, context):
+        mail_obj = self.pool.get('mail.mail')
+        assert template._name == 'email.template'
+        for applications in self.browse(cr, uid, ids, context):
+            if applications.email_from:
+                mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, applications.id, True, context=context)
+                mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context)
+                if mail_state and mail_state['state'] == 'exception':
+                    raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context)
+    
     def case_pending(self, cr, uid, ids, context=None):
         """Marks case as pending"""
         res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 577e77592c6..50e19bb7d69 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -220,7 +220,7 @@
 		 
     <record id="email_template_refuse_applicant" model="email.template">
         <field name="name">Refuse Application</field>
-        <field name="email_from">${object.user.email or ''}</field>
+        <field name="email_from">${user.email or ''}</field>
         <field name="subject">We refuse your application</field>
         <field name="email_to">${object.email_from}</field>
         <field name="lang">${object.lang}</field>
@@ -238,8 +238,8 @@
 
     <record id="email_template_approve_applicant" model="email.template">
         <field name="name">Interested in Application</field>
-        <field name="email_from">${object.user.email or ''}</field>
-        <field name="email_to">{object.email_from}</field>
+        <field name="email_from">${user.email or ''}</field>
+        <field name="email_to">${object.email_from}</field>
         <field name="subject">We are interested in your application</field>
         <field name="lang">${object.lang}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>

From 7744fadcb965de6c9aa325fc601f67b81f9f0690 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 10:21:30 +0100
Subject: [PATCH 183/547] [IMP] move button and add images

bzr revid: mat@openerp.com-20130318092130-f7r2618wtqkb9b3c
---
 addons/gamification/badge_view.xml    | 36 +++++++++++++++++++--------
 addons/hr/hr.py                       |  2 +-
 addons/hr_gamification/badge_view.xml |  2 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index e0e4d528b99..9ccfbf001e0 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -63,17 +63,17 @@
             <field name="model">gamification.badge</field>
             <field name="arch" type="xml">
                 <form string="Badge" version="7.0">
+                    <header>
+                        <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
+                            '|',
+                                ('rule_auth', '=', 'nobody'),
+                                '&amp;',
+                                    ('rule_max', '=', True),
+                                    ('stat_this_month', '&gt;=', 'rule_max_number')
+                            ]}" />
+                        <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
+                    </header>
                     <sheet>
-                        <div class="oe_right oe_button_box">
-                            <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
-                                '|',
-                                    ('rule_auth', '=', 'nobody'),
-                                    '&amp;',
-                                        ('rule_max', '=', True),
-                                        ('stat_this_month', '&gt;=', 'rule_max_number')
-                                ]}" />
-                            <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
-                        </div>
                         <field name="image" widget='image' class="oe_left oe_avatar"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
@@ -119,6 +119,8 @@
                     <field name="description"/>
                     <field name="image"/>
                     <field name="stat_my"/>
+                    <field name="stat_count"/>
+                    <field name="stat_count_distinct"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div tclass="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
@@ -126,10 +128,22 @@
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" /></a>
                                     </div>
-                                    <h4><a type="open"><field name="name"/></a></h4>
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                        <t t-if="record.stat_my.value"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
+WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htF
+FIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLm
+wOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV
+5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWm
+BR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2
+SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7mypr
+vrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7K
+jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t>
+                                    </h4>
                                     <t t-if="record.description.value">
                                         <em><field name="description"/></em>
                                     </t>
+                                    <p>Granted <t t-esc="record.stat_count.raw_value" />x (<t t-esc="record.stat_count_distinct.raw_value"/> pers.)</p>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 315a3306d15..eb094a7e88f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -299,7 +299,7 @@ class hr_employee(osv.osv):
                     res = super(hr_employee, self).message_post(cr, uid, employee_id, context=context, **kwargs)
                 return res
             else:
-                raise osv.except_osv('Warning!', 'You need to be an employee to send messages to your followers.')
+                raise osv.except_osv('Warning!', 'Your user is not linked to an employee form, which is required to send messages to your followers.')
 
         # if no overwrite, send message as usual
         return super(hr_employee, self).message_post(cr, uid, thread_id, context=context, **kwargs)
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 210d4aff798..3ea87d54bf3 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -29,7 +29,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
             <xpath expr="//page[@string='Public Information']" position="before">
-                <page string="Public Profile">
+                <page string="Badges">
                     <field name="badge_ids" widget="many2many_kanban" />
                 </page>
             </xpath>

From 1db95b244c5c88c20f348b73e4e8df8ec67eb4d7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 13:46:20 +0100
Subject: [PATCH 184/547] [ADD] use badge user views with comment

bzr revid: mat@openerp.com-20130318124620-gm17hn75lz9i4ohk
---
 addons/gamification/badge.py                  |  9 +++--
 addons/gamification/badge_view.xml            | 37 ++++++++++++++++++-
 .../templates/badge_received.mako             | 10 ++---
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index b77d5362f58..ab3bdb81c12 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -37,8 +37,12 @@ class gamification_badge_user(osv.Model):
 
     _columns = {
         'user_id': fields.many2one('res.users', string="User", required=True),
-        'badge_id': fields.many2one('gamification.badge', string='Badge'),
+        'badge_id': fields.many2one('gamification.badge', string='Badge', required=True),
         'comment': fields.text('Comment'),
+
+        'badge_name': fields.related('badge_id', 'name', type="char", string="Badge Name"),
+        'create_date': fields.datetime('Created', readonly=True),
+        'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
     }
 
 
@@ -196,14 +200,13 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
 
         res = None
         for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context=context):
-            values = {'badge': badge}
+            values = {'badge_user': badge_user}
 
             if user_from:
                 values['user_from'] = user_from
             else:
                 values['user_from'] = False
             body_html = template_env.get_template('badge_received.mako').render(values)
-            context['badge_user'] = badge_user
             res = self.message_post(cr, uid, 0,
                                     body=body_html,
                                     partner_ids=[(4, badge_user.user_id.partner_id.id)],
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 9ccfbf001e0..2c5d4084bcc 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <!-- Goal views -->
+        <!-- Badge views -->
         <record id="badge_list_action" model="ir.actions.act_window">
             <field name="name">Badges</field>
             <field name="res_model">gamification.badge</field>
@@ -28,6 +28,7 @@
                     <group>
                         <field name="user_id" />
                         <field name="badge_id" invisible="1"/>
+                        <field name="comment" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -152,5 +153,39 @@ jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t>
             </field>
         </record>
 
+
+        <!-- Badge user viewss -->
+
+        <record id="badge_user_kanban_view" model="ir.ui.view" >
+            <field name="name">Badge User Kanban View</field>
+            <field name="model">gamification.badge.user</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_background_grey">
+                    <field name="badge_name"/>
+                    <field name="badge_id"/>
+                    <field name="user_id"/>
+                    <field name="comment"/>
+                    <field name="create_date"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div tclass="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
+                                <div class="oe_kanban_content">
+                                    <div class="oe_kanban_left">
+                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.badge_id.raw_value)" t-att-title="record.badge_name.value" width="24" height="24" /></a>
+                                    </div>
+                                    <h4>
+                                        <a type="open"><t t-esc="record.badge_name.raw_value" /></a>
+                                    </h4>
+                                    <t t-if="record.comment.raw_value">
+                                        <em><field name="comment"/></em>
+                                    </t>
+                                    Sent by <a type="open"><field name="create_uid" /> the <t t-esc="record.create_date.raw_value.toString(Date.CultureInfo.formatPatterns.shortDate)" /></a>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
index d1b81502c5b..802590f9e59 100644
--- a/addons/gamification/templates/badge_received.mako
+++ b/addons/gamification/templates/badge_received.mako
@@ -4,17 +4,17 @@
     <style type="text_css">${css}</style>
   </head>
   <body>
-    <p>Congratulation, you have received the badge <strong>${badge.name}</strong> !
+    <p>Congratulation, you have received the badge <strong>${badge_user.badge_id.name}</strong> !
         % if user_from
             This badge was granted by <strong>${user_from.name}</strong>.
         % endif
     </p>
 
-    % if badge.image
-        <p><img src="cid:badge-img.png" alt="Badge ${badge.name}" /></p>
+    % if badge_user.badge_id.image
+        <p><img src="cid:badge-img.png" alt="Badge ${badge_user.badge_id.name}" /></p>
     % endif
-    % if badge.comment
-        <p><em>${badge.comment}</em></p>
+    % if badge_user.comment
+        <p><em>${badge_user.comment}</em></p>
     % endif
   </body>
 </html>
\ No newline at end of file

From 36d9ebf0be76eb3094c0af83189aee878c7b82fd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 13:48:14 +0100
Subject: [PATCH 185/547] [IMP] use badge users with comments

bzr revid: mat@openerp.com-20130318124814-uongwh7wj9toft0z
---
 addons/hr_gamification/badge.py       | 14 +++++++++-----
 addons/hr_gamification/badge_view.xml |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 2834960f078..a278f42d49f 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 
 class hr_gamification_badge_user(osv.Model):
@@ -70,6 +71,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
                                   type="many2one", relation="res.users",
                                   store=True, string='User'),
         'badge_id': fields.many2one("gamification.badge", string='Badge'),
+        'comment': fields.text('Comment'),
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
@@ -80,6 +82,9 @@ class hr_grant_badge_wizard(osv.TransientModel):
         badge_user_obj = self.pool.get('gamification.badge.user')
 
         for wiz in self.browse(cr, uid, ids, context=context):
+            if not wiz.user_id:
+                raise osv.except_osv(_('Warning!'), _('You can send badges only to employees linked to a user.'))
+
             if badge_obj.can_grant_badge(cr, uid,
                                          user_from_id=uid,
                                          badge_id=wiz.badge_id.id,
@@ -89,9 +94,9 @@ class hr_grant_badge_wizard(osv.TransientModel):
                     'user_id': wiz.user_id.id,
                     'badge_id': wiz.badge_id.id,
                     'employee_id': wiz.employee_id.id,
+                    'comment': wiz.comment,
                 }
                 badge_user = badge_user_obj.create(cr, uid, values, context=context)
-                #badge_obj.write(cr, uid, [badge.id], {'owner_ids': [(1, badge_user.id)]}, context=context)
 
                 user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
@@ -106,13 +111,12 @@ class hr_employee(osv.osv):
     _inherit = "hr.employee"
 
     def _get_employee_badges(self, cr, uid, ids, field_name, arg, context=None):
-        """Return the list of badges assigned to the employee"""
+        """Return the list of badge_users assigned to the employee"""
         res = {}
         for employee in self.browse(cr, uid, ids, context=context):
-            badge_users = self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)
-            res[employee.id] = self.pool.get('gamification.badge').search(cr, uid, [('owner_ids', 'in', badge_users)], context=context)
+            res[employee.id] = self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)
         return res
 
     _columns = {
-        'badge_ids': fields.function(_get_employee_badges, type="one2many", obj='gamification.badge', string="Employee Badges")
+        'badge_ids': fields.function(_get_employee_badges, type="one2many", obj='gamification.badge.user', string="Employee Badges")
     }
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 3ea87d54bf3..38f5a0fd0a0 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -11,6 +11,7 @@
                     <group>
                         <field name="employee_id" />
                         <field name="badge_id" invisible="1"/>
+                        <field name="comment" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -29,7 +30,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
             <xpath expr="//page[@string='Public Information']" position="before">
-                <page string="Badges">
+                <page string="Received Badges">
                     <field name="badge_ids" widget="many2many_kanban" />
                 </page>
             </xpath>

From bcc5a497c4790de0d7281095b5e00926ccec05d7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 14:04:09 +0100
Subject: [PATCH 186/547] [ADD] hide limited field if nobody can send

bzr revid: mat@openerp.com-20130318130409-80b1wzyih9ug767o
---
 addons/gamification/badge_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 2c5d4084bcc..002424168ce 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -90,7 +90,7 @@
                             <field name="rule_auth" string="Allowed to Grant" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
-                            <field name="rule_max"/>
+                            <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
                             <field name="rule_max_number" attrs="{'invisible': [('rule_max','=',False)]}"/>
                         </group>
                         <group string="Automatic Rules">

From bdde088d085b71f59f57c246da9aab40882bb6df Mon Sep 17 00:00:00 2001
From: "Ravi Gohil (OpenERP)" <rgo@tinyerp.com>
Date: Mon, 18 Mar 2013 19:03:38 +0530
Subject: [PATCH 187/547] [FIX] re-importing the translation from a file(.csv,
 .xml) updates the terms in ir_translation table but does not update it in
 cache memory, need a server restart to take those change effect in interface.
 (Maintenance Case: 587178)

bzr revid: rgo@tinyerp.com-20130318133338-djkx3ykbkitvbzeb
---
 openerp/tools/translate.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index f1efbc17f2d..d4ce543ed42 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -1000,6 +1000,7 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True,
             irt_cursor.push(dic)
 
         irt_cursor.finish()
+        trans_obj.clear_caches()
         if verbose:
             _logger.info("translation file loaded succesfully")
     except IOError:

From aed261c7073f1d8266cc557173a0e5e74cfefd30 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 15:14:14 +0100
Subject: [PATCH 188/547] [IMP] verify email before creating employee

bzr revid: mat@openerp.com-20130318141414-s9t7sy60bq4p0mhz
---
 addons/hr/hr.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index eb094a7e88f..82f8f908269 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -23,6 +23,8 @@ from openerp import addons
 import logging
 from openerp.osv import fields, osv
 from openerp import tools
+from openerp.tools.translate import _
+
 _logger = logging.getLogger(__name__)
 
 class hr_employee_category(osv.osv):
@@ -216,6 +218,26 @@ class hr_employee(osv.osv):
     _order='name_related'
 
     def create(self, cr, uid, data, context=None):
+        # verify do not have two employee with the same email
+        if 'work_email' in data:
+            user_ids = self.pool.get('res.users').search(cr, uid, [('email', '=', data['work_email'])], context=context)
+            if len(user_ids) > 0:
+                if 'user_id' not in data:
+                    raise osv.except_osv(_('Warning!'), _('You are trying to create an employee with an email already linked to an user. Please linked the employee to it or change the email.'))
+                elif data['user_id'] not in user_ids:
+                    raise osv.except_osv(_('Warning!'), _('You are trying to create an employee with an email different than the one of the linked user.'))
+                # else user and email match
+            else:
+                # employee has an email but not the user
+                # TOCHECK update user ?
+                pass
+        elif 'user_id' in data:
+            user = self.pool.get('res.users').browse(cr, uid, data['user_id'], context=context)
+            if user.email:
+                # employee has no email but the user does
+                # TOCHECK raise error ?
+                pass
+
         employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
         try:
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
@@ -224,7 +246,8 @@ class hr_employee(osv.osv):
                 body='Welcome to %s! Please help them take the first steps with OpenERP!' % (employee.name),
                 subtype='mail.mt_comment', context=context)
         except:
-            pass # group deleted: do not push a message
+            pass  # group deleted: do not push a message
+
         return employee_id
 
     def unlink(self, cr, uid, ids, context=None):

From 2cff801d1e4db702f3928a6b2dc0085837f97e7e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 15:14:57 +0100
Subject: [PATCH 189/547] [IMP] send badge from employee profile

bzr revid: mat@openerp.com-20130318141457-amz13k27718i9cqi
---
 addons/gamification/badge.py          | 15 +++++++--
 addons/gamification/badge_view.xml    |  4 +--
 addons/hr_gamification/badge.py       |  4 +++
 addons/hr_gamification/badge_view.xml | 45 ++++++++++++++++++++++++---
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index ab3bdb81c12..a209eaf822d 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -45,6 +45,8 @@ class gamification_badge_user(osv.Model):
         'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
     }
 
+    _order = "create_date desc"
+
 
 class gamification_badge(osv.Model):
     """Badge object that users can send and receive"""
@@ -357,6 +359,7 @@ class grant_badge_wizard(osv.TransientModel):
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
+        """Wizard action for sending a badge to a chosen user"""
         if context is None:
             context = {}
 
@@ -364,13 +367,19 @@ class grant_badge_wizard(osv.TransientModel):
         badge_user_obj = self.pool.get('gamification.badge.user')
 
         for wiz in self.browse(cr, uid, ids, context=context):
+            if uid == wiz.user_id.id:
+                raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
+
             if badge_obj.can_grant_badge(cr, uid,
                                          user_from_id=uid,
                                          badge_id=wiz.badge_id.id,
                                          context=context):
-
-                badge_user = badge_user_obj.create(cr, uid,
-                        {'user_id': wiz.user_id.id, 'badge_id': wiz.badge_id.id, 'comment': wiz.comment}, context=context)
+                values = {
+                    'user_id': wiz.user_id.id,
+                    'badge_id': wiz.badge_id.id,
+                    'comment': wiz.comment,
+                }
+                badge_user = badge_user_obj.create(cr, uid, values, context=context)
 
                 user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 002424168ce..0a7e32769d4 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -177,9 +177,9 @@ jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t>
                                         <a type="open"><t t-esc="record.badge_name.raw_value" /></a>
                                     </h4>
                                     <t t-if="record.comment.raw_value">
-                                        <em><field name="comment"/></em>
+                                        <p><em><field name="comment"/></em></p>
                                     </t>
-                                    Sent by <a type="open"><field name="create_uid" /> the <t t-esc="record.create_date.raw_value.toString(Date.CultureInfo.formatPatterns.shortDate)" /></a>
+                                    <p>Sent by <a type="open"><field name="create_uid" /></a> the <t t-esc="record.create_date.raw_value.toString(Date.CultureInfo.formatPatterns.shortDate)" /></p>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index a278f42d49f..aacac358e27 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -75,6 +75,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
+        """Wizard action for sending a badge to a chosen employee"""
         if context is None:
             context = {}
 
@@ -85,6 +86,9 @@ class hr_grant_badge_wizard(osv.TransientModel):
             if not wiz.user_id:
                 raise osv.except_osv(_('Warning!'), _('You can send badges only to employees linked to a user.'))
 
+            if uid == wiz.user_id.id:
+                raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
+
             if badge_obj.can_grant_badge(cr, uid,
                                          user_from_id=uid,
                                          badge_id=wiz.badge_id.id,
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 38f5a0fd0a0..57557cf63ed 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+        <!-- Wizard -->
+
         <record id="gamification.view_badge_wizard_grant" model="ir.ui.view">
             <field name="name">Grant Badge Employee Form</field>
             <field name="model">gamification.badge.user.wizard</field>
@@ -24,16 +26,49 @@
         <menuitem id="gamification_badge_menu_hr" parent="hr.menu_hr_main" action="gamification.badge_list_action" groups="gamification.group_goal_user" />
 
 
+        <record id="gamification.view_badge_wizard_reward" model="ir.ui.view">
+            <field name="name">Reward Employee Badge Form</field>
+            <field name="model">gamification.badge.user.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Reward Employee with" version="7.0">
+                    Select the badge that the employee will receive
+                    <group>
+                        <field name="employee_id" invisible="1" />
+                        <field name="badge_id" />
+                        <field name="comment" />
+                    </group>
+                    <footer>
+                        <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <act_window domain="[]" id="action_reward_wizard"
+            name="Reward Employee"
+            target="new"
+            res_model="gamification.badge.user.wizard"
+            context="{'default_employee_id': active_id, 'employee_id': active_id}"
+            view_type="form" view_mode="form"/>
+
+
+
+        <!-- HR Employee -->
+
         <record id="hr_hr_employee_view_form" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-            <xpath expr="//page[@string='Public Information']" position="before">
-                <page string="Received Badges">
-                    <field name="badge_ids" widget="many2many_kanban" />
-                </page>
-            </xpath>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button string="Send Reward" type="action" name="%(action_reward_wizard)d" />
+                </xpath>
+                <xpath expr="//page[@string='Public Information']" position="before">
+                    <page string="Received Badges">
+                        <field name="badge_ids" widget="many2many_kanban" />
+                    </page>
+                </xpath>
             </field>
         </record>
     </data>

From 4f723dba7f99bd80f3f29eaba114f7238efd5349 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 16:00:07 +0100
Subject: [PATCH 190/547] [IMP] menu and group by

bzr revid: mat@openerp.com-20130318150007-egx399cn4nybu7s8
---
 addons/gamification/goal_view.xml           | 4 ++--
 addons/gamification/plan.py                 | 2 +-
 addons/gamification/plan_view.xml           | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml | 9 +++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index d1fa5673a0d..9d2084349e6 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -116,8 +116,8 @@
                     <field name="user_id"/>
                     <field name="type_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Goal Type" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter name="group_by_user" string="User" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter name="group_by_type" string="Goal Type" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="End Date" domain="[]" context="{'group_by':'end_date'}"/>
                     </group>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 458174a10b6..31cf10e6779 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -326,7 +326,7 @@ class gamification_goal_plan(osv.Model):
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'gamification','goals_from_plan_act', context=context)
         res['context'] = context
         res['context'].update({
-            'default_id': related_goal_ids
+            'default_id': related_goal_ids,
         })
         res['domain'] = [('id','in', related_goal_ids)]
         return res
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 2c09f383051..44a9178d979 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -63,7 +63,7 @@
 
                         <!-- action buttons -->
                         <div class="oe_right oe_button_box">
-                            <button name="action_show_related_goals" type="object" string="Related Goals" help="show all the generated goals for this plan" context="{'group_by':'user_id'}"/>
+                            <button name="action_show_related_goals" type="object" string="Related Goals" help="show all the generated goals for this plan" context="{'search_default_group_by_user': True}" />
                         </div>
 
                         <group>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index df3eb6f1790..d835171d63d 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -413,9 +413,18 @@
             <field name="act_window_id" ref="action_hr_evaluation_interview_tree"/>
         </record>
 
+        <record id="goals_menu_groupby_act" model="ir.actions.act_window">
+            <field name="res_model">gamification.goal</field>
+            <field name="view_type">form</field>
+            <field name="name">Related Goals</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{'search_default_group_by_type': True}</field>
+        </record>
+
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
         <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager" />
+        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="gamification.group_goal_manager"/>
 
       <!-- Email Compose message Action-->
       <act_window

From 4ef547fd34e13b78294a83fc2f2500021fe1ad6c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 17:40:36 +0100
Subject: [PATCH 191/547] [IMP] use safe_eval for code execution

bzr revid: mat@openerp.com-20130318164036-dhsbs1e3m22iphfh
---
 addons/gamification/__init__.py      |  1 +
 addons/gamification/badge.py         | 44 ++++++++++++++--------------
 addons/gamification/badge_execute.py | 16 ++++++++++
 3 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 addons/gamification/badge_execute.py

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index b7f7efeac07..845af643db1 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -2,3 +2,4 @@ import goal
 import plan
 import res_users
 import badge
+import badge_execute
diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index a209eaf822d..c299cacd799 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -22,6 +22,7 @@
 from openerp.osv import fields, osv
 from openerp import tools
 from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
 
 from templates import TemplateHelper
 from datetime import date
@@ -146,8 +147,8 @@ class gamification_badge(osv.Model):
             help="Can this badge be automatically rewarded",
             required=True),
 
-        'compute_code': fields.text('Compute Code',
-            help="The python code that will be executed to verify if a user can receive this badge."),
+        'compute_code': fields.char('Compute Code',
+            help="The name of the python method that will be executed to verify if a user can receive this badge."),
         'goal_type_ids': fields.many2many('gamification.goal.type',
             string='Goals Linked',
             help="The users that have succeeded theses goals will receive automatically the badge."),
@@ -179,12 +180,7 @@ class gamification_badge(osv.Model):
         'stat_this_month': 0,
         'rule_auth': 'everyone',
         'rule_automatic': 'manual',
-        'compute_code': """# Example of python code to execute
-# Use the variable 'result' to store the list of ids that will receive the badge
-from openerp import pooler
-pool = pooler.get_pool(cr.dbname)
-# return the list of ALL users
-result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
+        'compute_code': "self.nobody(cr, uid, context)",
     }
 
     def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=None, context=None):
@@ -232,15 +228,14 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
         the one validating the condition.
         :param ids: the list of id of the badges to check
 
-        In case of python code to execute, the code has access to the local
-        variables cr (database cursor), uid (current user id) and context.
-        To access other objects of the database, use a code like :
-            from openerp import pooler
-            pool = pooler.get_pool(cr.dbname)
-            pool.get('object.class.reference').action(...)
+        In case of python code to execute, the user should input the name of
+        the function that will be excuted through safe_eval. The globals
+        variables available are cr (database cursor), uid (current user id)
+        and context.
 
-        The result should be a list of res.users ids (int) and stored in the
-        local variable 'result' (read after the code execution). A badge_user
+        To create new functions in different modules, create a class extending
+        the 'gamification.badge.execute' class and implementing this method. The result
+        of the function should be a list of res.users ids (int). A badge_user
         linked to this badge will be created for each of these users and a
         notification will be send.
         Beware that the case of user already having this badge is NOT checked
@@ -257,17 +252,22 @@ result = pool.get('res.users').search(cr, uid, domain=[], context=context)""",
         for badge in self.browse(cr, uid, ids, context=context):
 
             if badge.rule_automatic == 'python':
-                code_obj = compile(badge.compute_code, '<string>', 'exec')
-                code_globals = {}
-                code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
-                exec code_obj in code_globals, code_locals
+                values = {'cr': cr, 'uid': uid, 'context': context, 'self': self.pool.get('gamification.badge.execute')}
+                result = safe_eval(badge.compute_code, values, {})
 
-                if 'result' in code_locals and type(code_locals['result']) == list:
+                # code_obj = compile(badge.compute_code, '<string>', 'exec')
+                # code_globals = {}
+                # code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
+                # exec code_obj in code_globals, code_locals
+                print(result)
+                if type(result) == list:
                     user_badge_ids = [
                         badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
-                        for user_id in code_locals['result']
+                        for user_id in result
                     ]
                     self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
+                else:
+                    raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(badge.compute_code)))
 
             elif badge.rule_automatic == 'goals':
                 common_users = None
diff --git a/addons/gamification/badge_execute.py b/addons/gamification/badge_execute.py
new file mode 100644
index 00000000000..a851bfbb81a
--- /dev/null
+++ b/addons/gamification/badge_execute.py
@@ -0,0 +1,16 @@
+from openerp.osv import osv
+
+
+class gamification_badge_execute(osv.Model):
+    """Class that contains the methods to execute for badge granting"""
+
+    _name = 'gamification.badge.execute'
+    _description = 'Gamification Badge Execute'
+
+    def nobody(self, cr, uid, context):
+        """Return an empty list of users"""
+        return []
+
+    def everybody(self, cr, uid, context):
+        """Return the id of every user"""
+        return self.pool.get('res.users').search(cr, uid, [], context=context)

From fb2ad80b6906938386b60400869c9a7517aa9290 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 18 Mar 2013 18:17:19 +0100
Subject: [PATCH 192/547] [ADD] more complexe examples of
 gamification.badge.execute methods

bzr revid: mat@openerp.com-20130318171719-un1qfvbyjz33cymt
---
 addons/gamification/badge_data.xml   |  2 +-
 addons/gamification/badge_execute.py | 30 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index de8d9d2b486..76a09266441 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="badge" model="gamification.badge">
+        <record id="badge_good_job" model="gamification.badge">
             <field name="name">Good Job Reward</field>
             <field name="description">Send this badge to people you believe did a good job and deserve a reward.</field>
             <field name="rule_auth">everyone</field>
diff --git a/addons/gamification/badge_execute.py b/addons/gamification/badge_execute.py
index a851bfbb81a..8f0ecf997f1 100644
--- a/addons/gamification/badge_execute.py
+++ b/addons/gamification/badge_execute.py
@@ -1,4 +1,6 @@
 from openerp.osv import osv
+from openerp.tools.translate import _
+from datetime import date
 
 
 class gamification_badge_execute(osv.Model):
@@ -14,3 +16,31 @@ class gamification_badge_execute(osv.Model):
     def everybody(self, cr, uid, context):
         """Return the id of every user"""
         return self.pool.get('res.users').search(cr, uid, [], context=context)
+
+    def today_users(self, cr, uid, context):
+        """Return the list of users that were connected today"""
+        domain = [('login_date', '=', date.today().isoformat())]
+        return self.pool.get('res.users').search(cr, uid, domain, context=context)
+
+    def long_time_users(self, cr, uid, context, badge_ref=None):
+        """Return the list of users that were created at least year ago
+
+        :param badge_ref: the xml reference of a badge, the users having
+        already this badge will be excluded
+        """
+        today = date.today()
+        domain = [('create_date', '<=', today.replace(year=today.year-1).isoformat())]
+
+        if badge_ref:
+            # retrieve the badge object
+            badge = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', badge_ref)
+            if not badge or not badge[1]:
+                raise osv.except_osv(_('Error!'), _('Unknown badge reference gamification.%s' % str(badge_ref)))
+
+            # exclude ids of user already having this badge
+            badge_user_obj = self.pool.get('gamification.badge.user')
+            badge_user_ids = badge_user_obj.search(cr, uid, [('badge_id', '=', badge[1])], context=context)
+            excluded_user_ids = [badge_user.user_id.id for badge_user in badge_user_obj.browse(cr, uid, badge_user_ids, context=context)]
+            domain.append(('id', 'not in', excluded_user_ids))
+
+        return self.pool.get('res.users').search(cr, uid, domain, context=context)

From a6c1efbcd2693aa19739a85275adf324d08a6689 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Mar 2013 10:37:53 +0100
Subject: [PATCH 193/547] [IMP] badge sending limit per person

bzr revid: mat@openerp.com-20130319093753-xtvxgcuv2olxaluy
---
 addons/gamification/badge.py       | 28 +++++++++++++++++++++-------
 addons/gamification/badge_view.xml |  3 ++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index c299cacd799..bb958d7d4b4 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -111,6 +111,16 @@ class gamification_badge(osv.Model):
                           ('create_date', '>=', first_month_day)], context=context))
         return result
 
+    def _get_month_my_sent(self, cr, uid, ids, name, args, context=None):
+        """Return the number of time this badge has been granted to the current user this month"""
+        result = dict.fromkeys(ids, False)
+        first_month_day = date.today().replace(day=1).isoformat()
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
+                cr, uid, [('badge_id', '=', obj.id), ('create_uid', '=', uid),
+                          ('create_date', '>=', first_month_day)], context=context))
+        return result
+
     _columns = {
         'name': fields.char('Badge', required=True, translate=True),
         'description': fields.text('Description'),
@@ -133,10 +143,14 @@ class gamification_badge(osv.Model):
             'rel_badge_badge', 'badge1_id', 'badge2_id',
             string='Required Badges',
             help="Only the people having these badges can give this badge"),
-        'rule_max': fields.boolean('Limited',
-            help="This badge can not be send indefinitely"),
+
+        'rule_max': fields.boolean('Limited Sending',
+            help="Check to set a monthly limit per person of sending this badge"),
         'rule_max_number': fields.integer('Limitation Number',
-            help="The maximum number of time this badge can be sent per month."),
+            help="The maximum number of time this badge can be sent per month per person."),
+        'stat_my_monthly_sending': fields.function(_get_month_my_sent,
+            string='My Monthly Sending Total',
+            help="The number of time the current user has sent this badge this month."),
 
         'rule_automatic': fields.selection([
                 ('manual', 'Given by Users Only'),
@@ -163,7 +177,6 @@ class gamification_badge(osv.Model):
         'stat_count_distinct': fields.function(_get_unique_global_count,
             string='Unique Count',
             help="The number of time this badge has been received by individual users."),
-        # TODO store result for working domain stat_this_month >= rule_max_number
         'stat_this_month': fields.function(_get_month_count,
             string='Monthly Count',
             help="The number of time this badge has been received this month."),
@@ -314,7 +327,8 @@ class gamification_badge(osv.Model):
 
         :param user_from_id: the id of the res.users trying to send the badge
         :param badge_id: the granted badge id
-        :return: boolean, True if succeeded to send, False otherwise"""
+        :return: boolean, True if succeeded to send, False otherwise
+        """
         context = context or {}
         badge = self.browse(cr, uid, badge_id, context=context)
 
@@ -343,9 +357,9 @@ class gamification_badge(osv.Model):
 
         # else badge.rule_auth == 'everyone' -> no check
 
-        if badge.rule_max and badge.stat_this_month >= badge.rule_max_number:
+        if badge.rule_max and badge.stat_my_monthly_sending >= badge.rule_max_number:
             # sent the maximum number of time this month
-            raise osv.except_osv(_('Warning!'), _('This badge has been already sent too many time this month.'))
+            raise osv.except_osv(_('Warning!'), _('You have already sent this badge too many time this month.'))
 
         return True
 
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 0a7e32769d4..d39ff2e3a4e 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -54,7 +54,8 @@
                     <field name="stat_count"/>
                     <field name="stat_this_month"/>
                     <field name="stat_my"/>
-                    <field name="rule_auth"/>
+                    <field name="stat_my_this_month"/>
+                    <field name="stat_my_monthly_sending"/>
                 </tree>
             </field>
         </record>

From 8731c49b69b49edb0f3f831e172ef838691a9e81 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 19 Mar 2013 11:00:35 +0100
Subject: [PATCH 194/547] [FIX] every employee is a goal_user

bzr revid: mat@openerp.com-20130319100035-le3qkcbi35lf95r5
---
 addons/gamification/badge_view.xml                     | 4 ++--
 addons/gamification/security/gamification_security.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index d39ff2e3a4e..fba3b6f3572 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -54,8 +54,7 @@
                     <field name="stat_count"/>
                     <field name="stat_this_month"/>
                     <field name="stat_my"/>
-                    <field name="stat_my_this_month"/>
-                    <field name="stat_my_monthly_sending"/>
+                    <field name="rule_auth"/>
                 </tree>
             </field>
         </record>
@@ -105,6 +104,7 @@
                             <field name="stat_this_month"/>
                             <field name="stat_my"/>
                             <field name="stat_my_this_month"/>
+                            <field name="stat_my_monthly_sending"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 1862961f3e3..d3c30a97efc 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -9,6 +9,7 @@
         <record id="group_goal_user" model="res.groups">
             <field name="name">User</field>
             <field name="category_id" ref="module_goal_category"/>
+            <field name="users" eval="[(4, ref('base.group_user'))]"/>
         </record>
         <record id="group_goal_manager" model="res.groups">
             <field name="name">Manager</field>

From dd3a7966bd8286b15eedde85b9c4e4751a04d580 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Mar 2013 09:45:40 +0100
Subject: [PATCH 195/547] [FIX] hr manager can see related goal menu

bzr revid: mat@openerp.com-20130320084540-ik7vl3irshbyo5bk
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d835171d63d..e3118ce791a 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -424,7 +424,7 @@
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
         <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager" />
-        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="gamification.group_goal_manager"/>
+        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="base.group_hr_manager"/>
 
       <!-- Email Compose message Action-->
       <act_window

From 2510783e3636c19541450ac13da2f31b206c4c87 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Mar 2013 11:00:16 +0100
Subject: [PATCH 196/547] [IMP] better display of kanban

bzr revid: mat@openerp.com-20130320100016-kuc3y18d9qrlv3di
---
 addons/gamification/badge_data.xml          | 2 +-
 addons/gamification/badge_view.xml          | 4 ++--
 addons/gamification/static/src/css/goal.css | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index 76a09266441..03ea1b880a7 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -227,7 +227,7 @@
                                 Ktpfw2wYIFqzQWt3v0D1J6sJaKOMcC+Gv+S2vVMEOoEArREAlgNnMJOAN2M4nTJH0caiSUVMZx7a
                                 i8jUIl5XESnlkJxvm0vEExeli19rvBxObPuHrvFlJcSUQxioYsp1qNbRkTo6HKL1Ch4RVfI8RY5H
                                 CFlBxCruZIizgNvHdgr+P1s09m3W5WsJAAAAAElFTkSuQmCC</field>
-      </record>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index fba3b6f3572..996b3931c00 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -125,7 +125,7 @@
                     <field name="stat_count_distinct"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div tclass="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
+                            <div class="oe_kanban_card oe_kanban_global_click oe_kanban_goal  oe_kanban_color_white">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" /></a>
@@ -169,7 +169,7 @@ jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t>
                     <field name="create_date"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div tclass="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
+                            <div class="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.badge_id.raw_value)" t-att-title="record.badge_name.value" width="24" height="24" /></a>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 849291ca9bc..a357d97bd61 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,4 +1,5 @@
-.oe_kanban_goal {
+.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
+  width: 190px;
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached {
   background-color: #A1FF81;

From 23940bec776dbcaeba3e63d24d6125bf3d02fcb0 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 20 Mar 2013 14:16:22 +0100
Subject: [PATCH 197/547] [FIX] deactive social addition moved to
 trunk-social-aspects-mat

bzr revid: mat@openerp.com-20130320131622-58653m9ubpdovtvd
---
 addons/hr/__openerp__.py         |  1 -
 addons/hr/mail_hr_view.xml       | 24 ------------------------
 addons/mail/mail_thread_view.xml |  3 +--
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 addons/hr/mail_hr_view.xml

diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b978a83e658..b4b8e982845 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -59,7 +59,6 @@ You can manage:
         'hr_installer.xml',
         'hr_data.xml',
         'res_config_view.xml',
-        'mail_hr_view.xml',
     ],
     'demo': ['hr_demo.xml'],
     'test': [
diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
deleted file mode 100644
index 4e02076bd5d..00000000000
--- a/addons/hr/mail_hr_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
-            <field name="context">{
-              'default_model': 'hr.employee', 
-              'default_res_id': 0,
-              'res_users_id': uid,
-            }</field>
-            <field name="params" eval="&quot;{
-                'domain': [
-                  ('to_read', '=', True),
-                  ('starred', '=', False),
-                ],
-                'view_mailbox': True,
-                'view_inbox': True,
-                'read_action': 'read',
-                'show_compose_message': True
-            }&quot;"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 94af7459e7f..75c86e4645d 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -16,8 +16,7 @@
                 ],
                 'view_mailbox': True,
                 'view_inbox': True,
-                'read_action': 'read',
-                'show_compose_message': False
+                'read_action': 'read'
             }&quot;"/>
             <field name="help" type="html">
                 <p>

From efbc055c5f3e307afaa0f4710b8da44d1cc00971 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 12:01:06 +0100
Subject: [PATCH 198/547] [FIX] display done in kanban only if had badge

bzr revid: mat@openerp.com-20130321110106-pu11ho821a70diiu
---
 addons/gamification/badge_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 996b3931c00..d94cbb404b7 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -132,7 +132,7 @@
                                     </div>
                                     <h4>
                                         <a type="open"><field name="name"/></a>
-                                        <t t-if="record.stat_my.value"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
+                                        <t t-if="record.stat_my.raw_value > 0"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
 WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htF
 FIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLm
 wOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV

From 24edc5615ba7e20f465e4b1b8e11fcabb81fdb79 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 12:01:52 +0100
Subject: [PATCH 199/547] [ADD] basic widget for goal list

bzr revid: mat@openerp.com-20130321110152-0wa9b3uuyk2qvk0d
---
 addons/gamification/__openerp__.py            |  2 +
 addons/gamification/res_users.py              | 28 +++++++++++++-
 addons/gamification/static/src/css/goal.css   | 19 ++++++++++
 .../static/src/js/gamification.js             | 38 +++++++++++++++++++
 .../static/src/xml/gamification.xml           | 29 ++++++++++++++
 5 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 addons/gamification/static/src/js/gamification.js
 create mode 100644 addons/gamification/static/src/xml/gamification.xml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index b8abb625d72..dd27c82d94b 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -60,4 +60,6 @@ A **Badge** is a symbolic token granted to a user as a sign of reward. It can be
     'installable': True,
     'application': True,
     'css': ['static/src/css/goal.css'],
+    'js': ['static/src/js/gamification.js'],
+    'qweb': ['static/src/xml/gamification.xml'],
 }
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 22aaf89ce57..b9e2168eb83 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -3,7 +3,7 @@ from openerp.osv import osv
 
 class res_users_gamification_group(osv.Model):
     """ Update of res.users class
-        - if adding groups to an user, check gamification.goal.plan linked to 
+        - if adding groups to an user, check gamification.goal.plan linked to
         this group, and the user. This is done by overriding the write method.
     """
     _name = 'res.users'
@@ -22,9 +22,33 @@ class res_users_gamification_group(osv.Model):
             goal_plan_obj.plan_subscribe_users(cr, uid, plan_ids, ids, context=context)
         return write_res
 
+    def get_goals_todo_info(self, cr, uid, context=None):
+        """Return the list of goals assigned to the user, grouped by plan"""
+        goals_info = []
+        goal_obj = self.pool.get('gamification.goal')
+        plan_obj = self.pool.get('gamification.goal.plan')
+        plan_ids = plan_obj.search(cr, uid, [('user_ids', 'in', uid)], context=context)
+        for plan in plan_obj.browse(cr, uid, plan_ids, context=context):
+            vals = {'name': plan.name, 'goals': []}
+
+            goal_ids = goal_obj.search(cr, uid, [('user_id', '=', uid), ('plan_id', '=', plan.id)], context=context)
+            for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
+                vals['goals'].append({
+                    'id': goal.id,
+                    'type_name': goal.type_id.name,
+                    'type_description': goal.type_description,
+                    'state': goal.state,
+                    'completeness': goal.completeness,
+                    'computation_mode': goal.computation_mode,
+                })
+
+            goals_info.append(vals)
+        return goals_info
+
+
 class res_groups_gamification_group(osv.Model):
     """ Update of res.groups class
-        - if adding users from a group, check gamification.goal.plan linked to 
+        - if adding users from a group, check gamification.goal.plan linked to
         this group, and the user. This is done by overriding the write method.
     """
     _name = 'res.groups'
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index a357d97bd61..c36bd69be17 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,3 +1,4 @@
+/* Kanban views */
 .openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
   width: 190px;
 }
@@ -14,4 +15,22 @@
   background-color: #E6E6E6;
   color: #585858;
   font-size: 0.9em;
+}
+
+
+/* Mail Sidebar */
+/*.openerp .oe_mail_wall {
+    column-count: 3;
+    -webkit-column-count: 3;
+    -moz-column-count: 3;
+}*/
+
+.openerp .oe_mail_wall .oe_user_sidebar {
+    margin-left: 20px;
+    position: relative;
+    display: inline-block;
+    width: 200px;
+}
+.openerp .oe_mail_wall .oe_mail {
+    display: inline-block;
 }
\ No newline at end of file
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
new file mode 100644
index 00000000000..4c7e25980d9
--- /dev/null
+++ b/addons/gamification/static/src/js/gamification.js
@@ -0,0 +1,38 @@
+openerp.gamification = function(instance) {
+    console.log("Debug statement: file loaded");
+
+    instance.Side_bar = instance.mail.Widget.include( {
+        init: function (parent, action) {
+            console.log("Init function");
+            var self = this;
+            this._super(parent, action);
+            this.deferred = $.Deferred();
+            this.res_user = new instance.web.DataSetSearch(this, 'res.users');
+            this.goals_info = {};
+            console.log("init");
+        },
+        renderElement: function() {
+            var self = this;
+            this._super.apply(this, arguments);
+            console.log("Render!");
+            self.render_template(self.$el.filter(".oe_user_sidebar"),'user_wall');
+            self.get_goal_todo_info();
+        },
+        render_template: function(target,template) {
+            var self = this;
+            target.append(instance.web.qweb.render(template,{'widget': self}));
+        },
+        get_goal_todo_info: function() {
+            var self = this;
+            var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
+                self.goals_info['info'] = res
+            });
+            $.when(goals_info).done(function() {
+                console.log(self.goals_info.info);
+                if(self.goals_info.info.length > 0){
+                    self.render_template(self.$el.find(".oe_gamification_goal"),'goal_list_to_do');
+                }
+            });
+        },
+    });
+};
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
new file mode 100644
index 00000000000..6ee32e0c9e2
--- /dev/null
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-extend="mail.Root">
+        <t t-jquery="div" t-operation="after">
+            <div class="oe_user_sidebar" />
+        </t>
+    </t>
+    <t t-name="user_wall">
+        <div class="oe_gamification_goal"/>
+    </t>
+    <t t-name="goal_list_to_do">
+        <div t-foreach="widget.goals_info.info" t-as="plan">
+            <h3><t t-esc="plan.name"/></h3>
+            <ul class="oe_goals_list">
+                <li t-foreach="plan.goals" t-as="goal">
+                    <strong><t t-esc="goal.type_name" /></strong>
+                    <t t-if="goal.type_description">
+                        <p><t t-esc="goal.type_description" /></p>
+                    </t>
+                    <p><progress t-att-value="goal.completeness" max="100"/></p>
+                    <t t-if="goal.computation_mode == 'manually'">
+                        <a href="#">done!</a>
+                    </t>
+                </li>
+            </ul>
+        </div>
+    </t>
+
+</templates>

From c29e0693a09d206195041e45233da3aa06234197 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 16:11:21 +0100
Subject: [PATCH 200/547] [FIX] change model reference

bzr revid: mat@openerp.com-20130321151121-44vqwd5jfb8uqird
---
 addons/gamification/cron.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index b3a87e2afe2..d61c6a3a318 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -19,7 +19,7 @@
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
-            <field name="model">gamification.goal.badge</field>
+            <field name="model">gamification.badge</field>
             <field name="function">check_automatic</field>
             <field name="args">()</field>
         </record>

From 07145d458a5b577572fb5a4c1842cb30d63993e3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 16:23:55 +0100
Subject: [PATCH 201/547] [REF] remove changes in for social module

bzr revid: mat@openerp.com-20130321152355-k9yt5rz2vbjjqefn
---
 addons/crm/crm_phonecall_menu.xml |  2 +-
 addons/hr/__init__.py             |  1 -
 addons/hr/hr.py                   | 63 +------------------------------
 addons/hr/hr_view.xml             | 21 +++--------
 addons/hr/res_users.py            | 62 ------------------------------
 5 files changed, 8 insertions(+), 141 deletions(-)
 delete mode 100644 addons/hr/res_users.py

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 613481ade91..2344604a294 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -58,7 +58,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context" eval="'{\'default_state\':\'done\'}'"/>
+        <field name="context">{}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index fbd01761f39..02ac7f16fd9 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -23,6 +23,5 @@ import hr_department
 import hr
 
 import res_config
-import res_users
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 82f8f908269..176205d87b2 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -218,26 +218,6 @@ class hr_employee(osv.osv):
     _order='name_related'
 
     def create(self, cr, uid, data, context=None):
-        # verify do not have two employee with the same email
-        if 'work_email' in data:
-            user_ids = self.pool.get('res.users').search(cr, uid, [('email', '=', data['work_email'])], context=context)
-            if len(user_ids) > 0:
-                if 'user_id' not in data:
-                    raise osv.except_osv(_('Warning!'), _('You are trying to create an employee with an email already linked to an user. Please linked the employee to it or change the email.'))
-                elif data['user_id'] not in user_ids:
-                    raise osv.except_osv(_('Warning!'), _('You are trying to create an employee with an email different than the one of the linked user.'))
-                # else user and email match
-            else:
-                # employee has an email but not the user
-                # TOCHECK update user ?
-                pass
-        elif 'user_id' in data:
-            user = self.pool.get('res.users').browse(cr, uid, data['user_id'], context=context)
-            if user.email:
-                # employee has no email but the user does
-                # TOCHECK raise error ?
-                pass
-
         employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
         try:
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
@@ -246,8 +226,7 @@ class hr_employee(osv.osv):
                 body='Welcome to %s! Please help them take the first steps with OpenERP!' % (employee.name),
                 subtype='mail.mt_comment', context=context)
         except:
-            pass  # group deleted: do not push a message
-
+            pass # group deleted: do not push a message
         return employee_id
 
     def unlink(self, cr, uid, ids, context=None):
@@ -287,46 +266,6 @@ class hr_employee(osv.osv):
         image_path = addons.get_module_resource('hr', 'static/src/img', 'default_image.png')
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
-    def action_follow(self, cr, uid, ids, context=None):
-        """ Wrapper because message_subscribe_users take a user_ids=None
-            that receive the context without the wrapper. """
-        return self.message_subscribe_users(cr, uid, ids, context=context)
-
-    def action_unfollow(self, cr, uid, ids, context=None):
-        """ Wrapper because message_unsubscribe_users take a user_ids=None
-            that receive the context without the wrapper. """
-        return self.message_unsubscribe_users(cr, uid, ids, context=context)
-
-    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
-        """Overwrite the message_post method when using the send to my
-        followers screen
-
-        When a message is sent to a hr.employee using the action
-        action_mail_inbox_feeds, the context is extended with res_users_id
-        containing the user id of the user linked to the employee and
-        default_res_id contains 0 (to avoid misused of the function called from
-        the inbox page).
-        In these conditions, the thread_id used to send the message is the id
-        of the employee instead of the res_users (or partner_id).
-        If several employee are linked to the same user_id, the message is
-        duplicated and sent to every user.
-
-        :return: the result of message_post from mail_thread, last call if
-        several messages are sent.
-        """
-
-        if 'res_users_id' in context and context['default_res_id'] == 0:
-            employee_ids = self.search(cr, uid, [('user_id', '=', context['res_users_id'])], context=context)
-            if len(employee_ids) > 0:
-                for employee_id in employee_ids:
-                    res = super(hr_employee, self).message_post(cr, uid, employee_id, context=context, **kwargs)
-                return res
-            else:
-                raise osv.except_osv('Warning!', 'Your user is not linked to an employee form, which is required to send messages to your followers.')
-
-        # if no overwrite, send message as usual
-        return super(hr_employee, self).message_post(cr, uid, thread_id, context=context, **kwargs)
-
     _defaults = {
         'active': 1,
         'image': _get_default_image,
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c3fecdda0bf..e0c3edfdb39 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,10 +27,6 @@
                             </h1>
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
-                            <label for="work_email" class="oe_edit_only"/>
-                            <field name="work_email" widget="email"/>
-                            <label for="work_phone" class="oe_edit_only"/>
-                            <field name="work_phone"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
@@ -40,11 +36,14 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                        <field name="work_email" widget="email"/>
+                                        <field name="work_phone"/>
                                         <field name="mobile_phone"/>
                                         <field name="work_location"/>
                                     </group>
                                     <group string="Position">
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                                        <field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
@@ -85,7 +84,6 @@
                                 </group>
                             </page>
                         </notebook>
-                        
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
@@ -130,16 +128,14 @@
                 </search>
              </field>
          </record>
+        <!-- HR Kanban View  -->
 
-
-    <!-- HR Kanban View  -->
     <record model="ir.ui.view" id="hr_kanban_view_employees">
         <field name="name">HR - Employess Kanban</field>
         <field name="model">hr.employee</field>
         <field name="arch" type="xml">
             <kanban>
                 <field name="last_login"/>
-                <field name="message_is_follower"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -158,15 +154,10 @@
                                     </li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
+                                    <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
+                                    <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
                                     <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
                                 </ul>
-                                <div class="oe_followers">
-                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_follower oe_following">
-                                        <span class="oe_unfollow">Unfollow</span>
-                                        <span class="oe_following">Following</span>
-                                    </button>
-                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object" class="oe_follower oe_notfollow">Follow</button>
-                                </div>
                             </div>
                         </div>
                         <script>
diff --git a/addons/hr/res_users.py b/addons/hr/res_users.py
deleted file mode 100644
index 17abfe30f55..00000000000
--- a/addons/hr/res_users.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from openerp.osv import osv
-
-
-class res_users_employee_group(osv.Model):
-    """ Update of res.users class
-        - if adding groups to an user, check if base.group_user is in it
-        (member of 'Employee'), create an employee form linked to it.
-    """
-    _name = 'res.users'
-    _inherit = ['res.users']
-
-    def write(self, cr, uid, ids, vals, context=None):
-        write_res = super(res_users_employee_group, self).write(cr, uid, ids, vals, context=context)
-        if vals.get('groups_id'):
-            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
-            user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4]
-            user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
-
-            (model, group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
-            emp_obj = self.pool.get('hr.employee')
-            if group_id in user_group_ids:
-                # base.group_user in it, checking users
-                for user in self.browse(cr, uid, ids, context=context):
-                    if len(emp_obj.search(cr, uid, [('user_id', '=', user.id)], context=context)) == 0:
-                        # no employee already linked to this user, create it
-                        emp_obj.create(cr, uid, {
-                            'user_id': user.id,
-                            'name': user.name,
-                            'image': user.image,
-                        }, context=context)
-        return write_res
-
-
-class res_groups_employee_group(osv.Model):
-    """ Update of res.groups class
-        - if adding users to a group, check if base.group_user and if the case,
-        create a employee profile
-    """
-    _name = 'res.groups'
-    _inherit = 'res.groups'
-
-    def write(self, cr, uid, ids, vals, context=None):
-        write_res = super(res_groups_employee_group, self).write(cr, uid, ids, vals, context=context)
-        (model, group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
-
-        # check adding users to base.group_user
-        if vals.get('users') and group_id in ids:
-            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
-            user_ids = [command[1] for command in vals['users'] if command[0] == 4]
-            user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
-
-            emp_obj = self.pool.get('hr.employee')
-            for user_id in user_ids:
-                if len(emp_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)) == 0:
-                    # no employee already linked to this user, create it
-                    user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
-                    emp_obj.create(cr, uid, {
-                        'user_id': user.id,
-                        'name': user.name,
-                        'image': user.image,
-                    }, context=context)
-        return write_res

From 3d965db51c209b1bc34a4f650101b4c0f39613d7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 16:43:14 +0100
Subject: [PATCH 202/547] [ADD] new manual goal for discovery

bzr revid: mat@openerp.com-20130321154314-ku9gkjur2836bl1d
---
 addons/gamification/goal_base_data.xml | 21 ++++++++++++++++++++-
 addons/gamification/test/goal_demo.yml |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index bbf43a38d56..6fc1b8d1f04 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -12,12 +12,28 @@
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
         </record>
 
+        <record model="gamification.goal.type" id="type_base_avatar">
+            <field name="name">Change of avatar</field>
+            <field name="description">In your user perference</field>
+            <field name="computation_mode">manual</field>
+            <!-- probelm : default avatar != False
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="ref('base.model_res_users')" />
+            <field name="field_id" eval="ref('base.field_res_partner_image')" />
+            <field name="domain">[('id','=',user_id),('partner_id.image', '!=', False)]</field>
+            -->
+        </record>
+
 
         <!-- planlines -->
         <record model="gamification.goal.planline" id="planline_base_discover1">
             <field name="type_id" eval="ref('type_base_timezone')" />
             <field name="target_goal">1</field>
         </record>
+        <record model="gamification.goal.planline" id="planline_base_discover2">
+            <field name="type_id" eval="ref('type_base_avatar')" />
+            <field name="target_goal">1</field>
+        </record>
 
 
         <!-- plans -->
@@ -26,7 +42,7 @@
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
-            <field name="planline_ids" eval="[(4, ref('planline_base_discover1'))]"/>
+            <field name="planline_ids" eval="[(4, ref('planline_base_discover1')),(4, ref('planline_base_discover2'))]"/>
         </record>
 
 
@@ -34,6 +50,9 @@
         <record model="gamification.goal.planline" id="planline_base_discover1">
             <field name="plan_id" eval="ref('plan_base_discover')" />
         </record>
+        <record model="gamification.goal.planline" id="planline_base_discover2">
+            <field name="plan_id" eval="ref('plan_base_discover')" />
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/gamification/test/goal_demo.yml b/addons/gamification/test/goal_demo.yml
index 8499dbf510e..d8f45ad6c9e 100644
--- a/addons/gamification/test/goal_demo.yml
+++ b/addons/gamification/test/goal_demo.yml
@@ -20,7 +20,7 @@
 -
   !python {model: gamification.goal}: |
     goal_ids = self.search(cr, uid, [('plan_id', '=', ref('plan_base_discover'))], context=context)
-    assert len(goal_ids) >= 2, "Not enough goals have been generated"
+    assert len(goal_ids) >= 4, "Not enough goals have been generated"
     for goal in self.browse(cr, uid, goal_ids, context=context):
       assert goal.state != 'draft', "Draft goal have been generated"
       assert goal.planline_id.plan_id.id == ref('plan_base_discover'), "Linked planline incorrect"

From 7550bb17984be2f7f48de200a6abcb996384700a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 16:50:41 +0100
Subject: [PATCH 203/547] [FIX] manual -> manually

bzr revid: mat@openerp.com-20130321155041-pcdn7jbvqsje4bac
---
 addons/gamification/goal_base_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 6fc1b8d1f04..cc757a0126b 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -15,8 +15,8 @@
         <record model="gamification.goal.type" id="type_base_avatar">
             <field name="name">Change of avatar</field>
             <field name="description">In your user perference</field>
-            <field name="computation_mode">manual</field>
-            <!-- probelm : default avatar != False
+            <field name="computation_mode">manually</field>
+            <!-- problem : default avatar != False
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="field_id" eval="ref('base.field_res_partner_image')" />

From c4f2c671839c5d1d5b2922724c01d5d170aa0639 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 17:48:02 +0100
Subject: [PATCH 204/547] [IMP] goal look based on state

bzr revid: mat@openerp.com-20130321164802-qzndxa29utwxtdoh
---
 addons/gamification/static/src/css/goal.css   | 34 ++++++++++++++++++-
 .../static/src/xml/gamification.xml           |  4 ++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index c36bd69be17..52d90152d6a 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -27,9 +27,41 @@
 
 .openerp .oe_mail_wall .oe_user_sidebar {
     margin-left: 20px;
+    margin-top: 20px;
     position: relative;
     display: inline-block;
-    width: 200px;
+    vertical-align: top;
+    width: 220px;
+}
+.openerp .oe_user_sidebar .oe_gamification_goal {
+    background: #EDEDF6;
+    height: auto;
+    padding: 15px;
+    border: solid 1px rgba(0,0,0,0.03);
+}
+
+.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached:before {
+    content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=);
+    margin-left:-40px;
+}
+.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed:before {
+    content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC);
+    margin-left:-40px;
+}
+.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached,
+.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed {
+    text-decoration: line-through;
+    padding-left: 20px;
+}
+
+.openerp .oe_mail_wall .oe_user_sidebar ul {
+    list-style-type: none; 
+    padding-left: 20px;
+}
+
+.openerp .oe_mail_wall .oe_user_sidebar li progress {
+    width: 80%;
+    display: inline-block;
 }
 .openerp .oe_mail_wall .oe_mail {
     display: inline-block;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 6ee32e0c9e2..2b3934d1181 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -13,7 +13,9 @@
             <h3><t t-esc="plan.name"/></h3>
             <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <strong><t t-esc="goal.type_name" /></strong>
+                    <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
+                        <t t-esc="goal.type_name" />
+                    </strong>
                     <t t-if="goal.type_description">
                         <p><t t-esc="goal.type_description" /></p>
                     </t>

From 555ea3810ee770b7535cc24851b5a1da6d4afe01 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 17:53:05 +0100
Subject: [PATCH 205/547] [FIX] fix goal test

bzr revid: mat@openerp.com-20130321165305-dlb6j868f78mo6td
---
 addons/gamification/test/goal_demo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/test/goal_demo.yml b/addons/gamification/test/goal_demo.yml
index d8f45ad6c9e..e30acf450c3 100644
--- a/addons/gamification/test/goal_demo.yml
+++ b/addons/gamification/test/goal_demo.yml
@@ -33,7 +33,7 @@
   I check the goal for demo user is successful
 -
   !python {model: gamification.goal}: |
-    goal_ids = self.search(cr, uid, [('user_id', '=', ref('base.user_demo'))])
+    goal_ids = self.search(cr, uid, [('user_id', '=', ref('base.user_demo')),('type_id','=',ref('type_base_timezone'))])
     self.update(cr, uid, goal_ids, context=context)
     for goal in self.browse(cr, uid, goal_ids, context=context):
       assert goal.state == "reached", "Goal not successful %s" % goal.state
\ No newline at end of file

From f691d138103ec351be61855d226239d47054b7d4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 09:51:51 +0100
Subject: [PATCH 206/547] [IMP] skip plans with all goals finished

bzr revid: mat@openerp.com-20130322085151-r6sse6383z6ya9by
---
 addons/gamification/res_users.py                    | 13 +++++++++++--
 addons/gamification/static/src/js/gamification.js   |  6 +++++-
 addons/gamification/static/src/xml/gamification.xml |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index b9e2168eb83..b4f1c9c8c29 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -32,7 +32,15 @@ class res_users_gamification_group(osv.Model):
             vals = {'name': plan.name, 'goals': []}
 
             goal_ids = goal_obj.search(cr, uid, [('user_id', '=', uid), ('plan_id', '=', plan.id)], context=context)
+            all_done = True
             for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
+                if goal.last_update and goal.end_date and goal.last_update > goal.end_date:
+                    # do not include goals of previous plan run
+                    continue
+
+                if goal.state == 'inprogress' or goal.state == 'inprogress_update':
+                    all_done = False
+
                 vals['goals'].append({
                     'id': goal.id,
                     'type_name': goal.type_id.name,
@@ -41,8 +49,9 @@ class res_users_gamification_group(osv.Model):
                     'completeness': goal.completeness,
                     'computation_mode': goal.computation_mode,
                 })
-
-            goals_info.append(vals)
+            # skip plans where all goal are done or failed
+            if not all_done:
+                goals_info.append(vals)
         return goals_info
 
 
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 4c7e25980d9..2820666d56d 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -22,6 +22,10 @@ openerp.gamification = function(instance) {
             var self = this;
             target.append(instance.web.qweb.render(template,{'widget': self}));
         },
+        render_template_replace: function(target,template) {
+            var self = this;
+            target.html(instance.web.qweb.render(template,{'widget': self}));
+        },
         get_goal_todo_info: function() {
             var self = this;
             var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
@@ -30,7 +34,7 @@ openerp.gamification = function(instance) {
             $.when(goals_info).done(function() {
                 console.log(self.goals_info.info);
                 if(self.goals_info.info.length > 0){
-                    self.render_template(self.$el.find(".oe_gamification_goal"),'goal_list_to_do');
+                    self.render_template_replace(self.$el.find(".oe_gamification_goal"),'goal_list_to_do');
                 }
             });
         },
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 2b3934d1181..64568403ab8 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,7 +6,7 @@
         </t>
     </t>
     <t t-name="user_wall">
-        <div class="oe_gamification_goal"/>
+        <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">

From 80541abdbf27d77014dec403d562f616408061c5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 12:13:44 +0100
Subject: [PATCH 207/547] [IMP] update button with refresh

bzr revid: mat@openerp.com-20130322111344-7qs3o2tvbx7h4qln
---
 addons/gamification/goal.py                   |  3 ++-
 addons/gamification/res_users.py              |  3 +++
 addons/gamification/static/src/css/goal.css   | 10 ++++++--
 .../static/src/js/gamification.js             | 23 ++++++++++++++++---
 .../static/src/xml/gamification.xml           | 15 ++++++++----
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index de9802c5688..dfd71867687 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -185,8 +185,9 @@ class gamification_goal(osv.Model):
         If a goal reaches the target value, the status is set to reached
         If the end date is passed (at least +1 day, time not considered) without
         the target value being reached, the goal is set as failed."""
+        if context is None: context = {}
 
-        for goal in self.browse(cr, uid, ids, context=context or {}):
+        for goal in self.browse(cr, uid, ids, context=context):
             if goal.state in ('draft', 'canceled'):
                 # skip if goal draft or canceled
                 continue
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index b4f1c9c8c29..4e87ce88180 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -44,10 +44,13 @@ class res_users_gamification_group(osv.Model):
                 vals['goals'].append({
                     'id': goal.id,
                     'type_name': goal.type_id.name,
+                    'type_condition': goal.type_id.condition,
                     'type_description': goal.type_description,
                     'state': goal.state,
                     'completeness': goal.completeness,
                     'computation_mode': goal.computation_mode,
+                    'current': goal.current,
+                    'target_goal': goal.target_goal,
                 })
             # skip plans where all goal are done or failed
             if not all_done:
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 52d90152d6a..443455a20a7 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -31,7 +31,7 @@
     position: relative;
     display: inline-block;
     vertical-align: top;
-    width: 220px;
+    width: 250px;
 }
 .openerp .oe_user_sidebar .oe_gamification_goal {
     background: #EDEDF6;
@@ -57,12 +57,18 @@
 .openerp .oe_mail_wall .oe_user_sidebar ul {
     list-style-type: none; 
     padding-left: 20px;
+    margin-bottom: 10px;
+}
+.openerp .oe_mail_wall .oe_user_sidebar li {
+    margin-bottom: 10px;
 }
-
 .openerp .oe_mail_wall .oe_user_sidebar li progress {
     width: 80%;
     display: inline-block;
 }
+.openerp .oe_mail_wall .oe_user_sidebar li p {
+    margin:5px 0;
+}
 .openerp .oe_mail_wall .oe_mail {
     display: inline-block;
 }
\ No newline at end of file
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 2820666d56d..667f856059e 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -3,18 +3,26 @@ openerp.gamification = function(instance) {
 
     instance.Side_bar = instance.mail.Widget.include( {
         init: function (parent, action) {
-            console.log("Init function");
             var self = this;
             this._super(parent, action);
             this.deferred = $.Deferred();
             this.res_user = new instance.web.DataSetSearch(this, 'res.users');
             this.goals_info = {};
-            console.log("init");
+        },
+        events: {
+            'click a.oe_update_goal': function(event) {
+                var self = this;
+                var goal_id = parseInt(event.target.id);
+                console.log(goal_id);
+                var goal_updated = new instance.web.Model('gamification.goal').call('update', [[goal_id]]);
+                $.when(goal_updated).done(function() {
+                    self.get_goal_todo_info();
+                });
+            }
         },
         renderElement: function() {
             var self = this;
             this._super.apply(this, arguments);
-            console.log("Render!");
             self.render_template(self.$el.filter(".oe_user_sidebar"),'user_wall');
             self.get_goal_todo_info();
         },
@@ -28,6 +36,7 @@ openerp.gamification = function(instance) {
         },
         get_goal_todo_info: function() {
             var self = this;
+            console.log(this);
             var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
                 self.goals_info['info'] = res
             });
@@ -38,5 +47,13 @@ openerp.gamification = function(instance) {
                 }
             });
         },
+        update_goal: function() {
+            console.log(this);
+            console.log(instance.Side_bar);
+            var goal_update = new instance.web.Model('gamification.goal').call('update', [[parseInt(this.id)]]);
+            $.when(goal_update).done(function() {
+                // $(".oe_user_sidebar").find(".oe_gamification_goal").html(instance.web.qweb.render('goal_list_to_do'));
+            });
+        },
     });
 };
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 64568403ab8..c47e5896a83 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -19,10 +19,17 @@
                     <t t-if="goal.type_description">
                         <p><t t-esc="goal.type_description" /></p>
                     </t>
-                    <p><progress t-att-value="goal.completeness" max="100"/></p>
-                    <t t-if="goal.computation_mode == 'manually'">
-                        <a href="#">done!</a>
-                    </t>
+                    <p>
+                        <t t-if="goal.type_condition == 'higher'">
+                            <progress t-att-value="goal.completeness" max="100"/>
+                        </t>
+                        <t t-if="goal.type_condition == 'lower'">
+                            <t t-esc="goal.current" /> (less than <t t-esc="goal.target_goal"/>)
+                        </t>
+                        <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
+                            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
+                        </a>
+                    </p>
                 </li>
             </ul>
         </div>

From 391947f7cc94c237d05f970872fdbec02f56fc65 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 16:18:03 +0100
Subject: [PATCH 208/547] [IMP] using sidebar and better javascript

bzr revid: mat@openerp.com-20130322151803-nzb41s0mxvaidrel
---
 addons/gamification/goal_view.xml             |  2 +-
 addons/gamification/static/src/css/goal.css   | 20 ++++++------
 .../static/src/js/gamification.js             | 32 ++++++++++++-------
 .../static/src/xml/gamification.xml           | 12 ++-----
 addons/mail/static/src/xml/mail.xml           |  1 +
 5 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 9d2084349e6..7f3cdd764c6 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -46,7 +46,7 @@
                         
                         <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
-                        <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
+                        <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached" groups="base.group_no_one" />
                         <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 443455a20a7..e6bc4acf14c 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -25,7 +25,7 @@
     -moz-column-count: 3;
 }*/
 
-.openerp .oe_mail_wall .oe_user_sidebar {
+.openerp .oe_mail_wall .oe_mail_wall_aside {
     margin-left: 20px;
     margin-top: 20px;
     position: relative;
@@ -33,40 +33,40 @@
     vertical-align: top;
     width: 250px;
 }
-.openerp .oe_user_sidebar .oe_gamification_goal {
+.openerp .oe_mail_wall_aside .oe_gamification_goal {
     background: #EDEDF6;
     height: auto;
     padding: 15px;
     border: solid 1px rgba(0,0,0,0.03);
 }
 
-.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached:before {
+.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached:before {
     content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=);
     margin-left:-40px;
 }
-.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed:before {
+.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed:before {
     content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC);
     margin-left:-40px;
 }
-.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_reached,
-.openerp .oe_user_sidebar .oe_gamification_goal .oe_goal_failed {
+.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached,
+.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed {
     text-decoration: line-through;
     padding-left: 20px;
 }
 
-.openerp .oe_mail_wall .oe_user_sidebar ul {
+.openerp .oe_mail_wall .oe_mail_wall_aside ul {
     list-style-type: none; 
     padding-left: 20px;
     margin-bottom: 10px;
 }
-.openerp .oe_mail_wall .oe_user_sidebar li {
+.openerp .oe_mail_wall .oe_mail_wall_aside li {
     margin-bottom: 10px;
 }
-.openerp .oe_mail_wall .oe_user_sidebar li progress {
+.openerp .oe_mail_wall .oe_mail_wall_aside li progress {
     width: 80%;
     display: inline-block;
 }
-.openerp .oe_mail_wall .oe_user_sidebar li p {
+.openerp .oe_mail_wall .oe_mail_wall_aside li p {
     margin:5px 0;
 }
 .openerp .oe_mail_wall .oe_mail {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 667f856059e..5b503171337 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -1,7 +1,9 @@
 openerp.gamification = function(instance) {
     console.log("Debug statement: file loaded");
+    var QWeb = instance.web.qweb;
 
-    instance.Side_bar = instance.mail.Widget.include( {
+    instance.gamification.Sidebar = instance.web.Widget.extend({
+        template: 'gamification.user_wall_sidebar',
         init: function (parent, action) {
             var self = this;
             this._super(parent, action);
@@ -12,8 +14,7 @@ openerp.gamification = function(instance) {
         events: {
             'click a.oe_update_goal': function(event) {
                 var self = this;
-                var goal_id = parseInt(event.target.id);
-                console.log(goal_id);
+                var goal_id = parseInt(event.currentTarget.id);
                 var goal_updated = new instance.web.Model('gamification.goal').call('update', [[goal_id]]);
                 $.when(goal_updated).done(function() {
                     self.get_goal_todo_info();
@@ -23,37 +24,46 @@ openerp.gamification = function(instance) {
         renderElement: function() {
             var self = this;
             this._super.apply(this, arguments);
-            self.render_template(self.$el.filter(".oe_user_sidebar"),'user_wall');
             self.get_goal_todo_info();
         },
         render_template: function(target,template) {
             var self = this;
-            target.append(instance.web.qweb.render(template,{'widget': self}));
+            target.append(QWeb.render(template,{'widget': self}));
         },
         render_template_replace: function(target,template) {
             var self = this;
-            target.html(instance.web.qweb.render(template,{'widget': self}));
+            target.html(QWeb.render(template,{'widget': self}));
         },
         get_goal_todo_info: function() {
             var self = this;
-            console.log(this);
             var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
                 self.goals_info['info'] = res
             });
             $.when(goals_info).done(function() {
                 console.log(self.goals_info.info);
                 if(self.goals_info.info.length > 0){
-                    self.render_template_replace(self.$el.find(".oe_gamification_goal"),'goal_list_to_do');
+                    self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
                 }
             });
         },
         update_goal: function() {
-            console.log(this);
-            console.log(instance.Side_bar);
             var goal_update = new instance.web.Model('gamification.goal').call('update', [[parseInt(this.id)]]);
             $.when(goal_update).done(function() {
-                // $(".oe_user_sidebar").find(".oe_gamification_goal").html(instance.web.qweb.render('goal_list_to_do'));
+                $(".oe_user_sidebar").find(".oe_gamification_goal").html(QWeb.render('gamification.goal_list_to_do'));
             });
         },
     });
+
+    instance.mail.Widget.include({
+        init: function (parent, action) {
+            var self = this;
+            this._super(parent, action);
+        },
+        start: function() {
+            this._super();
+            var self = this;
+            var sidebar = new instance.gamification.Sidebar(self);
+            sidebar.appendTo($('.oe_mail_wall_aside'));
+        }
+    });
 };
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index c47e5896a83..5ce77e9835c 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-    <t t-extend="mail.Root">
-        <t t-jquery="div" t-operation="after">
-            <div class="oe_user_sidebar" />
-        </t>
-    </t>
-    <t t-name="user_wall">
+<templates>
+    <t t-name="gamification.user_wall_sidebar" class="oe_gamification_user_wall_sidebar">
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
-    <t t-name="goal_list_to_do">
+    <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">
             <h3><t t-esc="plan.name"/></h3>
             <ul class="oe_goals_list">
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b26ef06f5e4..6497917f113 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -195,6 +195,7 @@
           </tbody>
         </table>
         <div class="oe_mail-placeholder"></div>
+        <aside class="oe_mail_wall_aside"></aside>
     </div>
 
     <!--

From 0b0ecfa3f8474480e850fec7a64c6cd5207054e6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 16:41:30 +0100
Subject: [PATCH 209/547] [IMP] css width for kanban badge

bzr revid: mat@openerp.com-20130322154130-nmudmkp5vskcgxol
---
 addons/gamification/badge_view.xml                  | 2 +-
 addons/gamification/goal.py                         | 2 +-
 addons/gamification/static/src/css/goal.css         | 5 +++--
 addons/gamification/static/src/xml/gamification.xml | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index d94cbb404b7..044e37238b3 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -125,7 +125,7 @@
                     <field name="stat_count_distinct"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="oe_kanban_card oe_kanban_global_click oe_kanban_goal  oe_kanban_color_white">
+                            <div class="oe_kanban_card oe_kanban_global_click oe_kanban_badge  oe_kanban_color_white">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" /></a>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index dfd71867687..d5357b483ab 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -115,7 +115,7 @@ class gamification_goal(osv.Model):
         return ret
 
     _columns = {
-        'type_id': fields.many2one('gamification.goal.type', 
+        'type_id': fields.many2one('gamification.goal.type',
             string='Goal Type',
             required=True,
             ondelete="cascade"),
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index e6bc4acf14c..d1eb83b161c 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,6 +1,7 @@
 /* Kanban views */
-.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
-  width: 190px;
+.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
+  width: 220px;
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached {
   background-color: #A1FF81;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 5ce77e9835c..8e548c17bfe 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,9 +9,10 @@
                 <li t-foreach="plan.goals" t-as="goal">
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
                         <t t-esc="goal.type_name" />
+                        <a class="oe_">?</a>
                     </strong>
                     <t t-if="goal.type_description">
-                        <p><t t-esc="goal.type_description" /></p>
+                        <p class="oe_type_description"><t t-esc="goal.type_description" /></p>
                     </t>
                     <p>
                         <t t-if="goal.type_condition == 'higher'">

From 632a9d4bcbd89398e9d165422a35779902552039 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 17:05:20 +0100
Subject: [PATCH 210/547] [IMP] show description button

bzr revid: mat@openerp.com-20130322160520-pq9eaoqtnsvwvj7d
---
 addons/gamification/static/src/css/goal.css         |  9 ++-------
 addons/gamification/static/src/js/gamification.js   | 13 ++++++-------
 addons/gamification/static/src/xml/gamification.xml |  4 ++--
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index d1eb83b161c..8757006aad1 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -20,11 +20,6 @@
 
 
 /* Mail Sidebar */
-/*.openerp .oe_mail_wall {
-    column-count: 3;
-    -webkit-column-count: 3;
-    -moz-column-count: 3;
-}*/
 
 .openerp .oe_mail_wall .oe_mail_wall_aside {
     margin-left: 20px;
@@ -58,10 +53,10 @@
 .openerp .oe_mail_wall .oe_mail_wall_aside ul {
     list-style-type: none; 
     padding-left: 20px;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside li {
-    margin-bottom: 10px;
+    margin-bottom: 15px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside li progress {
     width: 80%;
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 5b503171337..485f18b67dd 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -19,7 +19,11 @@ openerp.gamification = function(instance) {
                 $.when(goal_updated).done(function() {
                     self.get_goal_todo_info();
                 });
-            }
+            },
+            'click a.oe_show_description': function(event) {
+                var goal_id = parseInt(event.currentTarget.id);
+                this.$el.find('.oe_type_description_'+goal_id).toggle(10);
+            },
         },
         renderElement: function() {
             var self = this;
@@ -43,15 +47,10 @@ openerp.gamification = function(instance) {
                 console.log(self.goals_info.info);
                 if(self.goals_info.info.length > 0){
                     self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
+                    self.$el.find('.oe_type_description').hide();
                 }
             });
         },
-        update_goal: function() {
-            var goal_update = new instance.web.Model('gamification.goal').call('update', [[parseInt(this.id)]]);
-            $.when(goal_update).done(function() {
-                $(".oe_user_sidebar").find(".oe_gamification_goal").html(QWeb.render('gamification.goal_list_to_do'));
-            });
-        },
     });
 
     instance.mail.Widget.include({
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 8e548c17bfe..768000ba74e 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,10 +9,10 @@
                 <li t-foreach="plan.goals" t-as="goal">
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
                         <t t-esc="goal.type_name" />
-                        <a class="oe_">?</a>
                     </strong>
                     <t t-if="goal.type_description">
-                        <p class="oe_type_description"><t t-esc="goal.type_description" /></p>
+                        <a class="oe_show_description" t-att-id="goal.id">?</a>
+                        <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p>
                     </t>
                     <p>
                         <t t-if="goal.type_condition == 'higher'">

From 02725e359daca7936b0b3a8109ecf1f16f98032b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Sun, 24 Mar 2013 14:46:58 +0100
Subject: [PATCH 211/547] [FIX] call correct method for cron

bzr revid: mat@openerp.com-20130324134658-0kx6v1st048gkm1r
---
 addons/gamification/cron.xml                  |  2 +-
 addons/gamification/goal.py                   | 34 +++++++++++++++++++
 .../static/src/js/gamification.js             | 28 +++++++++++++++
 .../static/src/xml/gamification.xml           |  6 ++--
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index d61c6a3a318..084a878982d 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -20,7 +20,7 @@
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
             <field name="model">gamification.badge</field>
-            <field name="function">check_automatic</field>
+            <field name="function">_cron_check</field>
             <field name="args">()</field>
         </record>
     </data>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index d5357b483ab..facf623e905 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -304,3 +304,37 @@ class gamification_goal(osv.Model):
                     plan_obj = self.pool.get('gamification.goal.plan')
                     plan_obj.report_progress(cr, uid, goal.plan_id, users=[goal.user_id], context=context)
         return super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
+
+    def get_action(self, cr, uid, goal_id, context=None):
+        """Get the ir.action related to update the goal
+
+        In case of a manual goal, should return a wizard to update the value
+        :return: dict like
+        {
+            'name':'Action name',
+            'id': goal_id,
+            'type': 'ir.actions.act_window',
+            'res_model': goal.type_id.model_id,
+            'view': 'form',
+        }
+        """
+        goal = self.browse(cr, uid, goal_id, context=context)
+        action = {
+            'name': "Update %s" % goal.type_id.name,
+            'id': goal_id,
+            'type': 'ir.actions.act_window',
+        }
+        if goal.computation_mode == 'manually':
+            action['res_model'] = 'gamification.goal.wizard'
+        else:
+            action['res_model'] = goal.type_id.model_id  # TOCHECK
+        return action
+
+
+class goal_manual_wizard(osv.TransientModel):
+    """Wizard type to update a manual goal"""
+    _name = 'gamification.goal.wizard'
+    _columns = {
+        'goal_id': fields.many2one("gamification.goal", string='Goal'),
+        'current': fields.text('Current'),
+    }
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 485f18b67dd..cf6542b3456 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -24,6 +24,34 @@ openerp.gamification = function(instance) {
                 var goal_id = parseInt(event.currentTarget.id);
                 this.$el.find('.oe_type_description_'+goal_id).toggle(10);
             },
+            'click a.oe_goal_action': function(event) {
+                var self = this;
+                var goal_id = parseInt(event.currentTarget.id);
+                var goal_action = new instance.web.Model('gamification.goal').call('get_action', [goal_id]);
+
+                console.log(goal_action);
+                // var action = {
+                //     name : 'Complete Profile',
+                //     type: 'ir.actions.act_window',
+                //     res_model: 'res.users',
+                //     views: [[false, 'form']],
+                //     res_id : event.data.uid,
+                //     target: 'new',
+                //     flags : { action_buttons: true },
+                // };
+                // var action_manager = new instance.web.ActionManager(this);
+                // action_manager.do_action(action);
+                // var form = action_manager.dialog_widget.views.form.controller;
+                // form.on('load_record', self, function(){
+                //     form.fields[$(self).attr('id')].$el.find("input").focus()
+                // })
+                // form.on("on_button_cancel", action_manager.dialog, action_manager.dialog.close);
+                // form.on('save', self, function() {
+                //     action_manager.dialog.close();
+                //     location.reload();
+                // });
+
+            }
         },
         renderElement: function() {
             var self = this;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 768000ba74e..2019a9f86c8 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -7,9 +7,9 @@
             <h3><t t-esc="plan.name"/></h3>
             <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
-                        <t t-esc="goal.type_name" />
-                    </strong>
+                    <a class="oe_goal_action" t-att-id="goal.id">
+                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong>
+                    </a>
                     <t t-if="goal.type_description">
                         <a class="oe_show_description" t-att-id="goal.id">?</a>
                         <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p>

From c22dd466102ff04d692c3e2033d3d31bbf556aba Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Sun, 24 Mar 2013 16:39:34 +0100
Subject: [PATCH 212/547] [FIX] cron call with empty context

bzr revid: mat@openerp.com-20130324153934-pmaw4nlb8z02tfnq
---
 addons/gamification/badge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index bb958d7d4b4..1ee779880d6 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -228,7 +228,7 @@ class gamification_badge(osv.Model):
 
         return res
 
-    def _cron_check(self, cr, uid, context):
+    def _cron_check(self, cr, uid, context=None):
         """Run cron on all automatic goals"""
         ids = self.search(cr, uid, [('rule_automatic', '!=', 'manual')], context=context)
         self.check_automatic(cr, uid, ids, context=context)

From 8a04406a28fb8a3a4b49c04a6bb9609fd8b9260e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Sun, 24 Mar 2013 19:05:57 +0100
Subject: [PATCH 213/547] [IMP] action button (almost working)

bzr revid: mat@openerp.com-20130324180557-ttos23t09uayh6zx
---
 addons/gamification/goal.py                   | 34 +++++++++++++------
 addons/gamification/goal_view.xml             | 20 +++++++++++
 .../static/src/js/gamification.js             | 31 +++++------------
 3 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index facf623e905..976ea5ce8ef 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -309,25 +309,22 @@ class gamification_goal(osv.Model):
         """Get the ir.action related to update the goal
 
         In case of a manual goal, should return a wizard to update the value
-        :return: dict like
-        {
-            'name':'Action name',
-            'id': goal_id,
-            'type': 'ir.actions.act_window',
-            'res_model': goal.type_id.model_id,
-            'view': 'form',
-        }
+        :return: action description in a dictionnary
         """
         goal = self.browse(cr, uid, goal_id, context=context)
         action = {
             'name': "Update %s" % goal.type_id.name,
             'id': goal_id,
             'type': 'ir.actions.act_window',
+            'target': 'new',
         }
         if goal.computation_mode == 'manually':
             action['res_model'] = 'gamification.goal.wizard'
+            action['views'] = [[False, 'form']]
+            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current},
         else:
-            action['res_model'] = goal.type_id.model_id  # TOCHECK
+            action['res_model'] = goal.type_id.model_id.model
+            action['views'] = [[False, 'tree']]
         return action
 
 
@@ -336,5 +333,22 @@ class goal_manual_wizard(osv.TransientModel):
     _name = 'gamification.goal.wizard'
     _columns = {
         'goal_id': fields.many2one("gamification.goal", string='Goal'),
-        'current': fields.text('Current'),
+        'current': fields.float('Current'),
     }
+
+    def action_update_current(self, cr, uid, ids, context=None):
+        """Wizard action for updating the current value"""
+        if context is None:
+            context = {}
+
+        goal_obj = self.pool.get('gamification.goal')
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            towrite = {
+                'current': wiz.current,
+                'goal_id': wiz.goal_id.id,
+            }
+            print(towrite)
+            goal_obj.write(cr, uid, [wiz.goal_id.id], towrite, context=context)
+            goal_obj.update(cr, uid, [wiz.goal_id.id], context=context)
+        return {}
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 7f3cdd764c6..cc5f5027e04 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -246,6 +246,26 @@
             </field>
         </record>
 
+
+        <record id="view_goal_wizard_update_current" model="ir.ui.view">
+            <field name="name">Update the current value of the Goal</field>
+            <field name="model">gamification.goal.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Grant Badge To" version="7.0">
+                    Set the current value you have reached for this goal
+                    <group>
+                        <field name="goal_id" invisible="1"/>
+                        <field name="current" />
+                    </group>
+                    <footer>
+                        <button string="Update" type="object" name="action_update_current" class="oe_highlight" /> or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+
         <!-- menus in settings - technical feature required -->
         <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration" groups="base.group_no_one" />
             <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index cf6542b3456..d24e0b4159c 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -27,29 +27,16 @@ openerp.gamification = function(instance) {
             'click a.oe_goal_action': function(event) {
                 var self = this;
                 var goal_id = parseInt(event.currentTarget.id);
-                var goal_action = new instance.web.Model('gamification.goal').call('get_action', [goal_id]);
+                var goal_action = new instance.web.Model('gamification.goal').call('get_action', [goal_id]).then(function(res) {
+                    goal_action['action'] = res;
+                });
+                $.when(goal_action).done(function() {
+                    console.log(goal_action);
+                    var action_manager = new instance.web.ActionManager(this);
+                    action_manager.do_action(goal_action.action);
 
-                console.log(goal_action);
-                // var action = {
-                //     name : 'Complete Profile',
-                //     type: 'ir.actions.act_window',
-                //     res_model: 'res.users',
-                //     views: [[false, 'form']],
-                //     res_id : event.data.uid,
-                //     target: 'new',
-                //     flags : { action_buttons: true },
-                // };
-                // var action_manager = new instance.web.ActionManager(this);
-                // action_manager.do_action(action);
-                // var form = action_manager.dialog_widget.views.form.controller;
-                // form.on('load_record', self, function(){
-                //     form.fields[$(self).attr('id')].$el.find("input").focus()
-                // })
-                // form.on("on_button_cancel", action_manager.dialog, action_manager.dialog.close);
-                // form.on('save', self, function() {
-                //     action_manager.dialog.close();
-                //     location.reload();
-                // });
+                    //var form = action_manager.dialog_widget.views.form.controller;
+                });
 
             }
         },

From 0ef116ce06e6795af661d924a211938f198a4289 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Mar 2013 10:00:10 +0100
Subject: [PATCH 214/547] [FIX] working context for goal wizard

bzr revid: mat@openerp.com-20130325090010-8lf3oqznzxizbh92
---
 addons/gamification/goal.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 976ea5ce8ef..0e2a14de093 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -319,9 +319,9 @@ class gamification_goal(osv.Model):
             'target': 'new',
         }
         if goal.computation_mode == 'manually':
+            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
             action['res_model'] = 'gamification.goal.wizard'
             action['views'] = [[False, 'form']]
-            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current},
         else:
             action['res_model'] = goal.type_id.model_id.model
             action['views'] = [[False, 'tree']]
@@ -348,7 +348,6 @@ class goal_manual_wizard(osv.TransientModel):
                 'current': wiz.current,
                 'goal_id': wiz.goal_id.id,
             }
-            print(towrite)
             goal_obj.write(cr, uid, [wiz.goal_id.id], towrite, context=context)
             goal_obj.update(cr, uid, [wiz.goal_id.id], context=context)
         return {}

From 364612d0be52e6677a26f8a083d58b52d81c7f0a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Mar 2013 16:39:53 +0100
Subject: [PATCH 215/547] [IMP] use board view for sidebar

bzr revid: mat@openerp.com-20130325153953-zch12sfx62s5i6xc
---
 addons/gamification/goal.py                   |   2 +-
 addons/gamification/plan.py                   | 150 +++++++++++-------
 addons/gamification/res_users.py              |  81 +++++++---
 addons/gamification/static/src/css/goal.css   |   7 +
 .../static/src/js/gamification.js             |   2 -
 .../static/src/xml/gamification.xml           |  25 ++-
 .../templates/group_progress.mako             |   2 +-
 7 files changed, 177 insertions(+), 92 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 0e2a14de093..5ecb0ca6779 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -316,12 +316,12 @@ class gamification_goal(osv.Model):
             'name': "Update %s" % goal.type_id.name,
             'id': goal_id,
             'type': 'ir.actions.act_window',
-            'target': 'new',
         }
         if goal.computation_mode == 'manually':
             action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
             action['res_model'] = 'gamification.goal.wizard'
             action['views'] = [[False, 'form']]
+            action['target'] = 'new'
         else:
             action['res_model'] = goal.type_id.model_id.model
             action['views'] = [[False, 'tree']]
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 31cf10e6779..a9e4498edd0 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -404,6 +404,88 @@ class gamification_goal_plan(osv.Model):
             self.write(cr, uid, ids, {'user_ids': [(4, user) for user in unified_subscription]}, context=context)
         return True
 
+    def get_board_goal_info(self, cr, uid, plan, subset_goal_ids=False, context=None):
+        """Get the list of latest goals for a plan, sorted by user ranking for each planline"""
+
+        goal_obj = self.pool.get('gamification.goal')
+        planlines_boards = []
+        (start_date, end_date) = start_end_date_for_period(plan.period)
+
+        for planline in plan.planline_ids:
+
+            domain = [
+                ('planline_id', '=', planline.id),
+                ('state', 'in', ('inprogress', 'inprogress_update',
+                                 'reached', 'failed')),
+            ]
+
+            if subset_goal_ids:
+                goal_ids = goal_obj.search(cr, uid, domain, context=context)
+                common_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
+            else:
+                # if no subset goals, use the dates for restriction
+                if start_date:
+                    domain.append(('start_date', '=', start_date.isoformat()))
+                if end_date:
+                    domain.append(('end_date', '=', end_date.isoformat()))
+                common_goal_ids = goal_obj.search(cr, uid, domain, context=context)
+
+            board_goals = [goal for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context)]
+
+            # most complete first, current if same percentage (eg: if several 100%)
+            sorted_board = enumerate(sorted(board_goals, key=lambda k: (k.completeness, k.current), reverse=True))
+            planlines_boards.append({'goal_type': planline.type_id, 'board_goals': sorted_board})
+        return planlines_boards
+
+    def get_indivual_goal_info(self, cr, uid, user_id, plan, subset_goal_ids=False, context=None):
+        """Get the list of latest goals of a user for a plan"""
+        domain = [
+            ('plan_id', '=', plan.id),
+            ('user_id', '=', user_id),
+            ('state', 'in', ('inprogress', 'inprogress_update',
+                             'reached', 'failed')),
+        ]
+        goal_obj = self.pool.get('gamification.goal')
+        (start_date, end_date) = start_end_date_for_period(plan.period)
+
+        if subset_goal_ids:
+            # use the domain for safety, don't want irrelevant report if wrong argument
+            goal_ids = goal_obj.search(cr, uid, domain, context=context)
+            related_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
+        else:
+            # if no subset goals, use the dates for restriction
+            if start_date:
+                domain.append(('start_date', '=', start_date.isoformat()))
+            if end_date:
+                domain.append(('end_date', '=', end_date.isoformat()))
+            related_goal_ids = goal_obj.search(cr, uid, domain, context=context)
+
+        if len(related_goal_ids) == 0:
+            print("no related_goal_ids")
+            return False
+
+        values = {'goals': []}
+        all_done = True
+        for goal in goal_obj.browse(cr, uid, related_goal_ids, context=context):
+            if goal.end_date:
+                if goal.end_date < fields.date.today():
+                    # do not include goals of previous plan run
+                    continue
+                else:
+                    all_done = False
+            else:
+                if goal.state == 'inprogress' or goal.state == 'inprogress_update':
+                    all_done = False
+
+            values['goals'].append(goal)
+
+        if all_done:
+            # skip plans where all goal are done or failed
+            print("all_done")
+            return False
+        else:
+            return values
+
     def report_progress(self, cr, uid, plan, context=None, users=False, subset_goal_ids=False):
         """Post report about the progress of the goals
 
@@ -423,43 +505,8 @@ class gamification_goal_plan(osv.Model):
         goal_obj = self.pool.get('gamification.goal')
         template_env = TemplateHelper()
 
-        (start_date, end_date) = start_end_date_for_period(plan.period)
-
         if plan.visibility_mode == 'board':
-            # generate a shared report
-            planlines_boards = []
-
-            for planline in plan.planline_ids:
-
-                domain = [
-                    ('planline_id', '=', planline.id),
-                    ('state', 'in', ('inprogress', 'inprogress_update',
-                                     'reached', 'failed')),
-                ]
-
-                if subset_goal_ids:
-                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                    common_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
-                else:
-                    # if no subset goals, use the dates for restriction
-                    if start_date:
-                        domain.append(('start_date', '=', start_date.isoformat()))
-                    if end_date:
-                        domain.append(('end_date', '=', end_date.isoformat()))
-                    common_goal_ids = goal_obj.search(cr, uid, domain, context=context)
-
-                board_goals = []
-                for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context):
-                    board_goals.append({
-                        'user': goal.user_id,
-                        'current':goal.current,
-                        'target_goal':goal.target_goal,
-                        'completeness':goal.completeness,
-                    })
-
-                # most complete first, current if same percentage (eg: if several 100%)
-                sorted_board = enumerate(sorted(board_goals, key=lambda k: (k['completeness'], k['current']), reverse=True))
-                planlines_boards.append({'goal_type': planline.type_id.name, 'board_goals': sorted_board})
+            planlines_boards = self.get_board_goal_info(cr, uid, plan, subset_goal_ids, context)
 
             body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards})
 
@@ -477,33 +524,14 @@ class gamification_goal_plan(osv.Model):
         else:
             # generate individual reports
             for user in users or plan.user_ids:
-                domain = [
-                    ('plan_id', '=', plan.id),
-                    ('user_id', '=', user.id),
-                    ('state', 'in', ('inprogress', 'inprogress_update',
-                                     'reached', 'failed')),
-                ]
-                if subset_goal_ids:
-                    # use the domain for safety, don't want irrelevant report if wrong argument
-                    goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                    related_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
-                else:
-                    # if no subset goals, use the dates for restriction
-                    if start_date:
-                        domain.append(('start_date', '=', start_date.isoformat()))
-                    if end_date:
-                        domain.append(('end_date', '=', end_date.isoformat()))
-                related_goal_ids = goal_obj.search(cr, uid, domain, context=context)
-
-                if len(related_goal_ids) == 0:
+                values = self.get_indivual_goal_info(cr, uid, user.id, plan, subset_goal_ids, context=context)
+                if not values:
                     continue
 
-                variables = {
-                    'object': plan,
-                    'user': user,
-                    'goals': goal_obj.browse(cr, uid, related_goal_ids, context=context)
-                }
-                body_html = template_env.get_template('personal_progress.mako').render(variables)
+                values['object'] = plan
+                values['user'] = user,
+
+                body_html = template_env.get_template('personal_progress.mako').render(values)
 
                 self.message_post(cr, uid, plan.id,
                                   body=body_html,
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 4e87ce88180..cbec5adb0cf 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -24,38 +24,69 @@ class res_users_gamification_group(osv.Model):
 
     def get_goals_todo_info(self, cr, uid, context=None):
         """Return the list of goals assigned to the user, grouped by plan"""
-        goals_info = []
-        goal_obj = self.pool.get('gamification.goal')
+        all_goals_info = []
         plan_obj = self.pool.get('gamification.goal.plan')
+
         plan_ids = plan_obj.search(cr, uid, [('user_ids', 'in', uid)], context=context)
         for plan in plan_obj.browse(cr, uid, plan_ids, context=context):
-            vals = {'name': plan.name, 'goals': []}
+            # serialize goals info to be able to use it in javascript
+            serialized_goals_info = {
+                'name': plan.name,
+                'visibility_mode': plan.visibility_mode
+            }
 
-            goal_ids = goal_obj.search(cr, uid, [('user_id', '=', uid), ('plan_id', '=', plan.id)], context=context)
-            all_done = True
-            for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
-                if goal.last_update and goal.end_date and goal.last_update > goal.end_date:
-                    # do not include goals of previous plan run
+            if plan.visibility_mode == 'board':
+                # board report should be grouped by planline for all users
+                print("board plan")
+                goals_info = plan_obj.get_board_goal_info(cr, uid, plan, subset_goal_ids=False, context=context)
+
+                if not goals_info:
+                    print("skipping")
                     continue
 
-                if goal.state == 'inprogress' or goal.state == 'inprogress_update':
-                    all_done = False
+                serialized_goals_info['planlines'] = []
+                for planline_board in goals_info:
+                    vals = {'type_name': planline_board['goal_type'].name,
+                            'type_description': planline_board['goal_type'].description,
+                            'type_condition': planline_board['goal_type'].condition,
+                            'goals': []}
+                    for goal in planline_board['board_goals']:
+                        vals['goals'].append({
+                            'rank': goal[0]+1,
+                            'id': goal[1].id,
+                            'user_name': goal[1].user_id.name,
+                            'state': goal[1].state,
+                            'completeness': goal[1].completeness,
+                            'current': goal[1].current,
+                            'target_goal': goal[1].target_goal,
+                        })
+                    serialized_goals_info['planlines'].append(vals)
 
-                vals['goals'].append({
-                    'id': goal.id,
-                    'type_name': goal.type_id.name,
-                    'type_condition': goal.type_id.condition,
-                    'type_description': goal.type_description,
-                    'state': goal.state,
-                    'completeness': goal.completeness,
-                    'computation_mode': goal.computation_mode,
-                    'current': goal.current,
-                    'target_goal': goal.target_goal,
-                })
-            # skip plans where all goal are done or failed
-            if not all_done:
-                goals_info.append(vals)
-        return goals_info
+            else:
+                # individual report are simply a list of goal
+                print("individual plan")
+                goals_info = plan_obj.get_indivual_goal_info(cr, uid, uid, plan, subset_goal_ids=False, context=context)
+
+                if not goals_info:
+                    print("skipping")
+                    continue
+
+                serialized_goals_info['goals'] = []
+                for goal in goals_info['goals']:
+                    serialized_goals_info['goals'].append({
+                        'id': goal.id,
+                        'type_name': goal.type_id.name,
+                        'type_condition': goal.type_id.condition,
+                        'type_description': goal.type_description,
+                        'state': goal.state,
+                        'completeness': goal.completeness,
+                        'computation_mode': goal.computation_mode,
+                        'current': goal.current,
+                        'target_goal': goal.target_goal,
+                    })
+
+            all_goals_info.append(serialized_goals_info)
+        return all_goals_info
 
 
 class res_groups_gamification_group(osv.Model):
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 8757006aad1..8feb80ed4ad 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -58,6 +58,13 @@
 .openerp .oe_mail_wall .oe_mail_wall_aside li {
     margin-bottom: 15px;
 }
+.openerp .oe_mail_wall .oe_mail_wall_aside table {
+  margin: 10px 0;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside table progress {
+  width: 100%;
+  display: inline-block;
+}
 .openerp .oe_mail_wall .oe_mail_wall_aside li progress {
     width: 80%;
     display: inline-block;
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index d24e0b4159c..28323b29421 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -1,5 +1,4 @@
 openerp.gamification = function(instance) {
-    console.log("Debug statement: file loaded");
     var QWeb = instance.web.qweb;
 
     instance.gamification.Sidebar = instance.web.Widget.extend({
@@ -31,7 +30,6 @@ openerp.gamification = function(instance) {
                     goal_action['action'] = res;
                 });
                 $.when(goal_action).done(function() {
-                    console.log(goal_action);
                     var action_manager = new instance.web.ActionManager(this);
                     action_manager.do_action(goal_action.action);
 
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 2019a9f86c8..be287bdccaf 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -5,7 +5,8 @@
     <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">
             <h3><t t-esc="plan.name"/></h3>
-            <ul class="oe_goals_list">
+            <t t-if="plan.visibility_mode == 'progressbar'">
+                <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
                     <a class="oe_goal_action" t-att-id="goal.id">
                         <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong>
@@ -26,7 +27,27 @@
                         </a>
                     </p>
                 </li>
-            </ul>
+                </ul>
+            </t>
+            <t t-if="plan.visibility_mode == 'board'">
+                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline">
+                    <tr>
+                        <th colspan="4"><t t-esc="planline.goal_type"/></th>
+                    </tr>
+                    <tr>
+                        <th>#</th>
+                        <th>Pers.</th>
+                        <th>compl.</th>
+                        <th>Current</th>
+                    </tr>
+                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.completness >= 100 ? 'oe_bold' : ''}">
+                        <td><t t-esc="goal.rank" /></td>
+                        <td><t t-esc="goal.user_name" /></td>
+                        <td><progress t-att-value="goal.completeness" max="100" /></td>
+                        <td><t t-esc="goal.current" />/<t t-esc="goal.target_goal" /></td>
+                    </tr>
+                </table>
+            </t>
         </div>
     </t>
 
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index e875b3466f8..3dc9c3177a1 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -8,7 +8,7 @@
         	</tr>
         	<tr>
 	            <th>#</th>
-	            <th>User</th>
+	            <th>Person</th>
 	            <th>Completeness</th>
 	            <th>Current</th>
 	        </tr>

From 0aa973b9f024ebefaa2f2ec9f47060e721a5c54a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Mar 2013 17:15:27 +0100
Subject: [PATCH 216/547] [IMP] refresh button for plan

bzr revid: mat@openerp.com-20130325161527-qes3lqpzevdmdsx6
---
 addons/gamification/plan.py                         |  8 ++++++++
 addons/gamification/static/src/css/goal.css         |  4 ++++
 addons/gamification/static/src/js/gamification.js   | 11 +++++++++--
 addons/gamification/static/src/xml/gamification.xml |  5 +++--
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index a9e4498edd0..607f04ca98b 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -262,6 +262,14 @@ class gamification_goal_plan(osv.Model):
                 self.report_progress(cr, uid, plan, context=context)
                 self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
 
+    def quick_update(self, cr, uid, plan_id, context=None):
+        """Update all the goals of a plan, no generation of new goals"""
+        if not context: context = {}
+        plan = self.browse(cr, uid, plan_id, context=context)
+        goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('plan_id', '=', plan_id)], context=context)
+        self.pool.get('gamification.goal').update(cr, uid, goal_ids, context=context)
+        return True
+
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
 
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 8feb80ed4ad..84f07df8e4a 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -72,6 +72,10 @@
 .openerp .oe_mail_wall .oe_mail_wall_aside li p {
     margin:5px 0;
 }
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_update_plan {
+  display: inline-block;
+  float: right;
+}
 .openerp .oe_mail_wall .oe_mail {
     display: inline-block;
 }
\ No newline at end of file
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 28323b29421..08b6155a4f1 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -19,6 +19,14 @@ openerp.gamification = function(instance) {
                     self.get_goal_todo_info();
                 });
             },
+            'click a.oe_update_plan': function(event) {
+                var self = this;
+                var plan_id = parseInt(event.currentTarget.id);
+                var goals_updated = new instance.web.Model('gamification.goal.plan').call('quick_update', [plan_id]);
+                $.when(goals_updated).done(function() {
+                    self.get_goal_todo_info();
+                });
+            },
             'click a.oe_show_description': function(event) {
                 var goal_id = parseInt(event.currentTarget.id);
                 this.$el.find('.oe_type_description_'+goal_id).toggle(10);
@@ -35,8 +43,7 @@ openerp.gamification = function(instance) {
 
                     //var form = action_manager.dialog_widget.views.form.controller;
                 });
-
-            }
+            },
         },
         renderElement: function() {
             var self = this;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index be287bdccaf..70a47eeb6df 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,6 +4,7 @@
     </t>
     <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">
+            <em><a class="oe_update_plan" rol="button" t-attf-id="{plan.id}">refresh</a></em>
             <h3><t t-esc="plan.name"/></h3>
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
@@ -22,9 +23,9 @@
                         <t t-if="goal.type_condition == 'lower'">
                             <t t-esc="goal.current" /> (less than <t t-esc="goal.target_goal"/>)
                         </t>
-                        <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
+                        <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
                             <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
-                        </a>
+                        </a> -->
                     </p>
                 </li>
                 </ul>

From bfcf26bf19610e70b41954ff4e2c3818c1e53a77 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Mar 2013 17:52:35 +0100
Subject: [PATCH 217/547] [IMP] use help to show goal description

bzr revid: mat@openerp.com-20130325165235-q0wwyrdfrak5utkr
---
 addons/gamification/static/src/js/gamification.js   |  8 ++++----
 addons/gamification/static/src/xml/gamification.xml | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 08b6155a4f1..01004d94edd 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -27,10 +27,10 @@ openerp.gamification = function(instance) {
                     self.get_goal_todo_info();
                 });
             },
-            'click a.oe_show_description': function(event) {
-                var goal_id = parseInt(event.currentTarget.id);
-                this.$el.find('.oe_type_description_'+goal_id).toggle(10);
-            },
+            // 'click a.oe_show_description': function(event) {
+            //     var goal_id = parseInt(event.currentTarget.id);
+            //     this.$el.find('.oe_type_description_'+goal_id).toggle(10);
+            // },
             'click a.oe_goal_action': function(event) {
                 var self = this;
                 var goal_id = parseInt(event.currentTarget.id);
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 70a47eeb6df..d68b7320e90 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -5,17 +5,17 @@
     <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">
             <em><a class="oe_update_plan" rol="button" t-attf-id="{plan.id}">refresh</a></em>
-            <h3><t t-esc="plan.name"/></h3>
+            <h3><t t-esc="plan.name" /></h3>
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <a class="oe_goal_action" t-att-id="goal.id">
+                    <a class="oe_goal_action" t-att-id="goal.id" t-att-title="goal.type_description">
                         <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong>
                     </a>
-                    <t t-if="goal.type_description">
+                    <!-- <t t-if="goal.type_description">
                         <a class="oe_show_description" t-att-id="goal.id">?</a>
                         <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p>
-                    </t>
+                    </t> -->
                     <p>
                         <t t-if="goal.type_condition == 'higher'">
                             <progress t-att-value="goal.completeness" max="100"/>
@@ -33,7 +33,8 @@
             <t t-if="plan.visibility_mode == 'board'">
                 <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline">
                     <tr>
-                        <th colspan="4"><t t-esc="planline.goal_type"/></th>
+                    <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}"><t t-esc="planline.type_name"/>
+                        </th>
                     </tr>
                     <tr>
                         <th>#</th>

From 635df4028a8cf9d5185e31d21df67daf609506b3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Mar 2013 16:45:53 +0100
Subject: [PATCH 218/547] [ADD] monetary field

bzr revid: mat@openerp.com-20130326154553-t8cacle6s1oll4r9
---
 addons/gamification/goal.py                   |  8 +++---
 addons/gamification/goal_view.xml             |  2 ++
 addons/gamification/res_users.py              | 11 ++++++--
 .../static/src/js/gamification.js             | 20 ++++++++++++++-
 .../static/src/xml/gamification.xml           | 25 ++++++++++++++-----
 .../gamification_sale_crm/sale_crm_goals.xml  |  6 ++---
 6 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 5ecb0ca6779..40cc304806c 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -40,6 +40,7 @@ class gamification_goal_type(osv.Model):
     _columns = {
         'name': fields.char('Type Name', required=True, translate=True),
         'description': fields.text('Description'),
+        'monetary': fields.boolean('Use Currency', help="The target and current value used is monetary"),
         'unit': fields.char('Unit',
             help="The unit of the target and current values", translate=True),
         'computation_mode': fields.selection([
@@ -76,13 +77,14 @@ class gamification_goal_type(osv.Model):
             help='Sequence number for ordering',
             required=True),
     }
-    
+
     _order = 'sequence'
     _defaults = {
         'sequence': 1,
         'condition': 'higher',
-        'computation_mode':'manually',
-        'domain':"[]",
+        'computation_mode': 'manually',
+        'domain': "[]",
+        'monetary': False,
     }
 
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index cc5f5027e04..1877c4fc3dd 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -214,6 +214,8 @@
                             <group string="General">
                                 <field name="description"/>
                                 <field name="condition"/>
+                                <field name="monetary" />
+                                <field name="unit" attrs="{'invisible': [('monetary', '=', True)]}"/>
                             </group>
                             <group string="Computation">
                                 <field name="computation_mode"/>
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index cbec5adb0cf..70d8054b3cb 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -32,8 +32,10 @@ class res_users_gamification_group(osv.Model):
             # serialize goals info to be able to use it in javascript
             serialized_goals_info = {
                 'name': plan.name,
-                'visibility_mode': plan.visibility_mode
+                'visibility_mode': plan.visibility_mode,
             }
+            user = self.browse(cr, uid, uid, context=context)
+            serialized_goals_info['currency'] = user.company_id.currency_id.id
 
             if plan.visibility_mode == 'board':
                 # board report should be grouped by planline for all users
@@ -49,6 +51,9 @@ class res_users_gamification_group(osv.Model):
                     vals = {'type_name': planline_board['goal_type'].name,
                             'type_description': planline_board['goal_type'].description,
                             'type_condition': planline_board['goal_type'].condition,
+                            'type_computation_mode': planline_board['goal_type'].computation_mode,
+                            'type_monetary': planline_board['goal_type'].monetary,
+                            'type_unit': planline_board['goal_type'].unit,
                             'goals': []}
                     for goal in planline_board['board_goals']:
                         vals['goals'].append({
@@ -76,8 +81,10 @@ class res_users_gamification_group(osv.Model):
                     serialized_goals_info['goals'].append({
                         'id': goal.id,
                         'type_name': goal.type_id.name,
-                        'type_condition': goal.type_id.condition,
                         'type_description': goal.type_description,
+                        'type_condition': goal.type_id.condition,
+                        'type_monetary': goal.type_id.monetary,
+                        'type_unit': goal.type_id.unit,
                         'state': goal.state,
                         'completeness': goal.completeness,
                         'computation_mode': goal.computation_mode,
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 01004d94edd..62de4835842 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -64,13 +64,31 @@ openerp.gamification = function(instance) {
                 self.goals_info['info'] = res
             });
             $.when(goals_info).done(function() {
-                console.log(self.goals_info.info);
                 if(self.goals_info.info.length > 0){
                     self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
                     self.$el.find('.oe_type_description').hide();
+                    self.render_money_fields(self.goals_info.info[0].currency);
                 }
             });
         },
+        render_money_fields: function(currency_id) {
+            var self = this;
+
+            self.dfm = new instance.web.form.DefaultFieldManager(self);
+            self.$el.find(".oe_goal_field_monetary").each(function() {
+                money_field = new instance.web.form.FieldMonetary(self.dfm, {
+                    attrs: {
+                        modifiers: '{"readonly": true}'
+                    }
+                });
+                money_field.set('currency', currency_id);
+                money_field.get_currency_info();
+                money_field.set('value', parseInt($(this).text()));
+                console.log(money_field.get('value'));
+                money_field.replace($(this));
+                console.log(money_field.$el.html());
+            });
+        }
     });
 
     instance.mail.Widget.include({
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index d68b7320e90..bbd005e5c2a 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,19 +9,25 @@
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <a class="oe_goal_action" t-att-id="goal.id" t-att-title="goal.type_description">
-                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong>
-                    </a>
+                    <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
+                    <t t-if="goal.computation_mode == 'manually'">
+                        <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                    </t>
                     <!-- <t t-if="goal.type_description">
                         <a class="oe_show_description" t-att-id="goal.id">?</a>
                         <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p>
                     </t> -->
                     <p>
                         <t t-if="goal.type_condition == 'higher'">
+                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
                             <progress t-att-value="goal.completeness" max="100"/>
                         </t>
                         <t t-if="goal.type_condition == 'lower'">
-                            <t t-esc="goal.current" /> (less than <t t-esc="goal.target_goal"/>)
+                            <t t-esc="goal.current" /> (less than 
+                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                            )
                         </t>
                         <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
                             <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
@@ -33,7 +39,11 @@
             <t t-if="plan.visibility_mode == 'board'">
                 <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline">
                     <tr>
-                    <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}"><t t-esc="planline.type_name"/>
+                        <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
+                            <t t-esc="planline.type_name"/>
+                            <t t-if="planline.type_computation_mode == 'manually'">
+                                <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                            </t>
                         </th>
                     </tr>
                     <tr>
@@ -46,7 +56,10 @@
                         <td><t t-esc="goal.rank" /></td>
                         <td><t t-esc="goal.user_name" /></td>
                         <td><progress t-att-value="goal.completeness" max="100" /></td>
-                        <td><t t-esc="goal.current" />/<t t-esc="goal.target_goal" /></td>
+                        <td>
+                            <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                            <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
+                        </td>
                     </tr>
                 </table>
             </t>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 0c5683f4fca..1ecc144c47a 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -7,7 +7,7 @@
             <field name="name">Total Invoiced</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
-            <field name="unit">€</field>
+            <field name="monetary">True</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
@@ -92,7 +92,7 @@
             <field name="name">Total Paid Sales Orders</field>
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
-            <field name="unit">€</field>
+            <field name="monetary">True</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
@@ -115,7 +115,7 @@
             <field name="description">The total refunded value is a negative value. Validated when higher (min refunded).</field>
             <field name="computation_mode">sum</field>
             <field name="condition">higher</field>
-            <field name="unit">€</field>
+            <field name="monetary">True</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />

From 6674de3e04d258d9408034f15270ac98f4e31c9e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Mar 2013 17:43:15 +0100
Subject: [PATCH 219/547] [IMP] better css

bzr revid: mat@openerp.com-20130326164315-c917of9zp771loz0
---
 addons/gamification/static/src/css/goal.css         | 12 ++++++------
 addons/gamification/static/src/xml/gamification.xml |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 84f07df8e4a..3d2c25d1cad 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -27,7 +27,7 @@
     position: relative;
     display: inline-block;
     vertical-align: top;
-    width: 250px;
+    width: 300px;
 }
 .openerp .oe_mail_wall_aside .oe_gamification_goal {
     background: #EDEDF6;
@@ -59,11 +59,11 @@
     margin-bottom: 15px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table {
-  margin: 10px 0;
+    margin: 10px 0;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table progress {
-  width: 100%;
-  display: inline-block;
+    width: 100%;
+    display: inline-block;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside li progress {
     width: 80%;
@@ -73,8 +73,8 @@
     margin:5px 0;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_update_plan {
-  display: inline-block;
-  float: right;
+    display: inline-block;
+    float: right;
 }
 .openerp .oe_mail_wall .oe_mail {
     display: inline-block;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index bbd005e5c2a..31664f4c4f4 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -37,7 +37,8 @@
                 </ul>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
-                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline">
+                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline" class="oe_list_content">
+                    <thead>
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
@@ -52,8 +53,10 @@
                         <th>compl.</th>
                         <th>Current</th>
                     </tr>
+                    </thead>
+                    <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.completness >= 100 ? 'oe_bold' : ''}">
-                        <td><t t-esc="goal.rank" /></td>
+                        <th><t t-esc="goal.rank" /></th>
                         <td><t t-esc="goal.user_name" /></td>
                         <td><progress t-att-value="goal.completeness" max="100" /></td>
                         <td>
@@ -61,6 +64,7 @@
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
                         </td>
                     </tr>
+                </tbody>
                 </table>
             </t>
         </div>

From b08a2f2bbc8f615b778ec75e4b8f410626c52800 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 11:50:40 +0100
Subject: [PATCH 220/547] [ADD] user defined action for goal update

bzr revid: mat@openerp.com-20130327105040-ezlg1ml0xvoe5z58
---
 addons/gamification/goal.py                   | 26 ++++++++++++++-----
 addons/gamification/goal_base_data.xml        |  2 ++
 addons/gamification/plan.py                   |  4 +--
 addons/gamification/res_users.py              |  6 ++---
 .../static/src/js/gamification.js             |  3 +--
 .../static/src/xml/gamification.xml           |  4 +--
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 40cc304806c..a020e98e6e5 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -25,6 +25,9 @@ from openerp.tools.safe_eval import safe_eval
 from templates import TemplateHelper
 
 from datetime import date, datetime, timedelta
+import logging
+
+_logger = logging.getLogger(__name__)
 
 
 class gamification_goal_type(osv.Model):
@@ -76,6 +79,8 @@ class gamification_goal_type(osv.Model):
         'sequence': fields.integer('Sequence',
             help='Sequence number for ordering',
             required=True),
+        'action_id': fields.char("Action",
+            help="The action xml id that will be called to update the goal value.")
     }
 
     _order = 'sequence'
@@ -318,16 +323,25 @@ class gamification_goal(osv.Model):
             'name': "Update %s" % goal.type_id.name,
             'id': goal_id,
             'type': 'ir.actions.act_window',
+            'views': [[False, 'form']],
+            'target': 'new',
         }
+        if goal.type_id.action_id:
+            try:
+                model, xml_id = goal.type_id.action_id.split('.', 1)
+                action = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, model, xml_id, context=context)
+                action['res_id'] = uid
+                action['context'] = context
+                return action
+            except ValueError:
+                _logger.warning("Invalid XML ID '%s' for goal action.", goal.type_id.action_id)
+
         if goal.computation_mode == 'manually':
             action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
             action['res_model'] = 'gamification.goal.wizard'
-            action['views'] = [[False, 'form']]
-            action['target'] = 'new'
-        else:
-            action['res_model'] = goal.type_id.model_id.model
-            action['views'] = [[False, 'tree']]
-        return action
+            return action
+
+        return False
 
 
 class goal_manual_wizard(osv.TransientModel):
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index cc757a0126b..fca4a2cd04f 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -10,12 +10,14 @@
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="field_id" eval="ref('base.field_res_partner_tz')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
+            <field name="action_id">base.action_res_users_my</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_avatar">
             <field name="name">Change of avatar</field>
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
+            <field name="action_id">base.action_res_users_my</field>
             <!-- problem : default avatar != False
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 607f04ca98b..9bd658703ed 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -327,7 +327,7 @@ class gamification_goal_plan(osv.Model):
             for planline in plan.planline_ids:
                 goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
                 related_goal_ids.extend(goal_ids)
-        
+
         # process the new view
         if context is None:
             context = {}
@@ -469,7 +469,6 @@ class gamification_goal_plan(osv.Model):
             related_goal_ids = goal_obj.search(cr, uid, domain, context=context)
 
         if len(related_goal_ids) == 0:
-            print("no related_goal_ids")
             return False
 
         values = {'goals': []}
@@ -489,7 +488,6 @@ class gamification_goal_plan(osv.Model):
 
         if all_done:
             # skip plans where all goal are done or failed
-            print("all_done")
             return False
         else:
             return values
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 70d8054b3cb..123bb49c7f0 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -39,11 +39,9 @@ class res_users_gamification_group(osv.Model):
 
             if plan.visibility_mode == 'board':
                 # board report should be grouped by planline for all users
-                print("board plan")
                 goals_info = plan_obj.get_board_goal_info(cr, uid, plan, subset_goal_ids=False, context=context)
 
                 if not goals_info:
-                    print("skipping")
                     continue
 
                 serialized_goals_info['planlines'] = []
@@ -54,6 +52,7 @@ class res_users_gamification_group(osv.Model):
                             'type_computation_mode': planline_board['goal_type'].computation_mode,
                             'type_monetary': planline_board['goal_type'].monetary,
                             'type_unit': planline_board['goal_type'].unit,
+                            'type_action': planline_board['goal_type'].action_id,
                             'goals': []}
                     for goal in planline_board['board_goals']:
                         vals['goals'].append({
@@ -69,11 +68,9 @@ class res_users_gamification_group(osv.Model):
 
             else:
                 # individual report are simply a list of goal
-                print("individual plan")
                 goals_info = plan_obj.get_indivual_goal_info(cr, uid, uid, plan, subset_goal_ids=False, context=context)
 
                 if not goals_info:
-                    print("skipping")
                     continue
 
                 serialized_goals_info['goals'] = []
@@ -85,6 +82,7 @@ class res_users_gamification_group(osv.Model):
                         'type_condition': goal.type_id.condition,
                         'type_monetary': goal.type_id.monetary,
                         'type_unit': goal.type_id.unit,
+                        'type_action': goal.type_id.action_id,
                         'state': goal.state,
                         'completeness': goal.completeness,
                         'computation_mode': goal.computation_mode,
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 62de4835842..dfd8b2f607b 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -75,6 +75,7 @@ openerp.gamification = function(instance) {
             var self = this;
 
             self.dfm = new instance.web.form.DefaultFieldManager(self);
+            // Generate a FieldMonetary for each .oe_goal_field_monetary
             self.$el.find(".oe_goal_field_monetary").each(function() {
                 money_field = new instance.web.form.FieldMonetary(self.dfm, {
                     attrs: {
@@ -84,9 +85,7 @@ openerp.gamification = function(instance) {
                 money_field.set('currency', currency_id);
                 money_field.get_currency_info();
                 money_field.set('value', parseInt($(this).text()));
-                console.log(money_field.get('value'));
                 money_field.replace($(this));
-                console.log(money_field.$el.html());
             });
         }
     });
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 31664f4c4f4..6eca4093084 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,7 +10,7 @@
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
-                    <t t-if="goal.computation_mode == 'manually'">
+                    <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                     </t>
                     <!-- <t t-if="goal.type_description">
@@ -42,7 +42,7 @@
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
-                            <t t-if="planline.type_computation_mode == 'manually'">
+                            <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                             </t>
                         </th>

From c7fc486809cfda927699efeed005dcb764f937c4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 12:16:36 +0100
Subject: [PATCH 221/547] [FIX] correct goal id action buttons

bzr revid: mat@openerp.com-20130327111636-dbg162rd4pvgok0k
---
 addons/gamification/res_users.py                    | 3 +++
 addons/gamification/static/src/xml/gamification.xml | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 123bb49c7f0..c8fa6c409be 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -31,6 +31,7 @@ class res_users_gamification_group(osv.Model):
         for plan in plan_obj.browse(cr, uid, plan_ids, context=context):
             # serialize goals info to be able to use it in javascript
             serialized_goals_info = {
+                'id': plan.id,
                 'name': plan.name,
                 'visibility_mode': plan.visibility_mode,
             }
@@ -64,6 +65,8 @@ class res_users_gamification_group(osv.Model):
                             'current': goal[1].current,
                             'target_goal': goal[1].target_goal,
                         })
+                        if uid == goal[1].user_id.id:
+                            vals['own_goal_id'] = goal[1].id
                     serialized_goals_info['planlines'].append(vals)
 
             else:
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 6eca4093084..481330b7aaa 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,6 +6,7 @@
         <div t-foreach="widget.goals_info.info" t-as="plan">
             <em><a class="oe_update_plan" rol="button" t-attf-id="{plan.id}">refresh</a></em>
             <h3><t t-esc="plan.name" /></h3>
+
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
@@ -43,7 +44,7 @@
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
-                                <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                                <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
                             </t>
                         </th>
                     </tr>
@@ -55,7 +56,7 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.completness >= 100 ? 'oe_bold' : ''}">
+                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
                         <td><t t-esc="goal.user_name" /></td>
                         <td><progress t-att-value="goal.completeness" max="100" /></td>

From a9d9385ee882326df5809e9b6b8adb4a03baf2c7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 12:23:03 +0100
Subject: [PATCH 222/547] [IMP] add action_id in goal_type view form

bzr revid: mat@openerp.com-20130327112303-29dfm6mb1witg7zw
---
 addons/gamification/goal_base_data.xml | 2 +-
 addons/gamification/goal_view.xml      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index fca4a2cd04f..ea6b32c1120 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -17,12 +17,12 @@
             <field name="name">Change of avatar</field>
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
-            <field name="action_id">base.action_res_users_my</field>
             <!-- problem : default avatar != False
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="field_id" eval="ref('base.field_res_partner_image')" />
             <field name="domain">[('id','=',user_id),('partner_id.image', '!=', False)]</field>
+            <field name="action_id">base.action_res_users_my</field>
             -->
         </record>
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 1877c4fc3dd..525a30bb6ae 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -225,6 +225,7 @@
                                 <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]" />
                                 <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
                                 <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
+                                <field name="action_id" />
                             </group>
                         </group>
                     </sheet>

From 6c20a6a5277ec47258aba04da109c4259522987d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 14:27:06 +0100
Subject: [PATCH 223/547] [IMP] css tweaks

bzr revid: mat@openerp.com-20130327132706-bqw9h1oqzh09bj50
---
 addons/gamification/static/src/css/goal.css         | 12 ++++++++++++
 addons/gamification/static/src/xml/gamification.xml |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 3d2c25d1cad..072655cd470 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -61,6 +61,18 @@
 .openerp .oe_mail_wall .oe_mail_wall_aside table {
     margin: 10px 0;
 }
+.oe_mail_wall_aside .oe_list_content tbody tr:nth-child(even) {
+    background-color: #fff;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside table td,th {
+    vertical-align: center;
+    border: none;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 25%; }
+.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 20%; }
+.openerp .oe_mail_wall .oe_mail_wall_aside table td.col3 { width: 45%; }
+/* ... and 10% left for ranking */
+
 .openerp .oe_mail_wall .oe_mail_wall_aside table progress {
     width: 100%;
     display: inline-block;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 481330b7aaa..06dc0292ccd 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -58,9 +58,9 @@
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
-                        <td><t t-esc="goal.user_name" /></td>
-                        <td><progress t-att-value="goal.completeness" max="100" /></td>
-                        <td>
+                        <td class="col1"><t t-esc="goal.user_name" /></td>
+                        <td class="col2"><progress t-att-value="goal.completeness" max="100" /></td>
+                        <td class="col3">
                             <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
                         </td>

From ef4197c8d274be7eaaaa4c48d00c2c21d368aeae Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 09:26:27 +0100
Subject: [PATCH 224/547] [FIX] no warning message for anonymous

bzr revid: mat@openerp.com-20130329082627-cp3iolafolqxsosu
---
 addons/gamification/security/ir.model.access.csv | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 6ef63f3ba55..2ba1b2e4c38 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -1,13 +1,16 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
+goal_anybody,"Goal Anybody",model_gamification_goal,,1,0,0,0
 goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
 goal_user,"Goal User",model_gamification_goal,group_goal_user,1,1,0,0
 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
-goal_type_user,"Goal Type User",model_gamification_goal_type,group_goal_user,1,0,0,0
+goal_type_anybody,"Goal Type Anybody",model_gamification_goal_type,,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
-plan_user,"Goal Plan User",model_gamification_goal_plan,group_goal_user,1,0,0,0
+plan_user_anybody,"Goal Plan Anybody",model_gamification_goal_plan,,1,0,0,0
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
-planline_user,"Goal Planline User",model_gamification_goal_planline,group_goal_user,1,0,0,0
+planline_anybody,"Goal Planline Anybody",model_gamification_goal_planline,,1,0,0,0
 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
 badge_user,"Badge User",model_gamification_badge,group_goal_user,1,1,0,0
+badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0
 badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1
 badge_user_user,"Badge-user User",model_gamification_badge_user,group_goal_user,1,1,1,0
+badge__useranybody,"Badge-user Anybody",model_gamification_badge_user,,1,0,0,0

From 0bc442248babec7b880766dc10751f7e62bd3e78 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 10:10:38 +0100
Subject: [PATCH 225/547] [ADD] icon image and challenge solver badge

bzr revid: mat@openerp.com-20130329091038-6g1os293pll1wi4o
---
 addons/gamification/badge_data.xml          | 403 +++++++++++++++++++-
 addons/gamification/static/src/img/icon.png | Bin 0 -> 22343 bytes
 2 files changed, 401 insertions(+), 2 deletions(-)
 create mode 100644 addons/gamification/static/src/img/icon.png

diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index 03ea1b880a7..5b9142fdc1e 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data noupdate="1">
         <record id="badge_good_job" model="gamification.badge">
-            <field name="name">Good Job Reward</field>
-            <field name="description">Send this badge to people you believe did a good job and deserve a reward.</field>
+            <field name="name">Good Job</field>
+            <field name="description">You did great at your job.</field>
             <field name="rule_auth">everyone</field>
             <field name="rule_automatic">manual</field>
             <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
@@ -229,5 +229,404 @@
                                 CFlBxCruZIizgNvHdgr+P1s09m3W5WsJAAAAAElFTkSuQmCC</field>
         </record>
 
+        <record id="badge_problem_solver" model="gamification.badge">
+            <field name="name">Problem Solver</field>
+            <field name="description">No one can solve challenges like you do.</field>
+            <field name="rule_auth">everyone</field>
+            <field name="rule_automatic">manual</field>
+            <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QAVgB7ADQ3APIQAAAACXBI
+                                WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMdCQASe88aBAAAIABJREFUeNrsvXeYZld15vtbe59z
+                                vlj1Va7OUa1Wq6UWykIJJBAKgEDkYMCAB2xsj8O1fa/TjO0Zj+1nDL4YX3DAeEyOJuNLECAJhFBA
+                                qdXq3K1OFbvyF8/Ze80f+1SpwQotITFg6zxPPWp1f/WdsNde4V3vuw48czxzPHM8czxzPHM8c/xH
+                                POQ/wH090XvUR/nzMwbwU34fcsKfzQl/Zx7h7350wRXwj/Bnf4IR6L9Hg5Cf8QUXwJ7w3+gRforA
+                                OmADsAyo5Z/3wHT+MwbsAeaBFMge4cfnP+4EY9BnDOAnv+jmhMWOgSRf2HOBrcVKdHqpVthQrSUr
+                                40JUTUqWUldCsRKRlCOiyICAKqQdT9Z2dFoZjZkOrUZKu55O12fSQ/WZ5oEs1Z3AA8C9wCzQBjon
+                                GIn7EYN4xgCe5kWPgQIwDKyPi/ZlSdG+vGdZpbbilB5Wbu4hKVk11oiqoqo/siy6dMv6SDcvYERA
+                                wGdKfbbN0V0zjB2YY26yOdJuZl/O2v5rwH5gAmieYBQ/k8YgP8XXdeKiF4Ey8ELgD1Zt7lmx+dnL
+                                qS0rSWQNXj0iBpGHF1qRJ3VzP2oYi4YkCFmqTB1d0J23jsjYwfmHgD8Gbs9DRwNonWAM/mfBEOSn
+                                dOEXXXsZuAL4g00XDK1fc3p/qTZUIiqYsMI/1lI/eatQlKzlmRqpc+DuifqhHdM7gT8FdgBzuTG0
+                                fyR3eMYATmLhI6AEVIBfG1xbfeOarf3D688awMZG1as8ivP+yR4nXIIItOsZe++a4PCDU/tnx5uf
+                                AD4GzAALuVdIf1oNQX4Kzi8nuPlhhDf2Lav8/vnXr6NnuKzeeQkP+qc5XcktQuDYrhnuvfFIOn+8
+                                9WfAF4HxPEQ0TzAEfcYAHt7xBaALeHvvstLvX/KqU225O1Z+hjEK7z0LUx1u+dhu6rOdP8wN4fgJ
+                                hpD9tHgD+T90TpPH+ArwvEpP8p6Lbtg42Lei/PCH5Gcbo1pMHicfWuD2Lx0Ya8ym/wX4Tm4ICz+S
+                                LP6HMQBzAjjTJ4b3nnnFqmu3PHu5Kiqq+jO/8D9qBADqYeeto2y/6ehNwH8BjuQAVOOEsPDv2gAW
+                                Y/3Sru8ZLn/i8tdtolCJQJ/+Hb+4GP9HvIsqKpA2Hd/+yK5sZrT528A38/xg7gRv8BPPDexPaPFt
+                                vut7gT8/+6o1f3rBi9dplBgR5GlfkFKS0FUuY40lzRxelRPs4ek3iHCXmEjYeM6giWN7zdiBuS3A
+                                D/i3EPO/Kw8gJ5R2vVHRfOt5b9yyvjZUelqTPFWlXCiyeXk3Z69sI+khxian6R/ogsIm9k2U2DPS
+                                YnxmGqcOEeFEG3h6DSIY38xYk6//445JlJ8n9CEmgfpPOiQ8nXe6GO8rwAWDayqfueQVmypxKfRu
+                                nupnrKqUkiKnDCWcNrhANRqh1ZhmoNZg9XJLuWRpdtpMTgsjY0Wc7afau5bjjS72jkYcHG8zNT8F
+                                oj9kEE+HMSzmOp1mxi0f39M8frT+u3lIGDshJPxEIGV5mhe/Cly/cnPvP138io3AU5fkLcb0UiFm
+                                dW/Eqt4OZw6P01McR+IGw8MJSVKhXK1iaAMWVfCuydycMjreYnauzeyc0OrUGBhex1R7GYdnejgw
+                                1uLo5Bipaz9t3kEVRBSM8L1P7+Pwjun/CnwJGMlBpM5PAjOQp3Hxu4G3nnLOwJ+fc906VVR+XMhW
+                                VTFGSKKEJEtY11/jpdd0qEX3kDUaZFnG0LKMalcFKGN9AUhQ6mAtaBPR7vB3foxme47I1nCuyPxC
+                                k6l6xvDQuTywdw3v//AemiWHFlKKhQKtrJXv3KfWGFQVMcIDNx/TB2469k7gU3mVMEOAk59WI5Cn
+                                afFrwO+ceeWq39pyyTJVVRGVJ3y2xV1eq9RY1V9hTf8CjfkRztq8gve+az/funmMYtHxc68Z5JU3
+                                1Dh9a0Q4TYbxLQwpnjLGRRAJSorQRn0XqhYkxRlBIjh6MOFzX5jlgx8b574HFsgyZevpPfzJX1xE
+                                dzKNLwyyZ6TKHbuOMd9cQAxPWahQ9YCw785xfvDVwx8C3gsczkvFp9UI5Gna+e/YduXKP95y6Qr1
+                                zssTeTiLiz7Y08+m5cKmoZSiO0izNQs6Bz5j29aEoaH1zM5V2HF/zBe/Msmtt82g4ti2zfLSG8pc
+                                eVkPpbIhcwFzEQxCglOwJkJNxIH9wle+vMBnvjDBHXcu0Gx5Tj2lyA0v7ueF1/RwyqkZ6CgP7V9g
+                                ctLT6NRo+X7i7jUcnirw4NE6c436DxnDkzUEVY8xlh3fPcb93zz6UeBvgEO5EbSersRQnuLFrwKv
+                                OuX8ofedc80aVa8ntfiqSmRjhvtqbBiOWVNr0W0P02g8RGRbFEvQ21tm7coS3V01VDxqPOILiDUI
+                                BWYnq+y43/Ltmxvc+O3jLLTmuPTSIs+5vJvzLzAMDTjIIg6PxNz47Tof++QYt3x3nnZb2bC2wHUv
+                                6OZl1/dx4UVFytUM71rg2xjKOB2jXm/TaiQcn1rgoSMeT4lGOsx0Z5iHposcmcqYbzYxBsTIkwoT
+                                qmCssP2mozxw07H3Ah86wQjaT4cRyFP0HYuL//w1W/s/edHL1p/04leKZS44fZgty+botweYmT7I
+                                zEKHdWsNa9eWSQolvAiJ7Vp6SIhiTAZqwBvA4cWBxKivMjtR4747DD+4u83uPRmj03N0988xO9fh
+                                5u/OMTfvWL2ywGWXVHjbGwY4//wC5a4U71rh+60gqggZeAXTBC0jkqC0Ua3TqHc4cMTx4K6MYpRQ
+                                SAY5OLeC3RMRY7MZrayDmCceIlQVY4V7vn5Ed31v9PeAb+ThYPaExPCnxgAWQZ4ysGrFqbV7Ln3V
+                                pkj10Rf/RESu4npI6gv84a8uYKLjNJrTdHUplSSmUi2iUkQV1CbgTsjGFYzxQIqqRYlRLxgDXh0Q
+                                g9ZYmC/yN++pc89dRXbtP8b2vQeJowgB/uyPT+XVr41ZNtwCGqiLsSrAHGoaGN8N+fnFpOAtiEFt
+                                AHbUNyFzZC5lcnqBxoKlsaB0dVXoJJfyP99/nAULqTQwRp6QV1hkMt388T1+bP/cbwA354nhHE9x
+                                I0l+zN+VHOQZqNSSu65++9b+KDH/5mtVlThKWFaLqOoMAyXH4WNl3vtXD7Jl/XKq1Yy1G+d54xur
+                                XHZxhThSnOugpg1eUCIMEpqukhuAGFCLmhSPA1FsXGB+PuFb30j55w8d5+bvzNJViXjlDX1cdVWZ
+                                NatqPHSgw9e/MccnPzfG1GyHyy/p5k2v7+faa4p09TTx7ZAsQoqogG3hXQOrfQgR3ipiLepb4C1K
+                                CbEeYxPGxwyf/VyDf/7INLfdOUfPYDe//gcXUy3PMlP3HJ6xzDeaIVd4HINYZCF99e+3N2YnWj9P
+                                4CYey8Gi7KlKCuXHjPtJ3tT56At/5cznlLsLP3QDxThmsJqwoqvDYDKBcaMkcZMNaz2rVw+zd/8Q
+                                n/78LPfc7RHfg888pe7jXPk8uP4lNTZujBDTQtseMTn7RyVnASlYg7ElZo4XuPe+Op/+7Dxf/PI0
+                                9QXH857bx+tfPcjllws9/R3QedTHiCYgXUxNOP7/Gxf44Idn+c73pqnVDC950QCvemWVs8+2dNeU
+                                zLWw3iAaI74FongjwQNgEImZq8MPfuD4+CcW+OwXppiczOitWZ5/ZS+veWUf5523wK23jqFOUNPL
+                                eLOX6ayHo7OW2UYHJZS2j2QMqkprIeUr771/j0v114Ddef+g8VRVBvJj/F5M6OO/+eKXb/yfK0/r
+                                ASC2lu6CMFhKWd09w7LqMTppm0oX9A0YNm2I6KqGMkxMRGS7qM+V+OqNC3z0E7PUZ3tJbDfHxic4
+                                8+wOb3htiXPOi6hWM9AsfzAJrU7Ent3Cpz41xyc+PcnIWIcLzi3zljcs47prKwwMp3htodrGqWBN
+                                gpKiZIgPHkVcAjbi4MGIj3x0mk/+yxQP7m6xYX2BN79pkOtfUmX9GqFUaKJpB68CJiJzBUZGHF/6
+                                cof3/sM4D+5qkcTCWVsrvOU1K7nhhgqDqzs4NwdZC6OORqvOjj0djh0Tmk1har5KpX8lD013c3ha
+                                WGileHWP6BmOPDjNrZ/Z90XgL4F9T2Vl8GQNwAKVQqFwbv/a0jef85rN2leOpD9qsbp7ksGucQb6
+                                2ywbhq6Kpae7SJTEYD3iS0CSO3SDWgHv8cbifZHJ8W4+/PEJbvx6B/HdlIvdjM8e5LoXRrz4+gpe
+                                M776lQ4f/tgE2x9scubpFd742kFe8+oaQ0MNxLSQyOG9xWAxAs4r6hVMeF6iBmsVdYo6IErwPibL
+                                yux+0PLBj47z6c9NcPhYk4vPr/HG1/dz/YvKlLo63Hpryvv+boav3jhDu60M9lle84oB3v6Wfk7Z
+                                DMY0Qn6iBvEpIhHeK8TgXBOvbRbm6hw67KnPG+YWLKOTXZT6VnBsvo9dx5SphYWlakJVsdZw99cO
+                                +d3fH/8V4Pt5ZTCX9w30J20AhsDiGXzWOWu/c9UNPavX9Y2zsm+Oaneb/l6l1iVUS0K1FlFMBgDJ
+                                kz+PYEEsoiFuE6WoGlRKYYd6xUTC/Gw39+0QvvetEvfcbVk21McXvnEbR8aO027DxrUVPvy/TueM
+                                s1qUSnOI95BZsBokPVGKkBL5Ek4FvKIm9KCMgrEKHtR3wLaAPpymGGMQV+L48TI7HlQ+9ckGd92d
+                                0WwvMDM/z+FjTYpJwiUX9vKOd/Tz7HOFwcE2ahzeO/ANrJTzZamDlPE+PDUjBscsise4Ah3fZHS0
+                                zcI8zMx6jh+P8FLFxz3sGO3lvkMeTICMnYOvvOfe+XbTL+YDI3k+4H6S7eBF19+dJIUPX3h28Vm/
+                                /saY512e0T/UZt16YfXKMr09vZQrvdioGvRYCiqAGCRvBHk8geKZgnRALEqKsRFCienphF17Gnz1
+                                xgk+9YWdLDQn2HJ6zJpVZZp1ZaB7kLvvmWJ2JmOgv0jfoEOMR8WFpBDBaPAA6h2YkMWHLFIwi9dj
+                                QhWrGuHJQARroV537Ny/wDe+Oc/efU3GpxpMz3ZIM+W0dYOUyoahIRjqE3r7lKhgcF5BXM5SFgyK
+                                9zboDSCUlpogWgFbIrIlemuW/iFl9apulg2n1GqO09Z6zlrf5si+Ijv2NihWE0wkDK3vKhy4+7gA
+                                u/LF/7H7BfIkdn9l3Zq1Vx0bPfaZ3loPq4cjXvC8mFe/pocNm9qUCi1EWhgKqJqwMwGPIhq+QkTx
+                                qggmXLs1OCIazSL332P44MdH+OwXZpifz7jyOb286pU9vPTFJWo9GU6Fo/ti/uVf5th+bzeHR1IO
+                                jU5y0cWWX3hzjW3bYsqVOkbboBaMomrwasPV5wZpDUsNN00N3ljanQK7dls+8YlJPvix44yMZtQq
+                                EavXRrzxNcNcfU2No8eatCb7+NbNs9y9vc79u0c584yEl99Q4SUvqjG8rEOh0EbUos6DBmMTJMDU
+                                alAUbzuIjxAnKB6MwdmEudkqN369wbveM8r3fzBPXLBc/vpTqfYkRInhO5/Yx9iBuXcAtwEPEXiG
+                                T7oqkCf42QToL5erNxeLPRvPv/AVHHnoewzUmvR0GyI7wdvfVOI5zzPYYhvN2iF718UTOUSqoA5v
+                                HWgRXInd+yzv/8Aon/n8cQ4fydi0scgvv3Ulr3xViaGhFmgHI2FXe/EYFTyWZqvKzbekfPJjLZpz
+                                /RybmGeqPsKb3zzAm95Qpq+/BepQv7gfOzgzR+QHEbV400EkYWG+xFf+tcE7332M7ds7lIoFFMfz
+                                Lq/x//zmCrad7Yjj3NuKgI9pt2L274Uf3J5w330Rt/5gku17Rth6esIv/PwA17+oTG9fG9GFYPha
+                                QnLxkGoBF7XBtBBXRqXExFiJD35ohne/b4TJ445iHLG2ELO5VuDYeT3UhkoUqzGo8Lm/uns7nt8l
+                                6BBGf5yE8IkYwGJv/9Ktl6790vjuiG3nvpUoUjrtY3QaD2GzUTYur9B045x1zjRvfG2JFSsN3mUg
+                                DjUgYhGbsHMnfOYzTT72yUl27W0x2Bdzw4v7eNMbapy2Vah0tXHZNIko4rvxaEgiF01dFRWPmJhW
+                                s4tD++Hzn23xrZtSitEQI1NjrN/U5u1v7+XSSyJM1AAfqgijCV4i7rnb8/4PLPDFr8zQbhTwXtmw
+                                zvK6V/fzwhd1sWbDPNbOIi7GugAgLQZN5wVvBXzKwmw3h/eV+do329x1Z5sde5ocn5tm82bDL7xp
+                                mKuujhlY1iRrepzpIALWg5Uebv+e8L5/mOLL35jFtxMS47mgnPDWVcu5uFzj62P7+bPVCf3LK1T7
+                                CsQly87vjrHjlmN/BHyVIFObebIJoTzBmn+gWLFfuvo/nbntpg+OybZtbySuDCA2T+rcDDOj99Jd
+                                nqGvFuGzSc4/t8HV13o2nJowOVHgm99u8ZGPj3HLrXMkBcNlF1d58+uHuep5ZfqH5yBr47Bhx7oM
+                                Y9JwoTbKrzaYgDqLugDUCAY0QiKYnShx83cjvvUt4eDBiEPH5hkYqnPDSxKufkEZawy3fS/lfe8f
+                                57Y7GzRbypqVZa58Tj+vfGWZKy5TSpUWmrkQIDQQd41GIbaHOIaX8O+icYCmxeGzChNjlvvuTbjj
+                                dsMt31/g3gcnKVVSLrxQeMNr+jjvrDJCzK23Nvn/3j/Od29vIFiWlxOu7CnxhqEBzqlUSawny+B/
+                                7HmQT6/ppm9FhdpQiUI5QoHPv/PuCe/4RWB7DhA1nowXkCe4+1+69fIV/+uU84a45Z+Psvm0G6jW
+                                VuM1QkxCppaYDupnmJ/eRdmMsWVjH43mJLsO7OSBXbPM1R0rhhN+45fW8vKXR6w9JcNnDQwO9R4r
+                                BVTqiKQ5zOBCCLE2uN+cTKa+AdpCTAW0AE5R48B71JTwpot77utw89cTDu8dZPf+KW67bxedLAWf
+                                cMraAfr6Olz3woSXvayHNesVzzw2yzCief4iQXhmUvBR/njzR2Z8qDg0xHcvDsnyvSIlMl/ivnsb
+                                7Ly/zD13W/bsM9yx/RDezGLEsDBnWDfUi01bXNtd5qX9/WwrFLGiiDX4rIM04bcO7uKr67rpX1Wh
+                                NlSmWI2JYuHgvVPc/sUDvw98G9j7ZL1A9ASaPV3Fcvyrp1+2HJcptf4uOpngpBgyaq8410BMEWQ5
+                                5d4BimaBPaPH2LtnO9PTTeYbnlVDvVx92QBXXVFk9YomtJtYAUUwRlFpoT5kyhp1UJ9iKD7cBBAg
+                                M0AFNeUQ47WNWIPTKBAwvQfv6Epidu6Z5qOf2sXKoX46GSzUlU1rejk8OssrX7aSN78pptY9B2kL
+                                G0oDFIuKh6iJuBh1cV6+ehAX4Om8CSU2Q8WgPg7cAtpg5jFSZ9vZhjPO9rzitcv4nd8+zsGxKvfv
+                                PM7ZpyznzOVFnusjruvvp0dBJMJYUCyoYgWOTY2wx5pQvBhZKmJUYeVpPfBF/i9g5wl8wuypNgA5
+                                oe7fvPG8wXMXN4BKB/Whz24AbyISm6AuXIETQ116iAtlOv5WZuaaAPTUVjA6WeEf/r6LKJnggmd3
+                                eNlLixS75snSCCFCxONpIM4hvojSCgmjVZAUFYeQYLxFRYECHrCR0pjr5XOfb/C3HzjMnXfXWTM8
+                                yCuuOZsdeybp6etQ7ephZsrwS2+4gZvveIC/u3AnF18Y8eafr3HlFWWsaQVswAiqRVQUiTyp1jF4
+                                jBTzx9YGWw+OMTOI8YjxGG9wpoXYHprTFf7pozN86IPb2bG7RWIjvMLeg2P81blbuahawOCX6mTN
+                                KwUVIdaYoraZsSbvKubs6fz5RwXDlkuX9z34nZGteQiYejJcwugksYIK8Ocbzx2EnBbltEOW1fHq
+                                sGKDYjbLMBIvKfBVFKeWatcwBjBRzPDa65hp17np7rvorSjHRpbxzRvbnH1Bh2uvS1m/waGpR1yM
+                                aBEsqLGoZuAjjI9zA6wjtoDXKmgXO3c6Pv7J43z4E3sZHYFtp67g+ktOwxYarFw3wS/8UokLzt1I
+                                FKUcPdrhi/96C8NDPVxVu5jpuQV++7eOUuka4SXXF3j5y0ps3GDAdFAfdqV4xZhKaDmb4CXEFRFV
+                                iBzGB4hZTJX9e6u8/x/rfOLTI4xPKKet6uM1Zy6n1Ia/vW8vG0pFnlUuE7uckYSASh7hDFhBZ47j
+                                mm3SOMZYg7E/wk1E2HLxMvbcPnZt1vH3ntAjcE+lASyWfrUNzxrYWqrGAdYUZcWa5YwdGKF3MIPY
+                                YiT0sZdgLxTvU4SIJOkK6Jz3tGyCVntZ3nUKks5y566vsHrI0ums45avT3PWuVO86lVFVq9OsEmd
+                                djaB8ZZCVAVJ8QLqgpxwbt5y112O9/79Ub7y1TmSuMDZp67jktNrlHtnOfuCMV7+0m6Ghkr4bAHD
+                                HA7D8jUp73iHJW20+erX9/ClL3tKcT+V8jo+9y8TvPdvR7jkYuGtb6ly3rmWardHbETHdxBtYqgE
+                                uY9xdHxKJFU6rsKuB5T3vG+aT35uikgKnL52kEuXJVygcG1vkVnp5/337yOylqKRQGVQg2rY3epd
+                                wAokgmKBDKUZCcaGHzEPsypVIUosPcPlZ08eXhjmYbXRE+IMRCfR6y8Brzjl/KHSD4kp4g7OdRAR
+                                jIlxmuJ9RmQKeOcRY4giH3IlUwjIvwjigste8ClZKizb+HKMbfK9B27EpLMsGzyL3/udSboHDvG2
+                                txfZduZqoqgJDtS28FSYme3h45+Y4d3vO8b+Ax02rOzjRZdtQ6XBmo1zvO3tlg2nhAdsdBrnM0wU
+                                k7kFvGZYamSZYpIFrn0hXPMiy+yk8M8ffogdBzpccf6Z9Bdr/M5vPshM6yhvfkON17++j1WrFWQG
+                                oYP4GOdjvFa45TsJ/+PPx/j6t6ZZ0V/jxedsoqvd5pxOzPV9w/TSIfLKnYTKIRaDEcGrQTRCjGJE
+                                cD539Rl4SdAUOlUoWwmcgsA5yxtFYR3OeO5Kvv2hXdcAB3Ja+RPyAtFJ/HvZWPm/uwdKS2QOATLf
+                                xmUZWdZAkq6w23P5vljFYvDOoF6xURJKJ6+gHcQK+ITExjjjaWkXy9dej3Fz3LxzF9lCg9OytXzi
+                                77p4X3qA619S4DmXJOw9EPH3/1jn0188DK7AWaeuYNNFBTZtznjBtfNcdEFM72AZzCzeeSL1ofFk
+                                IlTB2m6seiQPT0oKRhCf0js4zm/+RoH/9NYyd9wxyic/fZC+ngrnrXw2O3+Qcu1HdjG8rM5/fvsw
+                                L7gmyBs/9/kF/vLdozy4u8npa1bxuovXsKzd4NlNuKRrkL6eCKsdvIQ+yGinhVNlKBasCN5H4DJU
+                                LF4gdIDAp02sROz2Hh+ZsPj2kdlFw+u7KNfi8xuz6afysmn2iVQD0ePU/jFw6mkXDVfE5nBmbgTV
+                                Wmh4aN6iBSWyCYsmoouzHDDEhcrSZ9rtWZLCSqy1iKSkzoXdYGJ81Eu55yzswLM4ML2T7bffyTmn
+                                93HbN3v57d/9Dg+N1Fk5NMCF2zbRV1MuuDDj+S9osWVrjNgO+BYiwfiNkZBQ5lCwMeRuO4ejFyeL
+                                qA8gEwqmQ7WWcsVVliueX2bvXvjyl/bz3Vsizt+6ge7Kct71/z7Ab/7+QbwKxyeE8zau5ucuLrKy
+                                vsDz246zegfpNj40n0QwIkuQ8LF2A6/K8lKCLtazvoNQDM0Sn6E2ApfiM+UYiubuf5FVJI8w5G7l
+                                qb2r99wxPpizsSeeCH/w8QygCFy86cJl+kOnFqHaW6bZPE7q6qhXxMSoBow/JIBmaXxLsdBFHCd4
+                                l6FpGwM4DeFBxIRYCAgxeKHV6VConkNP9Tz2j93Nt2/7MiMT9VD+DPUwMj7Oe969nk1b5vDZPF6B
+                                rJLzBH0+q8GjOITSw1cuPzI/MtcIhvlCectYwcscqGX9BsN//rWEX/nFCv/6lTa/+8ffx2M4dDSl
+                                XEr4oxvOY/mRadaljnMGholshPiULO0QxUWMki+0BZS5dgC1+k2cA0qCJgUWh0uItRgjaKWKm5rl
+                                qA/CkcX4/2j0sRWn9rDnjvFrCRKzMkF+LifjBaLHWHwLFCu15PVJycqJJAVVJfMtnGvhsnYgMohd
+                                snjnHE4zxC7SuOIlAEW9Ip6H6V1eUe/BxogakIjEWYQFGtKNqTyLpPIgfmwCAYpxhdPPWM9b3rad
+                                q66Ct7+tRv9gFkpFWsHlq8HjMRI/whNbvJT82RiT/68GoxEQV8VLipo2WafG7bd1+IcPj3J0pEk+
+                                sIRWs0P3/SO8bOUwBQymExYLSfASh+RODLg2aKgc9s8tBO9pDKgPYJPkTaLcOFUEdUJ7YZYJCQtv
+                                bB4G5JEMQBha1wVwPkF8W8k990mFAfMY/xYDA7Xh8qYf5ayJgIkEMQrqMEbxmoFAlnVQARvZnMKr
+                                GBNhRDDGkLWbix1ZnHcIhsgWsKqgaSBwRJ6mxHSilLado1gaJI4sxWKJsfke7jmQ4nWAQ7u38LrX
+                                Km972yy7d5QQ0x1IJmoQVwCN8kENWbgWJQA5uRCDXKvk1eWhzCGimCTFtfr41IcHueDyQ7z6TceI
+                                6it47rZ1rOzuRhB6IsPz+7oo2hRvHEqH1Dfw4rE5aBMsPZTITgzTWfDKqxKDX0R1FsUlfrFbGvol
+                                bZ8xZswPVQCPZAEiYK1h7Rn9XbkBVPPKzZwsxv9Y8f+5a7b0PaIhFYoJSSSUkkE62sSQgXd4n2Kw
+                                iDdENgmdcQvWhkSw0R5b6qgYUwDjESVIto0E0qV4ImMwYrFU6HhHmjlMFNGz4nyioRfiK8/nth1N
+                                Ml8lbWzlN369xGtf0+BrXyvSSosQGzIXCB/qGmgGmnp8x+Ayj/p2aA6pxzshVQ/GMn60h79+F5xz
+                                8V7+6E8W2NB1KpesW8GKyTq/5cr8/PrhJQFIEseIEywKSUwUxQgO12ng0zbq0gDsRB6PsJCnS4O1
+                                Ih7B+zY+A592cmMgbw1HNEU4GkeYJSCIRxXUeq+sPr1vcX5iVw7cmZOB+qPHQf8uWrml9xG/x0Qe
+                                Ci1cOkdkevGahgWzxTzxcqjL3RyWKI4RItqE9xjCAAAgAElEQVStBRC/RAxZJHly4nSQxZ3pw++b
+                                3HjCxyypi6GwmvKaZTQaI3x/x10MVhOWmbP5b39ymNpfT/H618ZcfU2Z/p4walC9yVHDJkYCHc1L
+                                MDbjEw7t6+cjH5/hHz98kGLUzQWbzsG2UkoTh/mVoSE29VexdWVHx6GqJEaoGLuk/V8KcSKYQink
+                                FAjqPUaVJjBWbwBQii1GDWot4sFGFbzxeBvCoaFNXdss5ACQXfIAj76Q3YNFgMuAu/K1sycDDT+W
+                                Byh0D5a2RMmjJB/Gs2xtlWOHvkPiHZHUQAVrQF1w5d5neZKVEEdFMAbVxWaLD+7Zh0RRc3lUEGBa
+                                RAyaa/cfzhIFkSjg8D5GXRlN1tK/5jqoXcftO5Xjcynrh87hC/+yjkuvGOed71LGxmtkRvA2QzEB
+                                qvaCa3ez874Kb/nFNs+6bCdf/lfhhgvPYlUpZsPRI/xp0uav16zmtLgPXIy3RQ53Qi1fNYYExUeS
+                                kzwkVykJqENMPsJYwmLXvXK42SIW6CLgAOJdKATyIRniFaMRDsGV+0mt+SEP8Kg6ApRSNQZ4Vu4B
+                                yifL9jKP0fwp9gyXNj6a2YkIq7fVkOQ4x8e/i/UjGGlhjMPYCJeBkRhjLSIxIhaXZTjnQnVgFxfU
+                                Li20IDif4VyG4nMj4AQPoLmGTlE3j+tM4DWirTVaZpDu5dfSveZNfGtnidt3HGbLhjPY/cDpvPCl
+                                8/zKrzY4emAAa4cxbi03fq2P5187yvNfOEZ7ZIgXXrCVWiPj9D1TfGB4Jb+/YiXDNkHEgJvOc5SI
+                                dho2VNkIBWPwXoJCKcvCZ41BjMlrsLwoVktTlbb3lKyhZgXxEihpQmg8eYeK0Egs36u3ed2+MSYf
+                                AQV8JA3B4vSR2mCxF+jJq7foyYaARfy/XO0plNTrIy4+Enbu6MgY0+M3sa4xxorVZ2HjlXR8D9bE
+                                eO/DZ21OBBXBZWnAz9WjPhAprYnzWjwIN51zGInw2kGJAhcgv1UjPoSQpIzREs7XcZknkhKZLUJk
+                                KA1eTHfvs9g9toMH9j/AKctXc3zUcvVLdlKpNnGpod2scsa60xja0kKOTXNlXORlq1fSExdwqhgc
+                                QoTDYOMEkQwfeWazEMh7rUWtxeSVA2JxGhI57x2SZYixeBuBOGaaynwnpSexWFPIK6cEtaBkeDXs
+                                SR3v3neID+8dIekv01OOsNFjJ4FLa2KEofU1Zidag7kHiPMN/picwegxhJ6X1YbKj35CERbmmsS2
+                                Rnd3mePTh5g8foi1KzfT3bcNjVaSRTFOY9Rb4rhKlmV0OgsYVVyWYUWIogST8/XEBNAkihLIQiiR
+                                qIwY828IDKEPb4lsoFqJgBEfZN9YsqhIafgSapzDvmPfZWbvA7TqLWb3N9m2aSUXbBpiYc9Rfq6n
+                                xpVr11JWJU5dQCtdB4ksYoQIDzZCXWAxexf2dm8hBmuJspC8QtATqkjgLuQl7yJzad4pHlgRJ1SI
+                                8VEH0YgMw5gzfGbqOH93cIT9s3VS5+jNHGID3m+jRy8DfwgQ2lxjz+1j/Tl8Hz8ZDyAnhIBtld6E
+                                RxvNKgKFUsyKFWdy+uZLOHjoNlzrGEeO7aJ5YDtr12ylf+hcSPqwUqNS7mESaLUW8K5NFBUwPiR6
+                                gShqcN7ngEyGkQhrLc4rRuyShFpVl8xZREjTFiI2TPnOk0mDwbk2KglNqpQGn09t2fmM7P4ks/P3
+                                89CBUf57Tz9Xr12HlQxpO4jAJxbjNexml2ElWrpZRXAY2i6wsAvGIt6HnawGn7YQazBJIU9oTVAw
+                                a0gGF/KrXlFJqMQBjh4xwjdm5viHg6PsWqjTSjM29VR4aV+N0QJ8N+4QJQYbB07A4x3dA2WA/jwE
+                                xCdUAvpEq4AIOK3aW4DHGOwQJTETx/exkF7JyjUvppMepb3/mxQ7k0wdP8CRI3vYsPl8enpPJbYp
+                                hSQi8w6RDEsJ1GBtEOAiHu87iIakx7sT6N0/BOiYYDAaLioyBVQ9LutgTLJ0V0KE+A4FSelIEU83
+                                g8s3cfjw/bxsqJery11EKB0gEY9KjMOE/rxmWGvyvoYJsAGGFJhtBTSvZKPQ2NKgN7ClYkhkBTR1
+                                SCRop43EJYSIehb4EKcVCsxh+cLCHB8/fITbR6coFWO6I8NbVwzxjjXLWGkj3rZ7D6a7EHa/PblJ
+                                alEiRIlZlXX8iQbwhD3AYghYnpSixywikkKMV0c7bYI1xPEwGza/gsnJB5gev4f+UoNjD93B5Nh+
+                                sk6D7mqVmfl2EFaaboyxeLIAIfs8+zcWwYfWsiRkqWKj+GE71hxNlEC3VhHEGFKf4+5K/l0GZwrU
+                                nWDFE3nF5xKKZZKQoKTWkWQGrAYVUWrAWjxprgD2GGuWMCSPMJ+GHKBiBREfwpZA+PLgqjWKwtQP
+                                GyBgzWC0UQfgoe4CfzE5w4d2HUSsZd1AN9f0dPHaFQNsK5cQiZgeHWVPq4OYwsNEkMcXlmOtxUZm
+                                8McxgCUYuNgVFxfpR4+eeDgMgs+aqCvgJcET09t3Dr29pzIxcg9edpFEytjcPO12SidtUZ+5h+7+
+                                s8h0MI+dYDUghU7beVs0QtRiTZvUkDNmQts0KIOFDAc+w2KJJM67bjlp1OcoJREYUJ8hefxWUVQc
+                                NhMwimiMZinEESKCX2ghhfDwvY0CQkgQfIynHQD67KI9Bu2DChhyuRkmVxwJXjPacczOzGNEeHC+
+                                w11jx1jW08Xm2PKL/T1c2t8XYrwLooWHZqeYjwNMfIKW5XGpGzlC25svfvRkDQAgqnQl8ZIW+1EO
+                                j8PRIk0bVLqGA21bQZ1gpMLg8gvx2VZGR77PihVFZmfHmJmb54EdN3HGaTPYwnri8iYw3TiTgBoK
+                                HrwoGYr6UPrYqBgSqxOGNJkcB8fGucQrDIwQk1uttVjMkuGoBug5lBoS2sCYANcaH1jI6lHnsZUq
+                                ixpk8R6PCQifBuE4QE9kUdVQMXiPGEtmY0QdIikuivFeGLFtvulafOnIEeLIsmV1H4P1Ji8wEdcN
+                                D1IKhL+QaRmLV8dcp03DCgUTuoAnNVMvt30b2Qqk8Y9TBgpgbGLt47WTjDVUeyz1+Ql6etYhESgO
+                                ryGmemJcVGZw9ZVMjHyHfQfuCieViJ27t9NJ72FoeDWrlp9PoXs9mRlAJQkqIknz7DqoiCXvfPnF
+                                fr7mVYMP4I7YCK8On6XYKEaBtF0nisrBA6jS7rTC+eMYMWYpS2dRupb3LsiyPPNPIY5zoih4K3m3
+                                E8pRFHanBxNFgdSqGZgMpzDhhZvm5vmnY2PcNjZFvZ2xvKfCixopL+pfxlDs8aZDRyNiLGLzcNhp
+                                MZk6FmJDyT7cApbHGyyxuDGslH7EA8iTCQEmjo05CaeDOnI2rQ08FCMYa3Euf2cPgpMK3bWNFApF
+                                vHdsPOUCksQh1Ln/ge2Mjx5hxbL19A5todq7DWe68wEJBp+3axct0drgwk1OEVckRxgVIxHg8YHI
+                                h40KSyHBiFCvz4fN4jzqXM5ZcHlCKXk3T5DIIOqxuddZLPNSJOj/gHIU5y5a8sokzAOuu5hvLyzw
+                                3sNHuWVsmmV93azqr7FrZIr5+SbPqfUwGNnAKSSikDnECt7neY+NmPNgYnncRtAjbkoRy6O/Iu+k
+                                Q4CIOYkzBqSTdjtkuGmaQhRitLEG7z3WW5ZmbqQdoqhAb/9FtBw05+/g4gvOZ2R8hL379nLo6B42
+                                rjtKz7KziaorcZQQFYwmGGNx3pP5NKh881lBsgQKyFJ71BhLloXyMPQUFukfOdi0SMTN9f6ILiEm
+                                kpeZmnWQqBA4jhrQ6NQpjTwJ7DEW5wmNIBEaXrmr2eYDYxN8/tAYXZUqp61axgZSzlq+nP82Ps1g
+                                FNEXGYxooIM5jzYXkHJPKH/TDJNlHO0ENHWJCPJEBXwByDspKDh6zO39eOcy0DvYhZsLOy8qBK/j
+                                neZoX4YSI5Jio4Q4KeCdI9MYCv3U4qtoNA9SKCZccflGHjq0j117b6c8soPhZafQt/JybHF1qKeN
+                                ybN+xUvI7NX70GrNOpgowZpcUaRKHBUC7KwZkGAwZK65aN14FbwRDB6fhcEM4hUii6jgo8LSg1Dn
+                                8AitxDCbppSMsDpWoszR0Zg7tcP7jh7mq0em8bHlrC3rsdML3FAs8vq169mVKv9dhSSyRIsbVFM0
+                                c0ixHHQGFiS20GhywHui+MQ+wBMwAv0hvEyeTAgI2rfMnxSlqFyLOD65gHNt4qQYYmQu4TJhfwQl
+                                sAY37l3onWMyUl9EC6dRqKxhqnmISlfGFZetYP+hA+zbfxej4/s5ZcMZdJeHKEQG58CSBOGYaNi9
+                                edfQZW2IEozEeO8wEsAlgQAwLcqCA2MgZOzeB2FJs4mplJHI5rx8wCmu2cSUy2AtRj0NMTiU7jjC
+                                VivsUc/HJo/z/gOHmEkzzj51LfX5OhfOzPHL65azIi5g05TZTkbqPYNJRCx2KeHDK66+gHQn4DPE
+                                CVmaMqosoX+hHH7Cms8fmxauLlN/Mt7G2xad9vwSncqQExs10MfVhVGoUZRgbRwSMXUYcahp03ZN
+                                yArEyRkUo3XMNe+l1t3kOZeu4OjRER7YcSsrlw/R1VVkZrYJro01oVNoc3hM7cNJryy+E5RgdIuq
+                                ZGPIKesQn0BWgQDiIIJXcFkn4A4oEgXPhguziTouhNbBgW7ePz/PTYeOs2uuzhmnrGaV96xdmOeX
+                                VwxyQbGY8/2ULFL2LrRBlY3FArF3wQO50ACLq91LfRCXZnSyDlP5+Fhj5XE7gY9aoJ3k202jR/ll
+                                nzaz7DExAAmFUldPFyOaoZrlbj8kLEaUVrtJZJMcyjV5MhcyeesK4GMKohhbINMWHWuIus8lKp/K
+                                6PgP6O+3rFqxij0H9jI1PUdkYtqtMcSuAl8I/f18urfmOMJio2AxYzYSY0VR38LnPTrJ4zYaMv6g
+                                /wsj4MTGwUtlikkCocVHjtRYZrNgWCOzLT40e4xl/TWeu2EF2egUb6h289p1QxCH2B5IPj50Atuh
+                                /OwpF5buPxCSwjsP8T4Xnhrqs/NQiJd2v5wcCPDw4jnf5t++9/gJGYACvrnQSR8TBcox8u7eLrzO
+                                03Z1JIspmD7EQ0YKpoiIQ3Oun827eqoNvBiMUYQYpyCSod7jNcGZbnqWXY1hnKMj32fN8tUsHxjg
+                                7gd20p7fTtSuU6qdhWOADEuqc8SUA59OMzAu9waSzxHMgqzftXMcPydhZooag2hgMImAa82H5LXY
+                                Dc7iNKMdO/Y14a8PHaLjPGt6K7zq4jPYvvsI50wt8Mvr19FnE7ztoFmGmpD4knugyVYoP4vYwPzO
+                                cxcVxXfaQV0tEe3ZEXa4Jq0kOqECOMkCIMcBskwbPPxa2ydNCs1a9ay9SJ17bCPIcK6NtWWgiENR
+                                bZL5BpHtCSRRldwDLHbJ0rxz5/JdKyBxmBziM9TVEdOPMz30D7+AycNfZdfurwDw4J6dDPdP0jj0
+                                ffqHt9E3+Hx81EVbGhRdQAUzSfLy0YfETjyqnjQLKJ74Rdn3Ig+/hSdGsojIdOefz/Cx56G28KGx
+                                Oh84+BBHGu28ZS1kP9jLHw8PcOpgP8VcoIoLRBARQbOg8nUoh3ID2FhYJInkzaJOB4kLIJY2ENcG
+                                YHKOpihxTgQ15uRyAJUQplzmFodJZifjBcyjhAAHHG03s8f8dRGwRc/QxpT2wiiluBz6+FiggHNC
+                                u93A+wCPFnJ9gHdp6OnLYnkWWql4T2RiYlNkUafrTZFK36YlYmlXtcaGDatZPlDl2MHvsvO+dzFz
+                                9AuUNSUjoi0xXpJAWPXNpd0v4vMpotBlzMNkTAemUAEruLhDWk5plT2HUP7iyHGec+e9vOfIMa69
+                                6jLO37wJgPrIFL8+tIqz4gJF7znxZeZGQJ0L3TufkWGY6ITScVUU54hlyEfEWsRnQVdIinq4s61k
+                                sVnKAU42ARACluAzXRSJZk/GAyzGjgzYtTDVurSwqvLYbsA6lm2o8OCN32Z5/xBGhlAp4qMExaNE
+                                KIo1EYWkFNxLWqeUv0gpS9tEtpCTRPMhUrYQwkg6DXENooD+GWvZvPUaJptKoVji9M01RsdHmTh8
+                                G/PT+xhYcT7V3i046UU0HwsjoR+vLpSNoUgOE8JEDcQJimC9ARsx2nF84fg4f/PQBPvSjOdvO40L
+                                1i9nfmyETnMeBNZWSwxHijMKObPH5Ewg0cABDJQocMQcbTSJBGpxPp9QwLsANDlVvGQYb9jjlQ9m
+                                HkqFnAhiFsVCJ9UQStuerOPGcmFIyklMEDOPEk0yYHt9pvO4MUBE2H//GEdH9nHPPZ8mbe3DykKY
+                                /EUWrNyEBDBJAsHEuWwRiSGKkyU6mPpA+QocfSU25cAwlgIqAYXz8XKKtYuJe6+iLhsplfs4a8tp
+                                aDrFkV1f5NiDHyObuQd8HWeSXFkcoCiXh4BEBMWFWECQq42r8rHZOi++bw+/tusovetW8HtvvIZa
+                                1uKs+w/xW6bIhigBhYKAxIL1GUYzrDpEU9RleK/4TgvttMF5Uq/MdxzVyDJYjgIL2Yck0OXJZisz
+                                fCPNuO6eXcx2FUJ7OTbY6If1gI93tBsZqiwawEl5APMIi79oALfNjDdPCnmam2gRRzHOzXLr9z/C
+                                5OjNRH42H4oUwCEVu0QND7E4NECytJnHsAD2YAyZS3G+jdhyPmItW+LMx2RYHD7qptB7CV2rX8Fk
+                                Zzm9PcvYsvlU0s4kI/u/yPi+TyLtHVhdAA0l4iK7LbEx6gt4D4224wuNBi/esYc33f0AZqCH//qG
+                                a1hdLlD49nb+stzL1ctqFEWZb4ZWUBe5gsgLTj0aCaJBJyHGI5GFpIQhZiELOETVGHqxmDSXJXTa
+                                +EzZF8E7p2d53W0PcHShzdREk2IxIUosJjInXwYKHNszQ64NbHGSI+QerQzMgFZ9ulU3RireP7Yh
+                                dVeHOPu0qzlw8PsU2gcYPXwnhw/tYMOpF1Ht3kamXaixIIW8CnBL3Po4Koey0IZ3+jh1QUzqQhFi
+                                jC6JOELjZrH0I+cN9lEdugLX9Symp26nq3uByLSZnDrAwe1H6O3fRO/ghSTFwsNQcGRoaMatbcdf
+                                HzrM1ycnWLd8iD+85iJGRqZofed+frenm63LBzBkpOrpYJjPPcjaYiF/ywd5kimhAdZqhjYycQg5
+                                KJPO0cgc5dggVslCv4jppMBn5uZ5572HmMJiixHXlrvorRS4SyCKTE4HP0nkR5WJg/PkgyJO+oWU
+                                j1YFOKA1O948qOjWxzU+KzjtZuvWV3D00HeZHL+PWOrcd8+XWbt+jOXLz8LaYbrKfXkISHNNgAb9
+                                nBhcLimXMFIzzBnM36jnchrWwyOCAmxr8Tg0vPqtWKN7+QtJG/uZHLmFvv4SPkupz+7FZiNEhSrW
+                                t6gVi9zUavLp2Uk+e2iCWm8Xr77qIgbjIofv2MFrqyWuHBrEh7Tsf7d35sFyXmeZ/51zvq27by93
+                                k2QtluQFL4pjJ7ZDEg9DIGFSM0NCGEjCNhRbFTVTMwzDwBTFTBXDAMWwD2FYhhASKAhLyGKCk5AM
+                                TsCOE29ClqVr7fvddNe+t28v33eW+eOcvrelSLJkx8amdKq61KW+0u3u8573vMvzPC+xkCRdh04l
+                                Cz2fBYxkCdLZQGKJoAhCVknm8RHWeJkaKTivHB1r2RkllHLoRpIDpuAXj5zj75fXGBsZ4QFr+IFG
+                                iW8YrvHfz57FiSwwi64y/w9+e+bkiubCiaQvuA5ggO7KQvdQ0bV7VCyv+F6y4R4L88fIhu5ly+5v
+                                YGzrXTyz72OU0jlWFw4xN32Yr7ntTZSyTkiRtP8C++lLIEc6Z3GD/HcpMMaRRHHg0wewh/DlX59y
+                                ge36XoBxbVTlFrbdejNF+xiTJz/HSCOh216hKObYtnmMns75w3PTaODd33A/b7hxlIcfPcDdpZjv
+                                2DJObGO09GyfzIQAMpJ0raMVGkHVPuYgVDyF1kgV4fIc40DGiZ9lYS3ndRtjLbU4YlZF/PHyPO8/
+                                MY0ol7h1rMYbXY+f2raVkbKlM7fIYlcHQsy1NYC6LY2z7hgbI+v1C70C+h4gB/aee27p23bdPXLF
+                                YFBG0Ou1EFbhhIJ4E3ff933MzRzk+OG/4YaRMmdPPkqaVtg8XGet3fQ5Px6IYZzACihMhziqIAxo
+                                V4D0BqGF8p/EOdZb+MpLv1pjkFHJzwEix5GjhUKUd7N9z/dRtE6iZ/cRy0WOnD5KUWje9JqbeNcD
+                                d3PwSxNUzpzn98dHqIoY6QBpiUJK6iIBhQGlaFtHN0DCG07hjPPdQCmRUYrJC2zeQmVV3zJ2fmdm
+                                V30NYDbL+E+TszzbbVMfH2bTapufG6lzXxwhIgm5Zmp1jrW40i+mXoSDvvJaW+oBPIFXDu0Xg3ih
+                                WYANkeQXzk4sXvFNCCDJEqwtvM6NcwjrMEYxvOm13PuGH8Yku+gWEEWCnjYsN08g8jPEJkI4nxp5
+                                ZawIiUEFfr8NCKC+uki/8WOFxxpY40uoMpSYlUqQMvIpo5Q4UrLyHWze9a9xpZvRhb9Kusst6o8d
+                                4ufSGt+9rUZNyjCBJOTvAo8BsJ6y7ZyjZT2xA6CqfENHBWqZdRYpJSoe86RPelg6NDPBgba/Huac
+                                YW2kzKhz/EiS8LHdO7ivFGNSgZMCWVhWdMFCJNaVwq+2CiikYPp40+BFI5sDHuAFs4Nt8ADLzfnO
+                                qSulgAhBVokpig7W9DC6h9Fdj+JxCU7dwPZb38WNt307C01DuVKhtbrM0UMP0Ws9Dm7GS7wLATIj
+                                Nzo0R6Rn3IQ6fd8I+2QTzxxyoaKHT6+KwuffATSqpO/7ddUwldF7KJXqAHxvXOaHag22SkPRavp6
+                                fKCKO+dwWveHE3megBW0EeQhGB5NIu8hjMNqizDG1/jpYYRGakdblPirnuZTUzOMD9e5+4ZR9swu
+                                8Zc3bOEHhqsMKYvQmjT3dQPnHDNasCY90HRDEubqAsDT++fbeAn5Vji8jhdJD9fAWruZf7TXvrI3
+                                SUqKvGgTxwlJkhFFKQoZih45Bkll6A5uvvXtLDVXUVKysDTJ8tLjnDz0UfLWPhIWiaQmikogIi8t
+                                I1VoIIkwNFLirFnf3HUZeiEQQqKEQgm5XjQRAqTMkcKiBngSr8tSrOhh45SSHPHYQcB2ex4KLmOw
+                                EbbwSBBnYc16TKACKioCNMb6/9sY3wyTLqewEU+7Ej969jz/4annaBaa1dYa45Pn+d/j4+x0SajQ
+                                CJSNMCLyAWNeMKcFupRs4ADk1bn/lbkO7dXidAgAV4MBmBd6BVwQCAKPH31i9sr/Sewo8rbXCxKh
+                                oid8bqyEIMYgBWRDw2AdSkXcuO0OilwxVhfs3/txzh19iKh7jtSuefKoUD5vd35zpZRYa7DOw8iL
+                                vIcxXpjKN8zCiQmCE845dFGAU0TGoozFBq1gnCdsSqspnMb2ev7qilRQId2InVzAIK7moYgElGVg
+                                8Rpw2l9DGstClPKhlTbv2LefR63m3W+6h9dsGUE6wZs3DWMjTaE0iQZlNbpYQbrCi2dbx5y1FDhU
+                                JEIR6OoigLMTSwCfCwbQChkAXy0DOHzkidmOte6CiV+D/YCslCKkRRtLYQ2F8+ROK3KskJ6a7TSC
+                                hCKQQ7ds/ybGdvxLFlYlu3ftoCimeGbvB1maeRRhmwhhPd6sT7gUfZGpnjeqqOT/jLOADQwKHSqI
+                                OheFnwJmIoyAnJxcd1BAVPY6EcLmSItn84TPImwgrqJR0iJcAcKwGhDFiZRULGAShIrQ0mKE48nC
+                                8N5Dp/jpU+e4597b2ZJFvG1xgTfVh2jrgpIWKBOAZ8qLacis6gNZ50fan3IOEcsNPaCrwAIKCdPH
+                                mk28WOQS16gYKp8nuyyAVZ3b968udC9bj44zBbKg0J3wLXp2rAgRlXXFel8AIbHW0XMgSzdx8+3f
+                                jxW3gojZurXG6dNf4NRzf4ZZeZLELnrUr0yQMvZj4axdn77dH8diwzXgQpoohPKDJ4TwmQQbp9pD
+                                CYPkfK/rCzm9ArvWgxxcuweF8f18E+jtzjLb9d4jltKXgq2gsJJppfjluWW+89lTzI8Pc8+duxk6
+                                PcX7qhXekwxBwAIkzoIRREKANuG76X/LBdY5VoTCSJBRgIMJnmcaqaO12GNxaq0vFzs4S+irYgA6
+                                WNRHTuybyy/rj6T2AZDpIqSfBqJ14XF8ASWMiEAlYdMMrtdECY12itEdb2HrLd9JV29l966dOOZ5
+                                dv+DzE99nlifR5mej+yFXBeBcgMNEt/391WjDSaNwNjcx5GENnOAhgkCj0AEjoBzyCgOHUkXxgJ4
+                                kqefOOJoBQ/QkJJECFZTyxN5h+89cJpfn13kdW/Yw4jRfNt8kz/csol7XEQuJOfXugigoixOBWGo
+                                viCV0b4rGJfIez2mhKBwegAMKq4Y+DkHBz4/CfAlvDrYytVWAK/FALrA4tHHz5/VPXPJa0BGgrQi
+                                Wesu0+21kVIRxQnGGoxxGKPD2LeIOPF6g+1uM7TGjdfajbax/aZvRZXux7khbrtlF1OTT3L66Eew
+                                q08xPjyMkjKkhkGPELFxkgBddC/wECpKPTpJbaCkPDLBE1jE+ikbQBLFgYdofDorw78qQgawo1Rm
+                                Li7xSzPzfMvBo2S7t/KNd95M7fAJPliu8AP1KpH06XBHCo61u5QFbBUWJwo/V6gPGJEy0MocXV3g
+                                4ggl5QAf8HkQWQ5mTjbP4CeJLVxL/n81BtA3gl6wrJ8/sXf+MlYpSCqG1ZVZYjmEsDHW5nR7TT+x
+                                Oxw7h+f/B+gSxkZoHFZ3URQ4ociG9rD79u+hnW+hUi5RynLOnNmLdZpSlgEdrNVokaOt59U7G4FV
+                                qCgDvICEMcW6uLhFBVUuUEJQQmClh2FbB9rk9DnHutXCmi7WWUyeo12OLRw6xNQH8i7fNnGIj2rL
+                                v3rgfrrzS7x9aZnfu2Eb24UkMRLR01hhIW+zUuSkSlKWIDRIp3HtVR90aoMzjnZvhYPdJi2pkLEI
+                                bOAr3//OOc4eXKTXNg/jFUKXgA7XqLi8t7QAABa8SURBVBV8Na0GE66Bfcf3zZ3kEnxBIeCGWxos
+                                zZ+g15nCFAvgII43+UlgzmGsd31pVh3oB3gpNZkkgeGrcQKMqLBp+1vZuuNdtHoZm28YpzFSZWVt
+                                jbmZw6hiichIL0wtOhR2ASP83D1rte+iwfqcQeGEV/gIcLChMEZOJZmHhHnJMt8oKpdRJNg+XEzD
+                                +TTicMf3AXSieMPX3sXtmxoMHTvBHzQafF+phHBtrO3gbI6SEmMNbeE4nxcoAZEAYQTCSoxM0NaG
+                                7qSj1Ms5lzuWSmpdE+jKHsBhjeOpT53q4QdGnA+HNOca5eKvxgPYcA0src53/8R7gQuNQAgYvbFM
+                                eVOTgwcepNNa9A0RoQNXW67P0epjArTuhZROBC1+iaVf6hUUroKs7+HmPd/NWmcrM7PeqCbPHWbu
+                                7GcQ7QPEboEIRRYNBz5CjhCSXrcdRtPEgb9v14dXRUJ41XnrcLlGGYdUMYFWDEBOD5xFFIrDLuVX
+                                Fps8Mr8AwL237aJ3dprvWF7lN8Yb7BQFwhREPUNUFDi9hrQ9hHA0pYeEVYWgagPL2DgoNCLvIYsu
+                                6B5fXsv5PZOiyrHnAzyvIIRg7vQqpnAfwY+Pm2NjhNxX1QAGY4EV4BOHHpue93esu6AaKKXjtjeP
+                                09i1zN69H+LcyYfB9oJokvQdPSfJ0iEA2p1FX/IMxEjrbCDhCJyIQDkKvUqnqLBl+zsRYsTDzJ0l
+                                757m0MRfcPK5DyM6Z4m0IbGCKM4QQvlrJjSXCLQtbcK8IHxtwoRKIlZ7CJdzHjjiHMpKOlbxx0XO
+                                vzh0mAfX2j7VBR5/eoIfi1K+vTJEbARYhbUKJROkSpFpCtoHaGfzHGMdw7EkdRKHwcmCOJJIa5m3
+                                jt86v8J7l9ocH1aYyBGniiiWXk/5EtRwF6qGj3/iZBt4JhjA8kD1j5fCAPo1gcXWUu8XTu9f/AoP
+                                ICNBnCm23Fxn1911Zmf3cnTio3TWZpFCIYWXRZfKB1m9vBWict/ONQhUFCNU5NGyuiC1ZZQQ5LJg
+                                qLoFpSRjI1tp1Lfzmq+5lUZFs+8fPsDs9F+h7Hmk9YYp+pi//jgXB1boPncuCDn05xb6drQNBtMF
+                                nrCO9547y385d5Y33b+H+8arvH6kjgN2ZQk3CbxiuPEAZCmsJ7tYhyusxzkawYx2GGAsjkmEQgtH
+                                4QTaCiaM5Ieml/iZXhs9mpBUYkrVhGwoJk7VZa8AIQTHn5qj19EPApPB/bd4gVPFrxJusF4TaAJf
+                                ePKhk+d1bi94U1IK4lRRriWM7sjY+foKbXOYw/s/zOL5g0ExE6I4WSdoCh0DXi1bSOnRNdbTtqVU
+                                OBWuZifJnSWSiihrUNv6TtrchqPEnbfuoLW8n4ln/4D24uNEbnldzMG5vhagwNpAC3NgnURqn3+b
+                                /sdzcF5KfqnZ5FuOnGBqpM4Dd9+OPTnFf5YRX5t5PONmKUiVQOgwmkZYTzoRAm16KCfQUiBkj6Wg
+                                KDamEo+N6vWQ1vHB5TXeMXmeR1NHWk8p1xKGhlOGRlJK1YQ48wZwqcDPGsfEo1PTofM3GQAgPV7g
+                                2LhrMQATosx5Z/mhw1+esbBRHRTSR69pOWJoJKWxOWPnaxtUt3U5cvhPmT7xSZTNKaXDPgi0XZAF
+                                hghrPJ5OEtTDjPUnWElUCNKUkBTagEvo5mPI+v0M7Xwn00sJw40xdmypcur4Jzl16BO41hkS0wVR
+                                YLCYvrYgEEtB6gxWOHpZhrIJPSx/qwu++cRJfnNhibe88fWMpjF7Tk7xR8Oj3IulW/ggsCYFCh2K
+                                W73AezB+jE2WetUz5+Ve9696YchdyiFsj6NS8h9nlvjJtVXaIzHlakylkVAby6hvKlEdzShVY6JE
+                                XqIO4A35yb8+RXdNPwicDdH/ixonH13Dz9rgBVaAkxOPTD+x/baRNza2lAa8AIhEIqRntqhIEsWS
+                                ykjEzLG/p3Vgki2bd/pAK18DVYAuhRzR4/SFdBg8ZVsEkSYhBJHyX64VGhfnaCRSbGPLTe+F/Ayn
+                                j3+GHVvGkbLJs3t/l10772fTlgcg2owRYl1oqiwkkZJEWiOs4HDi+I3zTT48NcueO27i60eqtJ87
+                                yq9s3sRrxmpIUeAKFbgNsDVLSJwJo/LA9tq+npGkvosYysldK1kKSKYsTfi0gR+bnmeloshqCWkp
+                                olRNKDcShhoppVpCWo785it5iXRb0G7mnDmw8ASwj40JIS9qinh0jT/f9wILwE88/emTf/22H7yz
+                                bo3bqMBJULEgEZ7domJJnCrSUkRzcp7nDh1fL9rEARSCEEhiT/VyFiUUVvQRfIECHoo1gkAocT7g
+                                tXIIUbqVG/dso7t4gPmZR7l991YWV45y8NkT7Nr1Jsojd9G0Xql7S7WEiCVNkfCxdpOfPnICVxvi
+                                7V93L2dPneNtnR7ftWmURpgOZoUkTxR58HTb4xRhQmvagYhKvgcRvKC1BQ5HU8ChIA37OwurlHSP
+                                1XpMkimyoZhyLaHSSKjUU7KhmKSkLisI5Zyfcv7/PjhhnOOT+JGxg3e/e7kMoJ8RrAIzC5PtX3v2
+                                4cmf2fP1Wwfq8yF46bNbI0mUSOJMEWc51dESpyfO01peZW52H9Xh+wGJdl2USEOs4DH8QiikDEJL
+                                rt+d8wpgHlatPXMGiaNCafiNVOt3Mjf5RYw7QJq0OXHib9iRz5EIQaQUHW34MhF/MjvNx+eX+Of3
+                                3Alo9OET/PpwnXulQkiLRflp884ibMFKQAOVrfVzDYQnhAjrW9TG9ZAixtkcS8xZm7EiHJvGhlCV
+                                mLXIUMpiStWYcj2l0kgoh1O/HvTJS2++kIJDX5yi29IfwM8InAyRf86LHB+vXsC/cQP1gan5c63t
+                                u187flucqY20cACpsn4VJJIoVojYUm5EZGXF5Olnaa9MM1QZJ1J1UAXdooOUGUrJdVFGHHRbp1iY
+                                P0J5aIT6+OtwQqBU0k/dg9iDxcgylZGbqTd2sLy0RCK69DozWN1kvFFjWRf8+eQMk0nEWx94LYtn
+                                p3lru+B/bN7EzaYgCtO/pSGkkAIdKT64ssqJVofvGa1xl8pwLvcgkDCcoiha2DjGanhGC347Lyjt
+                                GOG8XUOmglLVB3rVsRK1kYxKIx2I+OUlN7//fc6fXeXxB089B3wCPxRikhc5NPqFeoDBq6AdAsJf
+                                /Mz7D3zjO37k7kqcqgvRQiHMVANyJyr2cUGcRpTrKUszJ3j2H45xx9d8F+Xh3SAFVhRYzXo+79E2
+                                4RcbE3QFgzSLLTDOEkWpHx0vDMZJovgmbrx9NzY/yqkjD9JqztNqt8kLzVtfv8eXXJ86zP/dPMwt
+                                ThJ3OlibY1WMyzUySvzvtRYnFEuFRgkYipT/+AJ0r4NKI5wVyChjzTp+dbXDJ4zD1mOWl1coDSX+
+                                1NcSyvWEUnXg1EdXbvo457Da8cWPHJsHPogfDDU10PR5UZv/Qj3AYIXQAMYa91hzdu3dO+8alb4z
+                                Ky4whP61IEKZM0p8XBCnimwoISk7Th57glbzLOPjdyFlKUi8eSVucHRap1mcO0xaatDY9AbfGcQh
+                                pELKyD+3CuVE0EcJeP2kzuimPSRxhdmZCcAR93r8V5Hy49VhxmJLpDQI61VHZYySymv24LGBhZR8
+                                oNlioZvzg5sb7JICJyVKRl5NREQ8U8CPzi/zxSxitWTpKR1OfUZtzEf4lXpCVvGnfkP+9dKbb51F
+                                ScXDf3TIrS703hdKvsdD1a97tYifr1YaeLmsoBci0UPTx1d/dv/Dk+uiSZdyZVIKokSRliMq9ZTa
+                                WInG5hKbdtW4+d5RbDTFs0/9JmuL+9eHObkwWbPfrLFGB1aZC9Vbs07SQGovSm2UvxqcRhYF2tWo
+                                D99OtexT0H+TJryjqlBJQZxL3400kjgdgnYnALbk+ufQzpJbixBQw2GFXSe85kLye601vn+5yfHh
+                                jKU4R2SCSiOlNu4/X20so9JISIdi4tRTvp7v5AsET3/6FAvn1j4UNv9k2PzOV2vzX8wVMGgEnfDG
+                                Pn7osZmbh4azf3vT68bWg8KvAJHigvV76NO6N0gUlWqF8ydXOTTxR2zb8mY27/wmbJSG9nI2EAT2
+                                tfv6uEDr5wgEb+GUbxMLaxEqQTqJRZIbD9FuxArpOkgXexRvr4MslT2+P45xhQ7AFYEyhk4S0zG+
+                                hVxzEmctGsGkdvzqcovPK0uvoeiKnFIloVyLqTRSKg1f5EnKkS/vrk/+uHKXDwHnDi5z7Km5TwKP
+                                hpM/82Jz/pfKAHRIR2aA33jqoVNJqRq954ZbGuLyRhBigzAPTyofKKq4YExkVEdv5MSzTzC/9wh3
+                                vuYHkeVRYlkJ4F/txadcEsAhLiCBNgys33o2uFBPsOsy7n0ouww3qBACkaSBaCI8mllrT+0KqWfb
+                                Olq5JlMQxQJyxd/mmp+YW4CxEkto4lhRGfL3fKWRenc/FJNk0fPe9Rfj7M9NLPGlj5/YCzw0EPSt
+                                cI1TQV/qK+DiAtFqCFB+/ZE/O/Y3MyeaHsV7GYpLPza44FpoJNTHMipjsPvuURrbNPv2/hoLk18g
+                                i7QXfDJdHH00j8PoTiCEBIHKQDrtZyFCep0/bYoNl64FykQIKzyVu98JNNbTvKzzM4OtwWHoCGgb
+                                TSolvSjmf7bW+MnOGmtjKctKUxqKGRrx1bzGpjL1sRKVekpajlCxvKrN7zd5Jg8t86WPnTgAfAA4
+                                Apx5Mc2el9oDXBwPNEOJ8mf+/sNHq//sPbc8sO32Bv1C0eUNwdcN4v6YtJA2JiVFuRYzc+JvOXMq
+                                NHGsRoYSrwBUmoH1U8uEUH5olYz81A5XeOFpBFZYTEAFp9IzkTz4QK/PKkBbL97k+tKtDiOhLUM7
+                                1Dj+28IKB5WhmVpkLChX0q8s6mTKb/xVqnz3c/2pw8s89pfHJ4DfxY+FPx1q/deE83s5soDnuxJ6
+                                wONnDi7e1Bgv7a6OZc/7RfSFkfvXQRQrXztIBbWRMlIKWs02wgnGb7gPIRuelaNb+Il/vqcQR0lQ
+                                7rQoFWRpBFAsM3vuSzjn+ObhGvclXqbNij4NJcDD8JpBRvh2sQEe05a/aq4yPDLEVGJoR4akFFGp
+                                J1RHMmpjGdURX8dPSlHQ+Lt6lW+AmaMrPPoXxyaA3wqbfyoAPa8Z5fOPaQAXG8GTZyeWFPC68Z3V
+                                rygUXc4byNBYiiLlefLKEZcE9dEhFGVWFibJhrYSx1WEi5Eiw5kVP4hJKj+8Snn2UF/xUhaLTJ97
+                                Aucs72rUuKckEYVASOPl7SyYwqA7bWQSUWCQQjFRaH7HGCpbR1imi0wlpZpP76qjGbXRC4s6KpJX
+                                LfHeJ7tMPDLFUw+d/jzwB8DhsPkLL/Xmv1QGcLERPDd3prXYWuh93fY7hte7Wlf2BGJdI0fFkihR
+                                ASkDScXR6zSZOv401VKDNN1EbhZJowaFLhCR5yQ54TBFBykTf7KLZWYmH8day7uHa9yVRCir/Ddg
+                                DYXpYnVBkpXJRYG0ko91DD+8tMRkBoumQzbk45TBU1+uJSSl6AKXf7Wbj4DHPnqcY0/N/SXw0QG3
+                                /7Js/lczBrgcjKxfLPqzMxOLs62l7s+/+dtvqZTqcQh4r2wIfizfRk9BJZI4LVAxINocPvCHjIzu
+                                Ycuud+ASi5AG5bwSl3COKCr5vrr1TSc3qH0ZZhIa4183OqcUV9GFYEYofqG5wqeFoTccE6dQGQr3
+                                fEjt0kpMnKkLELzXsvHdluaRPz3SXT7feT/w5VDjnwoBX+eluvNfLg8waAhFMIaZTqv4zJEnZ9+y
+                                eVe9Xq6lrMs9iMsbAYKNMnIUvEEiSasR5WrK8twMizP7SaOIUmX7urR8kbdDAzFoExaLzEw+iXOO
+                                b61VeW3qB1IgBNJKRKSwTvDXRZcfX1nlSymYIY9vKNcThsKpHxrOKFUTkpJav+uvNsrvr9mTq3zu
+                                9yfmumv6Z4G9A6lef/Pdy7H5L7UBXFwy7oYP99lTz8yvrcx1vnb77Y3nPTmDpeT17mIsiSJJlErK
+                                wwmJijhz/GnWlo5Sr2xBqgoqzfwUTxVk6Ippzk/vw1jLdwzXuCON/evOYp1jgYL/s7LGz3Y6zNUk
+                                KlOUhjxgozqahWpe6k/+Nd/1/SeCL/7FcQ783eRDwO8Az+Ep3dNskDpfts1/OQzgUjFBBziyMt99
+                                +uS++ddn1aTW2FzaqPI9jzfoT9P2haOgo5MYasNl8k6L08e/jKNHaehGokgiXYSwCnrnmJ7ci3WO
+                                94yOcgcOVYDBsk8b/t38Mp+KHaaqSLKIci2hOuK7d9XRjHI9IS3H13zX+36F4OzBJf7uT4/MLs+0
+                                3wd8diDHn+MaNH1erQbAgCfIwwc+r3P72clDSyzNtPfUN5VU5sefXtYQ1r2B5ALEUZT4ADGuCJIy
+                                LEwfZXn2AFlWIimPIkSCyWeZn3kW6wzfPV7jVjTGSt63usxPr61xuiKRZUVW8WXc6mhGdbQU0rvE
+                                5/bR1Rd1+gbbnOvy5IOnikOPzXzW5Pa38Uje42yQOa9azOHVbgCXigvWgP2rC91PHX967uZOq9g6
+                                fENFREmARF3GEr7iSkj6sYE/vZVGStFtMX16H/naOeqNTQjXZGF2gkJr3jNap+4EP7fS4n26Q16L
+                                iUsRpaqv6FXHMmqjJZ/eVaL14Y1XU8fvv95dLXjmc2fNUw+dPtha6v0v4OFw1/dP/Wo4DIZ/xCX+
+                                EX9vfzxdGagBm4DtwE9tu23kvvu/eSdJSV1F+dSTN3VhKbqGXrugs1rQXslpN3Pmz7XQa2WSKGNh
+                                4RzOOX7ipu18caXJocQSZx6uloX7fj3Kfx6kzsV3fP/lvKN56qHTnDu8NIHjQyGnn8JDuJaD0ecv
+                                R4r3SjaAwV6ExOsulIA6MAbcJqV49+iOoXfc8eYb2HJr7UL1e3EJQ7AeMt03hG6rYG0lp7OSs7rY
+                                Ze70Kt01jXCCRiODsiBJFWnlInzeVVbz/Ka7dc3h2ROrTDwyxdy51uedcQ+Hgs5MOO1LAxuvX+5A
+                                75VsAP33EKZOEQMV/Aj0EWAceHdtPHvb9tuGd+y4c4T65hLrA74usob+AEqrHUXPkHc03Zb3CJ1W
+                                TnulwHYt2llUJEhLcejeJRu5/eWQOm5giGq4ClbmOkweWeLUMwtzK/Pdx4FPhpN+PhRzlkO803ul
+                                bfwryQAu9gh9Q8iAIfw49BFgK/Dvq6Pp3be9cUt5fGdNlqrxhp5uP9J01msKWYcprDeE4BE6rYK8
+                                XWC01+LNKj7a7+f1Kg4unz4I+SLj0o7OasH85Ko79uRcZ3Fq7Tjw58HNz4VN78u0tAdcvX2lbfwr
+                                1QAuvhriAa9QCVeE9wyCt0vBO8e2Vxs77x5l6y0NkpJaF1ZavxYsGG3RwSMUPYM1DqkESSkiySLP
+                                xIk2tI3WT7xz9DqauTMtTu9fYOZEs2WNewSvxzMXOnXL4bEa3HyXDaVu90rd+Fe6AQxeDYPXQxo8
+                                QyV4hyqwGdgN3JKWo9elpejWtBLXh2+oUB1NqY6mlGupp4wLh9F+jpGnZlucgd5aQXvFB46tpR6t
+                                xS55x8zlXX2219YToT5/lg0a9urAhnfYEGcePO2v6I1/NRjAlYwhCoFjP3gshWyiFIwjA3aErGIc
+                                GA6vJwOf2Qyko6t4LMNcCNz6Yov9Rzs8Bv+uH9CZV8tpfzUbwJWMYTBuGHwkA8+jAcNZlwkaKE65
+                                gc0swvN84Hkx8HqfhWsHClyv2iV49a/BsVryoocaMJTBnxsci+wucttm4O/sJV53/BNagn9aS1zj
+                                c3eZ58/32vV1fV1f19f1dX1dX9fX9XV9XV/X1/V1fb0a1/8He8q//0YPCp0AAAAASUVORK5CYII=
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/gamification/static/src/img/icon.png b/addons/gamification/static/src/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..52a75f726ba443c475b4019fd705b9374b6793f7
GIT binary patch
literal 22343
zcmV)eK&HQmP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00006VoOIv09F8d
z05mrM@(=(3010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2)v701|u88Uz3UAOJ~3
zK~#9!?7erGW><CQ`&)aTbG}&hRj$ratyZh07Ro{iBoGRKK;&S+fCp@BkHfWnuhWd}
z8ISE}489m&aKLy>jwa(v5FiPJP(Z2G>fEhP6}$2m&)Iv;ANy3P!3r%QF<|RFPd#dN
zfAyWP*IwaW@4F5>b3AiAb3AiAb3AiAbNoj<<UhcDJ<)sANBQ$J2JlmUA9BK<%?W>J
z9^vnPbiozykML)If)VJyM}v@`@dX#ap77u35q^rmI$#5^45;Ow_rP@iGY0Gd=7AK*
z9^uF5Kkfu$&}R(bC%@?CgvE}5BwyHbfvv?#bb6^)*ifw{E8{{`O-hzhS3<E8k(48%
z$bf(<q#aMzc63@9jhPOuMoPP$PS<DBL-m>Ffh^UXzyrX&z%0-PIwu&3`w@e9#sHq?
zMUR03Fbu4Zi}qzn(Z0NAS*5n(lpa=Y?jb2zHP(o#qN+c#EV^{d`bak~U_?N`XG(px
z&Cy*mj2)O`Zn8PjZf0N3+Wu?6eqaJ<o?sL|lg1!F#n*M>q8EWO@Iv4ZR&DNCvH97{
zsVyr>WDQ<DA_kF%7g~`gb#p&z7>kA^2wAF39bM3!w~olz!TE=PKL&2kLq`K>onQ?9
zXTcEUr*z>LU3(e00{DYX7Ywamb9#TNHdG=in6Sb>)>1!tt5B4z<(V3(bKvfY`k@`u
zJApq1b^vp^F|>aqcX-ACPGaFBpafKaUmILoedC&~{ln|e8o<Uz)vG*;^Zv;mCtQLE
zwCfpr@0#H7gH!uw$D5x3J_gJH3%OTFe_9PeehSVnC%E}xgg5prtNi}?*RP{zxUAlJ
z2@m?GIbF#uLg3i08ScIDNIHMK^=H5rf$=;<G*2)DeZ~MD-th&X3wV3)veNHg@~Ts9
zxjR;VhA|57JquGEZu!`5>a(3c%njlA35JmUw0HygKXgu$$M_2Hyh=~<o{MhSIM}zM
z{P2h5XB(qhOdcm6THy9C9T;oOrvC-_PHqSbKawo|hcN(i0yxtrhWDO%#j0z!JbSq+
zDysT3zwke51OVz`=dGh`zv<{rz<&Xb<N#FTgs|}M+5i?~{nD=Q87_a~^4D#mP>DdF
z{vE%#82?ASiz+IRHXYyo$gXT=wE5e>H}m{p?gVe}6VDCoPiXONzUzB|KR^4bHGg`+
zi`QwC7!l-YUyxFg&{ZyDjU~+-UX>H<;psPsaF>`!*m%yMiDP@s*nzn%zz_Jh5c9t)
z4<IL$cD+&2eCv5{+_JtlRC-#IJXNJ!D6)BZH)pSGBk3W=Ca38i=z_u~_Dz)7Gty#w
zW*Vms5#dA|czO*Y7~jlTldu2dj!BfCC-fmEf%;E6Bs`sWx)|>(zy*VADxbOJ6`Lw?
zDfDih>SwH~l#(K+3?-a4xIi@;q1BjXpw?jZa!a{nX?EI7P75PrMV#%Y+PjwHjV|_%
zMjRY(Gc`X2qCaF1Plquq<~p5b#w{P;(>#8({=0cd7&{>({6rvSd72l$3S7T(bMHT0
z{ECghQ<vl|#`IDlW_54Gs@@J~4v*7Q97o~?!@~(lQlVU}VrT;vRq(FK+?+Bx-ePvH
z&Fq}e>eLt*UdL2>8HZ<jI55`Y=;RowYd>w?K@~(4jPSir@8j@}>Hi9R2^h&iq|Q$Q
zGmxio@w<Vyo^sB>pPzHxI#pDDT*y{cF-AzDgd|H?*I(nM*L0{w_mDLjWLd`0vW#k1
z1t?>E0Z35lU@d49(eChfevD>&j>y(<uE_jClc{>f@X)zDuy+mb|L`7~C5IMLiiHBL
ztd;NFr`8x$6*0mCHy_gnZaVf(;8S^(FhhWopH?G~r)lwP!0()S<*MJ>a>+7PRS}gZ
ze7411UaQnt)n8#v{{oHq5zgAYg7>~_Ki|4}jAGI8bFUfXl{eHleQQKGO@{F;3@M&6
z#zhbbN{Y}%eHW@0B*hs)A~<?5;d5V@<%1s^=e`FP$TDT?={@|(UtC0YGL0_`vS*~q
z9lMS(-&{ZpPg$r?^?<PN&T)S5)x#eG-U}SgOU0+v2;^zn`R~|v<;p+aa_I{7&dU>d
zIE#xu*wfFZ<-(?+l%hLGvo#Ak2R>ul)`X#<^~}yy*l~Z%7r!#et+&mf;@Gy$^3og1
zTzOd!rLrM&0do-yLV{DUCPGcbf&Ic)zP!L^zA(WZcP`Luc}_j0$PF*<=Y`kwaLTC}
z=qL~EUtn_5)9BP_`F`T=H5{HQ@ZixpbB+2B8N-t`1XYhQmL1<c#{J(s`cdF-fJ3<v
zw4ScSP@dw&uL7?+<@}-dopa3^Rj((t_^L`|V}|=`Y#5GNQ)|&}57THoL}XhOOVHa}
zX6?!n-CZ?QJZe1R3y3uc1!gC!?6}|Z?VB6i`0e8?wC1?<(jw2fyqohcFboYi$RZAp
z#N7DpIv@Mw7`J?Po_1T=u(rT;FX-lF*Y|PZMMcWh4DVXt+Zf6?9iv`v(`qCfpIYFd
zBOXtQMmo%NXPAekiyWECm~S>Q2E@pd3KObetg!v2qdaiavG)QWI>89qPlpl6Q}i8+
zi~syJTl+tG(aYAK^x{{FWiB{<m@UiZ=(h)$nLfzOLWgy04QtnyNeU&r2#M`ldPs<3
zOa^Me8^GbkfyAh<GCNV@zB>#*xVz2nJsG3Zb9DF5F+11c=I_oiH}6=zvcP4RRCwDP
z1~~ux0_Cn0?^@yetstrh8F&TL1T7<yptMn~)2MeiaK!Q8u8d-oP)G(jIJbh`6A@#x
z8Lg~?m?s`0R25@|d%k`|cYSa4_keHY;b8WJ#PFxa02V=>GO%jJskM79ebuH&_0bpq
zL`1IQdPwRE{Nb-IV4~wRn$vW3DU~FqQZ1rVL>1H~;7-WK6^!vfimFA4Q7;$+UL6pF
z)>xP?@;C3PbI)BxcI`jL_Pqy*qX+^1?2k|7)vt|NHrxUlsEe^Gz#M8C7~c)~`NgE*
zEr>yF0Cv<jA#-FdWpa9f#)74>pmcRr=p>i&Ki_|x1q-P(Fh-t`S6E~+-Td)Aer*5T
zZvZ#viQybiaU)57%-@w9<Qb^clDn>c`_}#_G5_XkRh2kOSXPUu>I?%V$KhjT-uqV%
zvSs~ps@06O8|QiB8>?J)afLWioa>;b4PH<p3=*2Ik{f^+P>Y%rj{{L`Tws1a;alHG
z`R5NE=jQLs(p8Cg<qdsYbyb-)t7<%Spu^X{F~=uAH^$U#hs!VN=1s5f=h|zEboDgx
z?T{=&il~5X;avl(eFzcWDq=0_Ti`8939%ky6UN63pZ#2efBwicx7|5M&tNyd{s$LR
zEzdGj_Z*(F%r}}LS9lzQSY#o6_3yVgW+z%dPv9mV%fX`TsY(jv$Bg?)-qiW%3xDOz
z=ajn(KXe1dIA*Y#u%fHOU^0Pmqa<;Y4QoBCR}Zsy{}7-4{4Dp}?GfLD&pf5><6QYX
zxc((IHg1d%(?Z)GF**B3C1(LCSc9=8W{wxQ_r5xx{_H$o{PHyQ1;_KA+sEr)J;>#k
z3qAcE(0SCyh$bLiOieic{~H(h;D=}V&iAIN)eJ9r(EzV{WtFqfwshB&%(bxIAQ~gS
z1)_K(!2@6riJ7az4}ReI_$L<l>=&k(oXqI0S)PAoFRyuJALpI7z^%8Ap-xcK%XqVw
z>8yvNvzFOL2PKrYk7Nw0N^2qIEAPF3k4yE}fZcijpz%~y2J&P4UQFoYzxm>qZ~UJt
zPwN37wwCUKFjz`i-95vy>M=TLn@Sh-4H!0Ui0G<@GE7WFWV@)(mH6t73w-nwv(#sM
zNo+UA#wR%Q><({uZHaTvi>OvJ&@6v239U}Vp54NyJ~hWDK0V3EScePFE%TN)EaSRs
zD+~;$cx|ED#;IUUf|8<Shz}k`Tmm-Y;K7KGd~}*m{>u~(?ryPReStT>X^`t*Qf2)b
zp;Tz1X$P+YCL(hMMn)W8`f`W&{=+yA?rM?5!dY7@yyZ13x#5NigR46@HwRe@qmD+a
z&W=4DjvW)4O<`)jN~M1#4^4M-cv@I!rFeCZ=oyYYIL)n}+4n`@FM)keWo7VW4Zs4G
zLZNVO|Ju?wpYxi{+E<RGKWeeMdy>JfaR&O^EE|TdilwK!NR-52J>pA1k~?&RS^@9z
z#^QaE$?<MJ{P78H{CWrR-IR;njL#nAx)(;g`1%T7Grszj4j=y51lu2Ma^~q3-uT)<
zUi0c2LqiS3w2;W*y~SWL0?sSy6-;<uq6TXfb&5J5O7K1=%gXG2(DK2Lj`QiyO>p>F
zlZ(%<@y6HpbN!3Tl)5_HdTYx2{%(e^-Z(?Mtqk^AUh|3p-u{+;PT35`G(vu&2JtB(
z5#B4r;9L{0Z5HP096Ic&&l~0zETfZMl=@b1Y`%|O$CRmsg{5jjRk7A^_ty^j-QOSo
z72x}MWiXfb4fH2%0EWQg8GP0`Yrk{V4Lz&Z^^LQ#Z;onroBm#<)+JO+LbVoAOa=hS
zlRuAOK`f#nZWE=b8dOSQhkC_C!u)JE_w5kA_pK85+-+Gl)W;XTaT`a*j?-?##<dkb
z{J&1;jI&ylN^^+!kXf)ABt21zkP`V4P6fQ8CiI|;g0Tu7)OWzPfIgh27-JAu;`s40
zJ04U%^~nZz-JQ{FFEBGd&*5WDib=vH7xwawcl7h@bA`ddHfkK+JMayxl=Ee&gOu?;
zJT)T*$1IA+xB?yDWOTI6!aU5(dX68D@KVLcJ?t3m<-S86On{7?gRi{j-uZUZFXjUy
zc|PENlI`F{*WaBag%4kNcJW!i{>GT+U7pcD)Mnj!VfD%~y*<5@E4|pL8uVBSDu5Uy
zZv=Tff#R8hbU-Xhim?$wiRtNtU3(gQ^~MQ4^@W`*G$+_{dd!+tWtw$mpnH(J@0ntD
zCS#z#NZ+7Cj7P<Vq!7Vq@Br!^n2^PXEK)Fw*JDBzs~X|SKm=={UU%%=zrZ)XInUmG
zO~$7hOwV>mGv%~(gOtjKp&=OR6MFlUs9<njL0ryK77U8_Hs}o?l$M$xS^--kvL$+J
zmi{4S^{Q@`4X4y<j?>n9&RXB*$i5;w_BJS16HFuwt?w!vxcj&OyYj{VvHJz`BzAvg
z-I}#m9UDFNnci9ttA`_A@VuB;zov%`o7$8LEks%v3aFZ}GXakx8ookA@u~<WT)Q<m
zA{xyi_upgq;KxV!>=$O3pU=4RIla8<l|8)l#U*Mz8BT?x`(pm(U*_0;Z#RcWQVxwy
za?!<>UwCtkZQEkXl{!Y-pcagxYVc~q)#nCj4NDC-O%2{y+MNQsc3VF2iAg^AvEz)4
zX4EPXtJg-n@ioI-eNBy{$C|Vz`}o$)v)sMC&i%VbIrEH!m)}s~B`>NmysSf^&_>jv
z&VvSH6C}XYYETq!JBW`ECnz3_!P$hl*(x`Fy}`TQGs^dWFi%{tT>kn~srDp9iQzk+
z*vHs`xpx4!0S^&)hEKXGkSF-r1n4i9t2Y;mJsZ!z@D&_+=z9#*n)GxVB0Is`-&Eo`
z&okI!8_n7wd)LJiIYg?U4sRW35nPGg`z-JOz$l;j{BaH+$=I~9$S=QjC9ix{iJ_qu
zXa^%<S9|do6+D(^tIEx{q<r#YEt+%v9GjSDsy@P--#oyZ-cY8mzXj@0zqlVeI5S7&
z2NAV+(?KL*VZOvy{<Xn7-+hej+dGts1r*2gF0b+b{N@U_o$ZL@+}nzPk7>7J_V0xs
z+@5gXeG#|*V3O^7M%a3K!Y};%0N1~$OmANs(S>06T0(O1kZJ)JwZXIyS4O48#8`<B
zerSewzi))e<Bnn+v9=JixmMuVc|FvIN))RxsPMVJx_djG-zDe}Mt_`y@QE0}VsHP_
zt(UI-()jL(ZRfs~C{jA@V{{r1VY5*-F0asZ<D7NQG;e%ui4`ji-en*TH6UUUo3L{y
zeC9JvKK98;cI|C3*cWrdi~D%f8)}@kRj72eaoIG9DB`>EXh<R#O<ffgkC>QNvx`If
z;q#wu@vWOuiqQ}wQ)8^()aLDP@8!}<B23f(AF2qW30@-Zx!d#p4=nJ-uguVH6!2cz
zu+H+jSNHS67j>~_!#vi`A}+?d03a;}P3Hw~1$@fFY&VDZmHFB?+uU_$n;m<a9G{zJ
z^Jc>@ylI%Lu8tX4)+B3soarC})`OKEZvUR}zJHkF%ioyAw-XZMxuBfz)>X^7xLo7w
zWBd8D)d~H}D^&Xm#3jql?~bwKmScYee3c+mn|ZPcp*+Ewf1p^gU%L7~ow@C%501&U
zZEqy53?Md7>f8)7qxaHXo}sT6;j>B3Kexfv*LpUbnlL$0;G5rW@sW>@am%f9Bn87|
z7gu@n>xa4Od1d;C=OAn2uwlo#3}e!8p*G5|Hkg1qi@E^R2nIAlBAA^har1X0zV$8P
z;K7JP$L1Lrs&m6j60Uwh8EXu;eJ|yG?;q#3I~z1x%9@pBu6#~EuY6^hD=t$?l@^-0
z5Fj)Vca26Nwud-|m+<eRae$`9;j;=8W0w2wO}OKB!!6%m;NAx(DOFM~yij<<Yx+3v
ztTIB(t+zJ$|K2~&cW-YXSeBO)uIwrChM@t@sZ>d<C(Gb}?0Jw+uj!_5MTOc>i9$I-
zfzQA5?g{VsMPPdl5H+5R7mz2o`(L{C@)iH<l=FtT<)4qT`Lr9T)>h*+LQF!YmY5Fe
zXPBSfMcIt8Wn&+W<|Mlg?Bs!6v&_{UD~1z(<CoU*@|Q=fJtf0u4Ga$T9xDY@>WHK{
z%-})@u{OBhoJ^*^0op=L1+)N8QRBdS)Rge1i+k?taP!v_4(}ag_x>qvyKfhrECru%
z%Gv??`Z`?q!i1N-tcNx070*02%P^vO{vttmW>WA`{&@38W_+kPG{ko=4$1PpA|*0k
z;=X$u?7Y9sJ$GC7>@(c4{Se;FV#Kg8XIMAXi%nZx+g;|R{rzk!6tSX+HTbN9G~u@n
z?&7QKy6In4p*B>eSdEEd;o!Yf-2TM_zYlyH*!yI?K=cHfJzd3e{Hv#5wj7r!wf-(T
znc$=tGHS0l*Fa1WWI5&D0g7gUJ)_6iyJtJo(@o|Zo>fD=Tz%O9S6xwL^@=96n^*xw
zFh)^np+02F8g)>gVkkb`1P~xIKm|4B5aYFtScB6j5HP(5@90WmcJ7(xqo3Nv%AtNb
z87$P5O>25NJUYuOU$&ArzbU5HJqKwE8%hHdi;9P+iMSYbabCW95EtO-ya^>XL&cyz
z4%`CTVCFGWXWQ9^GtTzB;<d~8o!>sr!Lcg$?>x@gr!42p<wc(BBd+W3r$<2~!dOr&
zsA2_<O^vX}noztLSt?>wVdZH(@J0SFVCM;Z!tALw06C%V-@Ng>!E+ZkfJz7Tq0epr
zZz2+#pe|g26GL5khzn&p{#It@ngI0FRxmnQ;UE6Kizu1kf@gPl*-MKQyXMK#2q8km
z<7ptyA-;&x3JIfCkQ5b%kYKz;MS%hyu#wW3>*aHwZ}7JtILw`Q*I6?>$SbZnn;m;5
z>FMiG?doA>%J55XxPhDRc!0mVa3>dE81d$xuW{uSWvpohY`_SrMN|}tJgL?(c#IVD
z$JPd04~{W2i1CQ=7;kW<h1edN(-r>dqceQygWK7$yG3Fnyu#jtWBk>*Te+xOz~Gna
zWX&rD6(QD`qPCf_Chscd?CJdZM+L){OPBXO_??lhc?g(#GF-ywB(Z`D@aG%P9fX_~
z<+MYV)$!`EVuNBf%P<lzDezSkr<Q8hFa|JD%<$Ulm}%F!>F&GettiJvmhsIS+njwt
zhik7(S--)dsYhIlXb~)^v8ZO?BaDx81FR#qfY&N$7dv-4KK{w$eE1W486AObr>@}o
zOHRWU8mwG5!7uz$i3`r%NED?UJ=)=m|9T6<Lp@woyO`;@1%CUtj#B9w;U(7>c=^jp
zY}{bLbWk65rFg}dN@zKo;3dQr5mksB#s`R5OqKn6tGxdo>wMzVBaBZdr>*MaHD@lT
z)P}#kZ!a54MV?hI6T6&|gn&vO;S5+oXO82VZPGZ#Sc9=Y!c9cja`7_u+&*?~*75hA
z&?9h9r2#CKezgtH8rWK@#sSt8WyPB1j2#%EcQAw4VkGpjmtZdx?^A?`B<Tw1ocFYB
zf>wK3-gOF+&T{9judsT^(&?<@mak89*11!>>QzNnuTHQ@opv^X@s>hV1xfJ&>Vlkb
zZr*a&U5@wu{ZYR1)j5*5z}cs+<C4>BlzV46`+_lE{?cxShD!Ks0mB>)!}2vL?|6qL
zZM6C7*Z1(HFMCRHKb7)2KKCyZy!UTMxa4Btt#7Gv-no`)w?}M5$9E8IVyFbUk8yN-
zN+eY}uEMSdl=r-EnooXiibx8azIKpHmnB@FaBXjqS?TBf_wOUJmZFhBWl)1^*xl+~
zzzQUSVu1{$841RQA2AQJDpes$EIq^JXHOnp80KNM(G%hfL?_YfF9EMO<@}-24~Z$_
z4$gHD5sZm(n&N#%WD0oa5o3rVA95vA2*|$(;)2Uw@F`g;EZg{UjBWD02X4fqvn(4t
zi{Ja5NxBCP@wT@Y*>>h?qNoWD)VA<cn3?V2<DZz}-S0cb{sSF0tnA}Omu*9(!J3V8
zyzT9l4X1<$Y;+puGfWhdxdpstSZZXMVv+@}eIZ=)BFpTg@XsH9h#dzyTyg%H^cQRV
z&Tl@*OzS9benXAdzrK%Es}*Dhp@aAs=VQE9xaB(u|Krcc`1-e|S<zqP#pi6ItKH_D
zPR#Xv!}QW2^2(ir${`km5y7iLG(wDGL~uTL^%;0c&=fjVC|e1fg1|Y;8%1Fq&Uo%h
zzWt$H*8m4{TKN<50?|qQd)Zj|zq<!YOJoiKGT+8!8CljqlCH4ZbNRkl#bWTzpkA?2
z5=tkppdG{t_=Lp9IOAz)7t7aPk8yL{ymJ@XLW9$?wS405x_DoDfa_mU;5nBh>^%_i
z_y1Vu(_cIcuE1HRu3*ze1vYKYc)_*vTy#N9?_e3sEZ%t{^`Y@(B2>ZJZmfDF4^K)8
zMi8IUJ2=j7{zifS^wu(W+%d{0KYftCo(ku!d^S6OkaF!ub}_uH&VPRUFfX_!$QwWR
z`33&+-J?9XyUFQmR`I%v*RZVJ;Mq;Mq-&7Ao(QWQyo5f;Xs3l!WhfS`2;N8FGE^*H
zAasDhr%kLx?DifXnXvfwk=aGV>$@n|;`1A`>8J9tY4(X!1JUEu{xNXsX%`Jw#O82j
zZUog@Xn1Jeq6H<g35zD8i?bXs#D&VzXWH#qlEO-?wTPso&V}7zVtmv~x#ukGz_U0o
zy_4;?-^n?r_i@`dd-?6({SFU})LA(+z=hj3(N|M0xG>}SFKDr4YmC?q_!c6;_>GZ}
zQ07puG30JLhocuKi>MDE6AGq7wU%<lRhBEBUuN%K`0|(b^W9q_&fmI$?#goB_5VJ=
zZ~p#4yb8xBg!4A8=I1Uhva-Iw^V^QIdI#w?J~W?1Fd|Ek@UeCSugdaLf-csxzJpK<
z%@UuXHUgL8GvyeH=I(!yRV0rv<Zk7uy{q@!F+P~Hu_vAgfAH}Ppa@*N>B43DL#Gy@
z+FPdCJWlHBs8__qs0NHbB!FgVd`q#=MI0x1m!WAJ12_%gLBxbu2naEFq1EY7sGdVl
z^*r{E-Oaae`!XXF^-%r{^)NC%&U@ayo=sck@Yy_Gfvl4A1bsfM!J{~Y(!*CSKQccu
z*9eCBLV3$r!OI+|W&H-jfBv<EU-`uf|N50Szx&7E$748jG^Jch_@f)nWBHM3)}@Yf
z28M}jg!q&!?GVL9jFK<31(dmV0JZu}oC8XNCIuFUONg}?BWR_Ho0{dQ55kef`2T41
zu@$HGu;-5PYY7swGC_VWC*uX8$5?y|6f3pl^-0Ofi6jM8CG#zuYvHnXATo$uvUukl
zPBX+V(zxO!07bnbo`>mOUQzGC#)uk_h{Rch1sc+gsXU9M@*sX}0s)F~h11Vi&s*NM
zovW^bx4*4M|6mqMMOwk-tHI+j5<kKdTfCI~*%*`muLh$L5Ld-ZikdcAr^fBKb@+!5
zk8*URNj|WIR<lF*{Uf|=<uC;drV|zmN$?Vf<W3B@HfX3E_RlQ@?`aIE4`7qzO`_a5
zRRncHdtsId2@7v*9tPx*3_uuK*9CAsL3~@uJ@-k40rMFD76Svd;qs;*<*bQ-i3BkU
z>M%y}nt?!;bx;8t*_^_w7!zScFvgIzn~NP;oOcL@$QH1wplKj*M4qO^bfT2DougP9
zB#tb_Vu`W&9_~4i;&p&SySMPV*D7y&+bp|xln~P$NG56!R{)LjK@C~B79{{Vxe$X~
ztK`+?q0Awom?Xuu`uNm`2f5(#L%jM;$B61Hc<#1!tnBVa5PBlR^ZU9e+7xdbN{7@p
z@ZzyKXcH_wl*mpD(^>G!s}h4>M0FO$C4RA68u}$|pD||44^;q<WC0>ztzqpM{av{M
zRP)NsoGixwSn>b4Yqs<~q9GNE2}vZBl0iD!#E^k^c%Ndhh&Mzw37v5Z)`mo|(H>js
zs2EcK;}IoDwv7bRrFbG^Fk-P(=y*q(IZPDMv*LWBp%>yS&*!!sO)_64ZEWQ?e!awN
zU(?`gUn|l|ix3+!7YHBf8fXTZdVI&=GLQOpXb!2zJ0VpM#xj1ihrfOooOAJB{^(B@
z*wA$<m#kaCipe^^<;wj0`r#!3ND{}06D$fzOccck4%cbm(>ChT0PI8_kFb!ZOM|r{
z9>M!IJ_Db2a$_KG4M#LZI2uQoB_N1L71VmKtUkSOaeiV~4&0fOf%>DzLH{mVxuy3J
zzsE!#3N2hZM`U{OnuZ0l#XRwHsLS0PmMD%9BHD!a7{UMmAOJ~3K~${;5WhqWStNOK
z;&hP3o$15xo7{N9$1JIfp|G0rnq@Q^BYc0yT?|$emYK8pZ+~)_+Fwuc`q#!>eNCDE
zo-k@qy~$C-CPo4s%}X#g;}Z_;>*pgMpWz=re2`+)%>|pz!M0LL6NmYgp&>T)SFv?v
zN5`S6Bu1zhyQKYJ3UMNsLMh}F2<kmXl_oG&Zvaq=Ek+G$E#kpO6}<6y8^WQXO<mh8
z<N%Oe@&J#%kllktfXjfp^0l)k0}Vfx2Pkw8mbOI6qa+{3vutgZV~4&&;vJFHKm}_+
zU2x^zXL*v95JyEY2Gzx8ix2MEheT0xc~lT!T0{(*Yxf_{5(SYc;P5_1T^UW*(!b_9
zs9neHJC);eDeH&M;S2w=j!Ul?=bi6T#>Q)8M({R6F#)Rff@^oP^S%mi`NcNRx@;$3
z{#W6K3(sOzDQ3gbBm8O7=C9YR=CrsET#UCx4tGK=Up0mV#Yd8pJS0~s38+I%KEhbS
zV%NQLxY;5W=px_%;$0{N@*x@G6{8Uj!Ik?-t@$Aj@TfWhlu|VYcvkKK$|uYAGLO;x
zDfSGPHa?o!i3qE=)sW;k$H%{m^&=Q*VT{Ar2$zA87-KCWF(MY1WjN<Tbzm14)GjTw
zAUL1lT!!LvBj5xNpt*)lQ8$n4OyD)5tu<O^knZKz(!J(Qd~0Wk+jksh%Z4-9{lMwG
z@TK$o%C9y!dSC!+hcRv~H-4>;=U+R@^Iteddt`_gUa*x~BjfZvQ+!}}CBMI7CBrsB
z#DJU5bCig78a7nf2nA#CUV=g?%fe@kL5#_3u)HW%OH-A$_mr%mW(DyQC}~1yJb8zT
z&`2!btG9XGzA+{r0R?;{4Z-5{k=kIf7wE~Wx9G`+fJOYjT<s~8)axTIJ`#5B=*Sq;
z<2SLcF~*A3XJO-&bbJri#CY$+XKhXd6~Sd`z|YmAJ`gFbiSt@K2sfQ`7>V%OL5Ttv
zAiq^3K7^2@jL{O#*KwIAk`kFMLS!fnUQBoIv)Dbhg9r9Mz$wdDb9~ft^-FeAsWx$`
zq1~)<#=6rO+R{RfO><>j<YlW@(i0bOsu&zXgu`It1d$9Md1kW^$a}3tt;OV(17dL+
z5;^Z3l4XdocpHH@W}3=;C#5H`SX0O=rv$a2WOy~~NgeOrcZd(~9U<v2(^HPH(PJlp
zOKW0;q4hOpCt8EK2Z-|x{+OJ>=rM$zm(_;KkA6ZC7Ur77wnle%nd8%km^^-nwJSH%
z-M0;mR+2?APGi(t;<!qdWpp|V7*$-BVMU0d1e5di#01bJiW0~|D3Pd)81ruk451Hi
ziEN-+iGUFwWZzh_s7Pt}5^9{ozGL5IX72;E>MdsXH`%snB^PWOVqwowey*p+m21~h
zRwYhdKr3Abi7aA-2oE+wU0^YL7xs2<AqH!SvXHz&&=aai;4b7P?;>+)-YFhf5hqlL
z@lglShz!G+Gkj+1IDdC=g#EL1Qs?N+9AX3BZ=**q1Ahn*+FWDL?PL8pd>=m<4<ILm
zfNhoDghw0ADguR4%!(Cfa{A^=IC$tbT<aJ|j_sm(U^{EqY^8tbTuAz`QlnDtVG?My
z7Vxf36csQ&Bzl1;YH;4?fJ}yw2x~3QD@N>+gj!XX%vnT8(-tB&O!>}}NrS<;HYy2C
zs+0zwPi@)xjO_j-v-9`!(1B6@drv=CuU&_g3~4)vz$X^tHSA`WVI^9+Sw(Od+AgrL
z3&tYehn=hjpSBQdFi9a#XiZQsYe)tc@~d7^NvOmDjvg_>H)iJehl8W+TBy@XGdA^9
zcxhja(E@xo?hqvg8wXCn;~m`tWq|%X1jHv)0{TR&fCxCP+FO9f80-)wF%!r4v5;QL
z$~7;hlOCnL|C<y$lS~~yz>y<+*s%G0dU{VKwkd@qBJ&QB3`+^rU~LfKA|CHMh=!!c
zyA$Z$KLqHQU@#gkDl!FBJud5DOtN%WLWKAZ1xe{h5l=UR%QtcO@cq1OsF$nDT|_7y
zAQ6vBjKhTfyk=Ny^1g-%umOe?m~90#uVkap*wUaku%%*1WCb*JNF->djl?B{h<X<I
z5T_Li%whS$!W<tze1zLarzjO;x+B9|R}ArvHOp9OBi^=q52m{icE3HjNor9dM2T6I
zb^M72@Ps|UVhC8Cl%mHhB9cOkS4TT-f;GhPFdH_%g2~ATm>$1}{!)Wu58c7!*nYB3
zgYIgTnfZ1QR+?^%v3RloA^SZ0Hx|K%*0LmIsbZt}VLR3wO_V^lRuRM)QlI1QO8#92
zXA0DvV8s)8#pe==Ws;Dfq}GvS2CN1ZQEI?iJZY`~_84oHFeHyKpN1TuVg(T&!j?ez
z^5Cj9io(<n8z5lKV6;&O;GymUe=#}3hjtxAtYzImH`nxZ@!AywY%7-#iI^T8WlyVv
zn8L$EkjEF6W39zTX7I-`fF&5X*cBHS=|_*AcsLA#&zh(!;3dHm)7y6ry}hS0F>()H
zc9BHN*xWqrc1kC0QJ=Yo?*6mLbTE&dU^O6xPTP4~G(yy3O`Ft^GiE~DG$@0G3<o~L
zVu>WqyKXsY)aNKA5g1UPA$j~(QB)i@6EKQsjAkjs5h8+LXd#90@V$)!LP!vNjHev{
z`s|`T2JM3i7;?E8CRZE@UNhQp%+AbXM0jw%!(C&?Sk}|U=GgL!{XJaT-xp%M3!;UG
zW~Z2s15A8^mgRA&8#zMTn=gL!WDNiys&pmsk{0_>4v)jpB261qx`qR7TS1**q{86x
z3-Q@jMn}HSiWNm>XUCYCo9BTYH*v;kGuXm<;_@ai-8hqg8VVk~C>e_SQ2N-Y7!s=!
zhBTQR2gk;_#48Mp5R+T2wOGuO;iv}aIg}a_+Q66q*BT#K$m&t&v6U)|8f5Vvj|m8$
z2H`kBPh?TmP%(Iq7)xejL>(e2E{gG97_n`>=~{g0$PwbmvSoE2gY_maFcH@c4^j$*
zzmRDei&w{7r%l5O1rxe}CpA+qw|yJg3Z(ImQw9oPY+~)>wUdlBRC_G-`3ZV@)*%rn
z4zD4mdSYBuW^nbDOpJVoeFyFeCzXhuySLLx?_p?oHLI4NPoaA~nHfMO2`VB<^XxjP
zh$ZiQ`Ne*|=2e3a;Evb`uMVH3*eFJUv|T5P%E1Gu((bgv`QsQdW+_W&QM#7*F37Sx
z^G_j;bD}7CD|xpQ%25<{rw0>7fz+xQm<*>d;f0&#=J}^%W85}2MZKM|yr;s88YwU8
zU&c`E@uovZBVsIK^KjT{F_}6RVnfM3+ya)z8!WN7F|3q+!~@8a2>~XKjX4RYgF13H
ztqnXBBN%IOE`Mhaf|Cl}wT%=CMZ9-xJmmtC#39tV|AFm{j~-#gvi0;1ZK2w`4QIOZ
z0SN}5w`&(I(c0j`O->P4Bu5w(BN5>7fyjrA3QHluh)}Q3ht1+V>RirQaCt&0c{fjx
z$RO&mxz|}N^HL<}|A2B7=Pp|E$|TGKuDh6TFD&rh!$-MgY?@_#-K^@bv1??C`S~W#
zsr4`z*}y3zqL4Yn3f|{=kByk~U}AaPM$jW}N)gMWzasCXLx6}mi8BVIlXg2~xM`X~
z6k@co2Jb!ATb5>Sq#dHDKyUv=v>Y_&@8IGK&SzwNguVOra_HzDHm*BL&$6?Lsw;7n
z5EYCj7-MnXlle5LeDhgBvIGjqQhU@GOO}Q5F!U4_=^r`Rv`ECw_5O%1AtsWSnVNNw
zs1P`g8qny}DUCb{>@gPS35_5T8eX}p+2#Xd6MX*A7+sYrr>$DX22##izMTIyKFweh
z(H9wvXrO~Rk2V*Oa!)9K(+rbk9PI=&b%_Y_L<M{S$U7-0IC{+O{dngx&^y?Ln+rQH
zDg>|No#tp?h7u!^VxxpODd3$W(-;c<)Z(jXG!IfJCR}m(Mjkq}k6n9jr#!NQ;bo`L
zxAJmqadoJtjmfiq#Y@QS)%(zD%{rJU!J1rAq)HqW0_?0AkYF%muDNL4con=63?83_
z!3^RRB8#Ztqr%dIQ0MRnt;8^!rj(4ZI##00(b1SYwZr?49_Fh@rtz`mtS#%Y(+k{C
zEb{ub>)Dkm|6PS7vP6p;R8ur_NU<Dr1{Nf?&}eeNd!qQnKEM+&0{tPpOrA^#2->&I
zpA@C2T#Gn9xqx$R;-na2WG>+{VSfZAum(5oUFe--GE!ee3#U=2tYNBoh)P$+6_>4G
z|Dgly+kY3M<NG;f!x?m!hbTk_=fIK#;h1RHy?NKrWo?KOjKp~FFcQEefdDWq%7O!9
zAY|;`2VqIGiK&#4$mYC!z$vcT#FWcmEk->JF*ua&IKoyd>`~9hCXe&}1BaMNGtNGB
zE%o_27tYM_%j=f2A}(Oll-W*3>OF%=L@ahG;lnGgzJPQm;4{PtS(-AcETMm)9Dc%@
z&mWr>t}au5GTz497M=F|5}nGB6B{+q$JK>Vs8N()Z5$FYbr^A|Y14L1$O^>C85E;+
z%r)<&*4^Yem#*OG(GeclaVsmA57E_CWM;Mru8lRJQ)qK|Ozp!-uPnY3lwfp=s$^rx
zDeDlQKvsbO;vj-oa9Jnd4k!`@&xQ-Li8?NX*1>^p-akLjO^1%NYp%{2r>tg`_pDu*
z=a*LuazU|}^Zk@8QuZ#iL6wcg0<m|&1G&%ui>uvBeGr#sbg~Xp`S@64<#9WKk6NIe
z<l9Z7NBL!+HnZ$8F#rjLQddtGBbuR_<!(PDEJl=8yGdk|9LhC$G8Zy=>k8mw3ZfWW
zAk!8dYlynfB`TlF==cxl@3*X4v5Gwh_A)g+M`U8!tue%|0$&LI{d~H&<~YJ)qhK*(
zHWFh+QQyMnJvzzbHX1Vip#KXa;KatkOJ#~l0-?o6j?`FYvtU>wvn@U}dyHlMHJ-a+
z1=;8nZ>V<j+I2$^hu9uSK0b5;+oAmIDHoRRKM<0_I}h<b7oHmGv-41hmv+CL90>66
z;yK^u-@f<w2^oL_zPZpz9}@-2G4k%-F1*guc6B6+DVRRQLq-awh=@aTuAj}jda4b)
z7>rSb7^fhTq2A*)!I^G)mR*fuoTDS(XU+1}EFT!)?gw_#p5IQ?u2ZU=g=2sWOR96k
zlmnkmGcYdq29nPa%z~`nwR0RlCt+ra8iQzHFo}R`&4=W**bUC&G@~6m_BG+J4;`Z8
zJZpL@yz1gJ*uMJ+=S(f|%j?(CXA`{bpjn2Rkob~&pvhJ!Ka1GF{LXV16~%YjL0v5o
z?b#7_xF)S6I-vqM$pRq90kTXRJp5YQCrt{?TJ@~GNS%9ZBgk;BjkRT<h(l3rlKBRa
z?Fl4NmD~d?cFEGbbLaA1D<E;09O5(7)e+N=Gd=VVzktcZUuD<suK@7io}CQ$PtrK_
zefo#D(Kq;feAGo-8WdeX1v5$V^3jLHPCTlfGz%!6_(j?GA`icXCq}Y}$aLqQ&+xJ5
zp|<d$u{s|(_z*`L?Yw0zWIx!;9}f?3>R>;`T%d{zL=X`{v!L>ID2H+b*jQL3iR8_q
zP6vq#AeJ@|*9Ks6j;1JaP6RdP<Z=L&5T;z_7Kce@C*uXoql5ql9BntV$NY5>utm?%
z#+3HLD5ba@`uJF&fOA5--N5?*j}~%$fOl!=>C0ky7FwxzPh?_ZQ)E%6>rIhL-=-yE
zX;-zzh7GG(K2YV@!SAy3zIQQm^b3?VB_pCOF<z2DSoO`N-7n(vDWcG2%)?|%2c}Q~
zE4a8rT25(|J%>>K;>dBHbLYLh=g2Xxz3MW~-@FNc`p6W&KD3In;sQnQIq_xYMnIhl
z-8-L=VVLNI(s5N3=ZIy<N5ophXF*p;ih8)Stz@xT$^lL`0T2R~;4@tmiDpm611!dl
z4A`|W)w;B>s`A)wz&e&~sPN#8-)4FL5JrYjDdM99#iK+hiZv01q!ipsTBnr1NGVI(
zM7EHVMDrn1wh+QdIt_6RqJaJxYuUW@8YY`cp;+Sd%{4~HN0~T$8}rlq7+7&W)!r>Q
z=|waj3nQT)uP&60p-2uB!bA<k35sC70UI&eaeU$UIDhld1pCsA=WjcW3)U}Zer$wJ
za~=fNR!a;=iZcp1v&ZC2Akn}943sEv#2jrji3DnKKA%v)y8tvfRlH;vZ`k9N4`v=p
zg`5at7R5p*)euVCo~+}>a$!iyNlXwkj}lEXV0(S0^SCiUMA(1-7)M9;anC)UCT;D*
z%0ig@MHZ~wgaj~20>Q+&Y!QheijyTenEF8Z3LJeUHs!!DmI5jPh4b-pinWW0d#|D{
z8!46hIBUykXgbA_U0>wbgC8TCxd(h5XOdi59H1zdhk!%`#f4ZvkgJWW^0C=EFTQUN
zzqacrz3W!+dvCmkTGryM`w#J3rpSgU0fmBq#Deu1Ml-BBL{rpdc(3?Q3+=SQc~Y;;
zcO2EoGFXlR3)zPx(B;WyD>Hl}&A9HKUCeeBLVGzj*yxA#fRA^y8yTuB8o)_;0P_fo
zzi0rr&5Sos3VE8FXc0#-&dqY`_dmkq=*>iaHXn)<z#$d8L=6wII5a@Aw3)}S0QO)E
znM-lLjo5NNVl7+Z%*SL{96su%(0d78t6#xnXF0t+%h<B{RMO5QBm2L|_`Xjf?HyQM
z01YMLBD*cIG3pC=4~@3t3ylUZ-m!-_-TeS&pojnZhHF?|E>QUPcK)*5%hk(j6h)bD
zhE`A)xq`?GPCXh4qCqDi#v_r1q=X@6AqzM})fjrQm^7CqblUh#*%!e(r)PQHZ4YpC
zq0Q7plVUL;N-QQaCtn5%9NRNPt_^H)k|X3Etqjb7R(-lvH%2PnKei!tSBE(Jw5vIA
z@cR_n2N*qkCx;L1V8f{wQSIJFrd_D9AcedNa7*0!I4Xy-(1v&VICVix>Ov7>j4p{d
zLgQw!^dsjD_E8<W0@w8{rl)SFt9yaSw3(bbz`^ZD=<VM`@8E?b#lpi-aAas`#;t9~
zUmrTm*C!`fw|s~{yyhZCMy6<e=YD>-r<<+I2QXx$>giyZ&ppW6Vj+La2YHeyp#j!v
zhBh*B2stQ|&e6ym<=7xr$wI$~>7>AC=H_|ly@!~>Vv7;imb>V!6u3(uicC%iKS|_A
zm5GD%<bxtk`h}E_Rs}eqH9OussOZ+mH9jji?PlxNS8(*ucbOc&k67y5ch8quyMB!2
z%g@5vVY<qFc?d{zO@IddoETg#DVH!(Gt3#x->Bzu8rH)jf&y%7@i;WR`mI=_d-)4V
z8~d3YxrM&|5<W|*&+f%$BSeKN*0-n?i`>*|^6A-0K6_|_T5lJxzUm?d<06Oe*uiV7
zC9WJA#D}!(f46t$!E#<_ng5-0zOB1&FL#q<Etcd3FN$L)wnGvRLm**NGebfcNWwN0
zTNO1^GYrGP6va#x!vMvw4`En_5E3W|OUPn^laLHfz>X7dLYAd#?fczy*S@!JFW+~T
z`Qx0vx1~t3WXHy)bgH`4rM}Yb?(?4ayvy@EFR_p$U58F33q79&jARMY*+626pa?=%
zN#^kp)_9p3DLAhj9c$ScC6sdLMv?=j;1`da<L{T(7#kVk0c-eyMu~42uJPZ`p2dkQ
zFpI7-{||n9=H!az!il6WxDH@|?#e><P|>w}R4lLfUb5jH3-iawhVEs{?r&gh>s>sv
z?_-qGIaU`AF*kjfuet3_l(J4pk+lB;`{_#{M>=P5gZy_XFvgKYap2Pju!r#FU!QV;
z?fPDTacxxP7Pj4bGe!FtlP5pNNF$-!UZE)F*tU6$p3eEhbJJ+x-QRFOZ@6)khaWw_
z-KCiC*fLIRW3=>apUi{+GLm$yqZJxK)jsARR6K>&NEPAo9OFR7iJxU*E$4L`V=c8f
zVpc``@$x+HKQWCcm$-GT#v5IapW3#Sk+P*Tx5#2w2SUuXHGsM;jkE3;8zbxW3%vsR
z9v}zyo_lWT+jiYOa>Za!M$qfE5LV%Yf_M{m-}imY%^c+T;lJUAkuqmbK1!Na*gRZk
zt=;rFKOTr-oWKewOouqCAPi_%fb<5Th4P=oIo4bF%1ggmV~|nF&jBLGk)wq|ly|dz
z&-YQZPNHY`5z9r6oIXlXXx{Xin|Rj)cXRMd6I9Ne=l91)sEQcr0BMOrO6np3g#o2#
zTSqrQ!W&NEjPu<<DUnf%$qQ`WLS<FoGIoAvW><X;U^dJ6Pm{Ae+ig=HA7;~Po1Yu0
zb6*@GA_=)>YITmaxY94CUW9|b@>*N!0X%_M4(%6%c%fN<4Uyy*&Q2^|@l6OI$r7wB
zyv~ht2<tFLF}&%u-1~+f#w5Gw77#^(o;EBuPayI$#3n*GpBi~(tO$ug1%AH`2%x^Y
zNWbx8g~u9L<4dSAl$e!DkTUWqqm(#Ovhp2l-u16>rJK=(ze>8xE$WXQ;^)#D-@UCy
zP0BEVB;@Y`j{&frvhAFsWj(P2psIXBM+It`brvZlDjxHsPkLB7G&8}0w!a?coMCOG
z%&2qxNRsfe-8;Ci6k}3>lLA>-R&>EaB-WL}ueJ&(q+t4Z)8IuTn*$!;1+#-~@Bqur
z`Oc{;rGN-QR*5N!4%YNAx`)wSkK%C&PTj!vTi?Zvw|zScO+&d-p|!fq(L)c>YdsEb
z#!I{l0Wu>uIy6V5XWWE3ecuTCWE0OEa-pJ!Pp^u?=idP|s-*Axb=5GH(R(PB>HvIi
zT;_*r4Yo={(Q5j7e4vUu=Wts0hZA|8fEBb6<RKUyO(O3hjKgY+Fvi#T>0yLMYDZg?
z_^Y1gQ&TgH57)W-hEev+F7cN)Y~crns|+cN(3&*&bpz)dGg`1FJ<xPR66Wdxz|;HZ
z+jt52Rye$l7fBD-z*@VRf3(-WvNuUeio9qO#|cT25k)Bq8Hye`21#Y;4sO2n?JPA{
zQBtz7G|BSP<D5M7QS#P45*CT1CW=ZRA}=i?RcIiIFf>x)tXbdObs2gg5JIAaLJ7HE
zG!X)%%#p&P26z&$%Tlc9VdIpN9P!vez;=5c3NB-?5w`G15NBb{dQ6}KDk=gr#`^!;
z7~c$&E~l^&PrDL7diFg3;i>0n7Mj)88sn4a`QPK?>~u+}&<K=`Fe35+V_q<)1-g`M
z-~i;+x&M{94(-+AbO-=fg8`TqdIek%2m+5EePZ^?|4Hm9^0wCt5}~3ed~U3SAjTjC
zWJAMX9ZE&qxa|&#TrpM`?BDxw&K-S-sC$mou6gpPP(E*WesiUiSZlD(!^n%ghcRB5
z$~Vlyi3x%e&N*~ZfKx=qqKw4`tzeudY)Y#soW}Ng{_2WUP$Aujom{{muI8bL1e9f9
z@fvX2Uqc$pLX`5Ml{W9#x1UF?=G||)hu3TwK{~;kHw|MWO`$Z224yw6SV6kNi)UNM
zoV64<R3t(X=;|VXvlB}Ip9==i3K;-jEdw}w<cZmiweEt6UxWRCtdt_8MH@?D4TbaM
zPAhV(ke-_DG=hX8kVCg@|0c$E{7V*ACA)X+peUwzX72}Cnt2pqn+Rb&-mFi!6n&AY
zo;Rwf<o}GbfDH@^9V&=A7loe!W+IG$oSa;DP(W1nIuXL=NQ-ClgwG;uAg-cO(jr^|
z!mt_;#fg+uEMO9ZiqO(xgyYG=@ZLkG_~}#UxaZ#6*^))PZE=A&)rV;7f|3>}6M$#R
zi)qNL>H}HlN7|oq4iU=@J)o<=0tyM!$C^#NSmYAds2D1rC%Y_wRh`@SuP$^iTaS)2
z1+t*fo$xJscB}{ym375>UjQMo*3okyOE+=z?ca|Tw}Ob-y0ymX(_i4!bAN_ed6L8~
zdepB>kTUjT;jCSszTF?kV#77yLYgRq@`ERY@R<Y~r`kgagXDa#>kB!(0=w3O99+8x
zh4KA-6X@;EGTZguBbL&af~}yil4+&*<+)|P^Vw6(j}LRtox2%2J;nQ~72cB!LBIke
z&Vms{LVz~myXk++1=cxMgu+OWQGkO9o@W}VqqW#$acZqE7dtph=&ND?I#|?4PVAe@
zFYAw__5qOTBBY-NqIKbMd;uklh(IM_(+sZHL<x;{iqRc!Ve2j5Nmp-W_pY5d=6QDi
zgUnBTo>-qpnVygAg<Kbbasv$#-}m=bqYWmFz}Vc!k%TsLfQAVIk3a;DfOE(w4joAs
z#sYYfr=K|DXax_@kdj0QR#VFpd57;kaGGDAUF3Cd*u#j?eA|4JKism3dt5{=B<I(<
z2%w@YP6c78z95y+zAG4)$a_7egrIPG01PUw82C8{2R=Uu@Fl!D*vi#b0I$UWy1?Sm
z$IqYDJ#)!xKt_VJB3bJ$)9tm9QW3=o#u|)q7^B13w}?3LdV}q5GqlEy*V>J?vHhlR
zMV0Qyxgl=5WfxPEPjdR`N3g3;F+Mzuk}{-*L5~ozagqRCbT9A_DoQ;%No}B{JTk!(
zSj74%8$c4pfrn^(IxEA!DnbUZqf}-tF7Zn<^L)#}qh!0c@{M=iOzrRqK3J~s1NADA
z^yzR%3XZkAlm%=R7AFcnSEvsdkuuQA99>=D;s_<>03Yyq5LpgpPBzcrCy6awOa6Z~
z2GBQxUa+j6Ke2cIGFB-_Du&gSSz<Yaurb!=bbC!du{#_)hv)wX=n}?8XdG5|Q4~0#
z$cFZ?`}Xgloo}I1E>X&I&Yancb(&I^0UfN>Xpy6>=hZtKfmNs|1H6EQF~z#LxJ3n3
zE>J>HLSUtbVOs~<<n%emy4Av(F4kF0o}*okEgU+;)Cck|-!^fGk7~=mdf<M#^Gm#a
zX_?=<VH?|pBry`v(^z34Z?jV5q)JkjAT&s)aqU$fbZUb$j&^T_gWV=AsgSV<0qzzN
z>1^OD-~Y}z&K_K(*ESF16+)MQ4%eu-ytlLf02aJSL_t&)d^N2G6Rv@M$M?;h<Pv;A
zA>f8v8Z6D9px2qg6bs-WjyL&9V9sHzcYSGA9q0#mDK(iSf#Iuh0*t7zY5QB*y5n86
zdKsH<7^g8(Wo2!RxtYVLVu{E|FH9{u6m|h4{M<cjweO<A`kX=Ggje_oaIm2;MouM}
zhlF{_GT$gFmr*3xK3q)0`848i$M*qrqIkpC-o@>k8Vnsf!5=gld|#=AaBZyZ;B1bP
z5@QW*;W(ccC;^cGVFbcTj7-qhhVG=J)XO=SJC;gnT@&ca9>8IZ<Ec-b>fr}QoDYXI
z=NjeWuf_w|a1AW2&UgRBdw~m$KnNJUu}pbWlY<8yq|;jT4H2OOS6i;n(duIYwC;tJ
zP6RD}iKSoa6%?+5tncCGJ>Sh*XDc(a-l!(e9cJ$AXAtcJ#BPBIMHUSQK0=NVl3uqR
zM$^QBzi-!vS4Bd2)p_f1xked>R55{83_wl~oJACh!!G4l7MnaWzW~6!x9y^LcAD>4
zUgbB&8|)MX!W2Y3LsS$vy@s?sgm5&ahlEvyplSol*f=OOBJUxKF6bU#Ud#DClcLJ8
z=L0;iAcSD<^eU!sAHk20n`2{y+*j2A24jI0;1h=)o1XV~th=BZD5c}JH;>cUwanhV
zAL87}hr#xOXp;0DJtxW1ApqK)MPKp^#7OIGAmIp{h(I|Cy-KI3ux0x@5n{x{%$+6g
zp61ZRUvTod4<kBfiL@cHf+)@qLiuYZG?xgpEp5WQAbf4Ygi0b-dkB|v9ysD0%1Sy`
z@yA8Zzc_T52iMv@)de1ZdV(K|Qog-1L~I0Dg|!ML6QoL!X$sm0XlL^rV;#e>By|#p
z!O4O+l1OWrw~pUBzruT$+8iHNn8*>QiYS&|Px%tma2KkEkALE18+axd!16%#kC(y#
z`Za;Y)>7{mPVZm*3J)M7L7XYJ++1hZ-F0SX_i}XNqjc70kwPJbmqnM#2U)$m6{2$A
z&NT>B6eCpR(XzTAwPlnL<g#F>x&@^qV<TH>)VK4Ruep^*MYHc8KEUksU!m-Ir1gd=
z`k24|I2Q+2=stHY2s!lU7W#Iy4F=N%p0JMho;%BbId_&f-M@$X#;d%3q>cl2WeGP4
zykfZV0AwkwC%agOE3C&k8o`Wq7+@@pNrXZRN8tq83MP!?ho+bKnO++`nvhgtO4WpH
zC?-zTWv>7s1jnD6qu0?70+Yf0w|Ie5#jg@>uwD~r0$+IYp_AuzZZCLKQVQZ!QLZJ7
z?#S5r`U-7xn8W)&%;NcjK`|4eI9VrX3LOJpEn7(G(KXi7wxv`!6|QC{$(<#ViYRMP
z+xkx0+=ipXowx3wwY;B+Xa9iq;^Rbad0ouGxxN;lz}i3yb6}lBYM+0b{>O80UP^wc
z+2mV}oM39C&I5Pfjy*ZWf0hwnn|VCrW+_OOK<F@<Mp#ce5dv*`C@0WTAY_lFpeQz`
z5|54Q^^n%_!R0mHF?pUxQ%71)Dc2H)hEs+{QcBf?IP(T@sld+~$Hb#k)1mV>82}(X
zUf|fcYcT*5qRe?``JuyKp0Th|9Td_>uW31AXe6bvIb-K*8&tP-Idb?<nLhDJl+7un
z!#)VKU62Ka2x~l^P7>6^jP)m2NmK~Zl#mqKfJ^A+W61jb4DEa;(@P1%jWKp?sdDQ0
zCpmTK6S&qH64M1yV6d3JwjdBoLFx=vIC@!zvI#vbf2#|=`NT<nb76_Myz%vnrZIa?
zPVq;>quh(7TlgTbCIt!|id((FdoX^CO_qAqGw0=A_pf?k$X&`IY>%T-@*iiG_{p_Z
z+9NULYD}e(P#eprZz@q8%_vo4qC{Sz4&V*>$-h2DcTGPCoDI?ciy9{%UBl1X;00EI
zlM|0jKe7F`kvBHBlm@&2h(sc!XSS$F62+3rNW{#szo&Izk}aEe`ammR166=7g&fi2
z^o4X7JY`!1ktQJok@8=z6&e@kXe3f>W6MqNh5QVskAH?8TgH*H$+LTZmt8yWXVaDk
zAli%(VqIveEF_VVL|P-P;Beyjjq^=DJT=RnJ8t6ZN2;`+JIb$Y-o$IhYDiJw3Kh5w
zur*6aoC%}y!1mg{o{^-!ix|quT`O4%NTw`J__To^o1SN-qR46qX(^&qO(-`Kh8iiQ
zT0&Zm{N^ipiF8}gZswdhu<!)1kBtc-FKUW-bd5jX_W}#RPdxqUlYjlTAH1_}joYZe
zNl>vM5uV+mVo97T(o#foa-Qc79bYfn!~qn75J+NA^>P*^6jt;Re1QTUiZy~jC~-dE
zwQ>kix|JLEY@@q)fccq6xqbIm7FUjP@YxgW+Vv*NBX`lXUa5OawS<TzO_A`ic9Wkz
zaspQy;_Y8|FK17k<87TD-?eF!Mwkv}g(OcDdGK`G;}l^+YubT`O1=jXyr8uO4o6eK
zp&$+WI}59nbdS|~Op+<Gp_p<lq0&gG)Kjvdn53jGD+uMBpK|{HJ~&~V<CFN2v4eNN
zd$|mtpAoDAGYgaLUwii9$)DNt^;-w(^C5WYvs)uclt|)C5obBo(GsU8&eK|6Wo~vK
z)#3XAiFRF-NJFgPG5kU(qzpn!uHT*W3Sb^qtvz!FiK9Yk_>ENScQQBmMT|Q@nzT7_
z;&0fI&yfg0q!b-(_%acHGCR%3=a=~B_uL6+^x+fy`f#0lr9w!HMfqv-&LV8VN<agZ
zt@U#ageQau>s!>u^^hXQ*&IvES(~vU9Gk|5P?eaq$WY2+O4XQhJ*Cn}D2G$O9`wme
zZ@!R%LtmVt+tMGv&j_3hk$=vM93QV<z`t<=^?|ARbFJ;WUpszVoT-hpZ~&>YeibB=
zC{~ErQf@?KWyR#_XKAlYGgKKTQgu)T-J*k(8A{1@QAQkeTc=o<KSFtEg!=gFa6+I|
z(ofxk*n`E$GL?~=sW*18ytG6jy7W3TSlwj2QDa#b{Q2YzlS#x|A9yW`XQz2<yWoFp
z-o(wOAPUpJr6Ht{0v#znxU$NLR)_Byt#Oyia4z>CkT9I0C|cM!#%g#*3w}E<DD4>G
zyj?@4f>PB7deyNKwULZUBOQqN<s~=2|9#G%UFGoyPdx{G0zVXDk{3BN`h|Lc!K<Jh
z0>WSX%=-^~<2!!j?n<1h3(-O$%v1w%Co1-FL7YaE>nTe!CwTTBj&aA=d>7^6-5>>4
z6j;rAKJU>s;TIbdbOnPni!CtD5=E&W9WM;VNuu~BZoGXrHb2U#BM;JQ&eLkQ$qUU}
zU%$tfT%S73|J^*yElv`5I#`=yRgB9uGD`gKwH7B7ONB-W7>bnt_yTmVgGwWu704)K
z%{qQ{wZkWj!`5S#mscnaCH~ac63X?2Qgz_eM^|q8IOnk1@x_lEn+HCK9}G1$(DZpx
zoBu*Rz+i>Y0LB{kSaWvm-8=6ZmA*48E--}twID*7GfI415T}Z4C?P33P9A%LR`V?5
z<98utDM-9|C2nwZTBli@J4{+?(Ae|_-x<Uqq(aKbKer0yM9@bGc>Sc#=%zg+afR8L
z3BVEedi+<B^5fNE#$rpPGzjZeM`etX%4_!Ev4Mq@e4yE4p_}uAn;Yzs0w*O(MqW)s
zL_AZ#kIpai#VlgAWa%j#PJKpg%t!c@dO}w5r+!2J_0pSfokdB-!+&(htuFN57fQaz
zL)EW)wTPduRvLJ@te_Vn(L>Y6SATZ@!;|ZxNtbeEQVOC(k(MJW^_1FJiN@v<n|9T>
z`QA}%G{v(|{U&RR``3p#xiDF?->k7l2UeL2)myVp(m-l2N^O+C8k|NJ1=`i958qC;
z>{HNxlP0{Qs!&NmoJ-%0G?F+Sf_5hWw&eQf(9V)uix5!5VTD~Myyimkd#yFTf4Rx=
z;f$p?M`VIZBc(R(KVNMuqtZx7hhpN?Q@)<><O>8(fBF;)=hi+HHveSU{LWWv^Iyyr
zFlYpw@WwuV=&_lbhlaC%d(-R2)`P;Y0FmN?^?T^kx;ID^m1>3aCs#Q%@keai@@6*g
z{3dLahW2tc5CrzM`}(**>*ojrZ{d`06ANn*DnUAlMUop2(Qd>F={iUkdlYZ4gDjOj
zzCVs}g$}?Kfii|p64Nohg<NwIXDu4Rq;~x3a*NL^ORu5mikwm<p<IipG*T)JU*t*3
zkuUGAPyV=amk$Bw4lZ--sku)AkA{;!^I~)Um&yQiNJnOX-+1bwQ%R{Bz2}Bo8shRs
z5MqNc4^Ju|D5|(%Ok`9?Z{)<YPcXmt2zS2b2a)AbVp$2`U+u-GToS+`E+Bz646NUJ
zHn>nvu<J7JeJHyOH>eN-k)(lWB0QQ|YftS8sb||dTDc}u5XAy=#oy+dpO{;Ku@XyY
z;#g4`^7nkDk$QJO6q97p^WOCr<Lu8(Eb*m}pV$jLG!XQyaE((zU+OF1;sViX2vC0g
zkv}{3H!~-i9>seZic3E>xZql7B-F<;Dr2zw?ok@sH2e1c8Vi$OAd9pYd@@}eeKe25
z=uRMn1cAyxI_+m6LVBG)ZHf(-t_8|O2rE35yWa^k*3-PK^D~33!C~kKXd6u`CA}!-
zf40{6$<7*UV=2o@QyPjH8u8V<#-=j$u@aSfN?MLkvAn9y?>BiS4=wYhkDWLGd;mBC
zoOv<Lo|oDKTpSNHLy7Wd{{F*9tN-jhw>+@z_6Gez(d7-n*A3$Sn6!{KCM89=7Bh3=
zZ#i=+G;yp(h7zv;RGNYHQ_F-<erT19{L~Itc;RUTR#;3x1*g(8kv#Z7ug@w#TQA<^
z`qHfqBcUxrJJdM-+rkP5m7$qhWGpCG(yuJ)WXf;+RjPdVbN#8q%RKg%$0vZ_#gBzQ
z9cum8g!6kjvViBi5_-VnXAUmj)EF=Au8w8T`$hDHk^9#{6f0jlNCmZ#GExd!%{Iab
z#&5U}Ase2Rqg(iif4-*>M@dlbv?vv1X#`L#Gkfk!IOq80;TrcPUZ%~8J`E+n!|<9x
zM)-EI0UpzqziO^BJTk;oVrWN(q!dx9Csao=YGWDI5nsnoN>R}GyLy#xfSIE!Jo*>M
zCV<}xn|~?*J+B$%^N(o&7aPHoXD5~v@VfDx)vqWNUCtZG&{&Eh<$3bT5tjt@(IFIN
zRu(47hPD#NRfLO?BEy*#KZr>xKfFqL_E2B(QWlF$pL+u5EbnU6xTho$g+NH-<?Sq(
z!k{~CWD-$ekU}w0Xnw~SDqBZbri)A^rJ7Igs-qdT(F=<@Dw0<%@!lu9Ogu8hQxBc~
zJn#p=;jsA&FZJfXR0eRd5j;0{rnT5w=zZPxJBHW0T37Z2VqGIg#gZsd0VxAX#nJ0D
znL7S7)l!2r-9&B{NuvgZE)bFDBst+QMF%Mpf3k~ZW+orUTFbkKYuuGYD69N8U=4-o
zVs$~1mB~ecw33f?3_rZI#AF7Grb9O5<CMWuU#=x2rRV~ef3=&BfX6<1oMTVT{Uz|x
z0k{9MZ2ng>2DluItY0kpvojNmv#q7>&%gQGZ>f~(aR_*?YzTfV-$qYCC6YKTP%$9d
z96s=ejEwGK%dU6e5{r-q<-8J?aE>S{`M$dKO(!>~eHmsF8slF#I;Rv@(S=|}D1M>2
z!l#9yHyjhEP#FsMd`RumN=%%o3lO~5vhm%P=8-==(p^5^c|Y*wP~)Ep0bl2(y7ONy
z4=`v5MKFe$POJFLktb*0vUyj%UaqCA%RPw88v%liGIA8WK_W@35#?&i^4tuIGy6%S
zh*D+yy0m<ew?hLlXcHET%uGIsbB=GVRe5dd2T~ve(n>_6uukyTMVB96S>;P9m?4jE
zDAyB)!l@q`&L~wAl9F1#>#sJ-@2}aDt9<VFC+50q`e%W?1F2qr^WDp_`7gBrTwF5l
zh7b4IQ_sw=t;}`4cKhv(=RG-trR4SQVl0UwNt8;;!wHFsICK1I)|QS^uWUi83M$R~
z6i*do=!$91Pw&H6%XbXdxFe1I>&{}GV}XMIv$Dp|b~?<}Bq~#shCE=SI+}%QUg}T&
zHQ)99CxS2j#c>Y&-Q+{S?*Px?Dc#d-kUC$s&3`!z;8HO`2RO1a-+lVzzWLW@)uh(g
zT-vDeJ&!l&Pt*2=qoAXc7;3|1@=lA>$G?oDM``FrqDUfLgs=*F=a`<{i*=6ojE-^#
z4po4`vQHcS-TX42iXEn^NV14>EulK%yLZ*mjB-68Eyve<*ZY2j;OxOA{_anY%r4Kg
z-v@klAjhBM8Z>=gtp>n=C&<GGKCg58*~vpoEX}m{)Hjt>=Et92))3acf#d?jQIz-q
zF|G)bGAv9VWqI}hSymz`k0L~Z$!D3Lc^2yo-#uRARy4*+-nY8UPp_?Ux+0NfMON`;
z-0EmXb+i=HyTs@A(bX4q`Ucya>+<A-r;0<5&3xA6_P6m!-s5bLIj>sG;ni*cmx>G4
zfc>ir-A^5VdhX^<tJpexLq$YMfJ9x!629U}NcypXKfRSkO3`gGeR?1H+BxctO$gUy
zVRnK-Yu+<jr|twlx6<N$x<g)ziAxcss;}r($1-Z8C7<3^qV?g8S5wFDzusLfc;<6w
z%~KDZKG<67{V(9*aM$-w{c1Q2hJVB*{t<s~e>`0or~#XR?Z8iMyKUsY`@eZ7Nl9Hr
z`P7p)bzv#GhF-g%vs%zz$!Rxp=FhdzYh{usV`1SO&N+VKrtN%jrOBbh5@#N+mWBI%
zJ<5L`q|U{6eE;RVqj~C~)0{iJG=bwoA*Y|hL%5cM(dREmiuX!3fWcmb#Op4UfI2V+
z+$N=X_vntHcii#j8`yGd?Lzf?aS21P9x~lGgl?-~Z6&9(lC!$lW$yGU-8GGHf<_~Q
zvLHznY2_k(-c?rf{HD8g&EeS-t4usH#oW2p=bdp6hl0*bIPFUV8?RsPK<|}o0R8t6
zrcMz975oVF5nvp6cWpd-+xFXrckH-xg!<+Z>jS<nvWETuN~;}3&yaUC-In(VomNhJ
zrNDMA+F4X2NK0|(-X$Bk{pFB4ZeWONxC&P0I!qo};?y$>b1U=R$AM3VlYTxFbCyHA
z(|e_D{42=-F7^n0L&$(3{5bRxU@P$NtE1`Nx4m&od3<M0ma6fFo^C(Vbk=JMS%)dC
zH-z93I<11dU0}4=;>{{P+VAJ}Dh@86J_z|D<I;}KYQg;Esyp`NTxW4=?Ktq~!OhQw
zP4COJv<F<heWh*uE7brlz8c~IuTTkBg!c@Bw@bl0$F^4+JMSK4>n#nEl3Ev5TE7-7
z7;VwPBNRP@H4do+Nhu=9BG1H$Hnfe_PrP&VI-0pNEl%%WVCF=#WsQ3Tug5bNI(5t8
zu^QZbmkp(E_e$OPSGoZVUJZlSLmE6oC3uG_uo>75+>(}~*QKTC*0d7Whi|A*9Zji@
zrj%=`r;H1S(SDARr)FE6f!<m{d&LKit)(8V#V&cr%;jBuw%67Zp+0|>4I1|9z=n6&
z5N94d?XT#Ke>E7um5d<@fnz^-EQM^M6pSMSc7&{A92gF-Cj+0^45Xv0cr3$Q2;BN&
zi~UDCJO=-+AJCas%V~c#8^D!}VK8nOd?W+UqXENNmkAmuPPu{2EW-1A;CV6ddY^@B
z2MS!T+9i1Pufefe@}h?tFqFZc8yt)5E^^yu;P31uUU&QxT7rLCOI+h~cbVtU_uBP!
yeO+JI*Y$OMU0>JN^>uw+U)R_5b$z`W*Z&85%D?|c4+@<C0000<MNUMnLSTYPG(trH

literal 0
HcmV?d00001


From d05919aa656e87f77f9440b6e5badb3c50bb3a10 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 10:37:58 +0100
Subject: [PATCH 226/547] [IMP] better badge

bzr revid: mat@openerp.com-20130329093758-0emg24d2anejynvk
---
 addons/gamification/badge_data.xml | 435 ++++++++++++++---------------
 1 file changed, 212 insertions(+), 223 deletions(-)

diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index 5b9142fdc1e..d04dca39a56 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -6,227 +6,217 @@
             <field name="description">You did great at your job.</field>
             <field name="rule_auth">everyone</field>
             <field name="rule_automatic">manual</field>
-            <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-                                WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMNCwcLA3in8gAAIABJREFUeNrtnXm8XVV96L+/vfeZ
-                                7pR5DoQkhLGEUSAgyOhQEVAUFYc+XhUpH621llZbW7WDrX1IbZ8TreLEq6htQYsUEyCAzIEQBpkh
-                                gYTkZrj35o5n2nv93h9r7eGcexISknsT5a7P53z22fvss4f1m8cFzeNUtz2P7/F2ypzHTbyN05kY
-                                v5VDWh59B9eiXOr21J23BbiekOu4hVXJuTOArRMT+duBAMuAdiZTpA9BUXeOgNsT948yET8g4mcU
-                                uIefMzAxlbs5zsQDSnRQoo8ZdHIQPrOIOIAcRSCgwr+ynBfGlwOcx8eAbzmgIwKqDWdbRDAoHuL2
-                                1mF4BI/7UFZzE/cC5dctcI9jFgcyiyqLKDKLCtPJcQB15hIwH6ULYSqGLgQ/nuvMSElvO3l+RX08
-                                EeB24AwE8T0oliCKIKxDGCbgj7lBvKfJHoAHGADuQ3kQw8sEPE03zzKXbnqocvfYvdReGf8LYS0B
-                                Qo7JBGxkKu3Mo4tpVJlFwBygk4iF5JhPxAEIc/Hdu+sOZruRk8bg1gQWkpljRYi4iP/hv8YPAc5H
-                                Mfbm+SIEgT3J8y03MJFFhHodorq7gpd5YWn6FiNH9uWUCh79KL149BPSD2wmYDshA0Rsp0Q/QkRE
-                                nYgyhjKGCh5VlBCfMLmD5UgeBh+PHCF5AgpAEZ8iPgU8hIiAGl0Infh0IJQI6USZis8kPAoY2lE6
-                                8WjH0AYU8RqevZlS7S9Zcmjkla2BboAQqAERUICOTpjUBZt6HP0oEHIpt/C9sUKAoEn5OxeTPqrn
-                                NZ6sahEiyEF7O3hiEaFWs58wAkwG2Dgx0TxRQhGlCMxyogQHRItMnpuc7PDdJzv12oTKgTuWbzov
-                                bLoOmf96mT3TgKjps2uiEUnmfllA22c3yRsSfzwFL0Amt8PkSTCtS5jUKUzpgimTYdo0YeokKObA
-                                qJ3Hz1wdYaLkTmOqXzUigMfphOlriuzkn2ofOJ+3n8BxiChyIsOKDQlDqEdIWHOTE0+6JBMpDQDJ
-                                8qWYomQH1oqMfia8FsdklHRt/k1G/ceyX4jcVhF88ArQVoSOEtJegELJ7re1QUe70NkutBWEthL2
-                                0walgp3MKLRzoygigifg+xboUWgfJqwr9VoGUUu8Mn4IEHKqY+fq+cjuXEjVzpvvW2Qo+SQv6Ql4
-                                voV+PYQodNsYWUKHMG4bZWWo7uQ59FWOtfrdh8CDXACFHORzFoFLeSjmhHzB7rcVoFiEUpvQ0WaB
-                                nM+l7xrjrniO2D3H3MQe9zxLEGGoDIWC5wDqe/afnrTG5mroOJbvDm1m03hygCNjmS2efVGR165e
-                                qKMwo4CxZJwLIB9Am6d4YifKUoLie3aiPGmyPuKHctdLOKykn/g68f89h4i+J3Yb7/vpf5JnTKhe
-                                EQeZ5HoOkJGBSjUVi368FYf4jgC8eMJk566WHY2hYY1FiRVB9/Ly+CDAW5mCMgOxsqxZ/u917VNS
-                                bdEoiBGMsROZTLDjHgL4vkUgzx333bx6vvu9CTCW49iTwsgiUxhaBGi+fnq9lDLj4zvkJGM0tm13
-                                UBEnesZ4eBn2Py9RX2TsEWBsXZm7T3n7y+jtU8v+Lbd7cvwQoMQxGbm7B6x/Yrx2rggDfRnLxPDU
-                                +CGA4YhY3Iqflb8TY7yG70N3r6b2iTe2buBGBFAOi288Qf37YiilAqzvzlg+wvPjhwAeR8eCU7wJ
-                                cOwbbUYZ2Z4xfod5bvwQQFj0m60+/YbTv0J3T+IksyZSOy+ONTBiBGhPjOtW3rSJMS5jc7dCMdmt
-                                EdE71iaoBfWFHO6id4mjZWKMvw7Q3aOpBSD0cTND4yMC6hw1AYB9bQEIm3syAlnZMh73tQjgM6tl
-                                MGZijNvI52DTVmcCWlg8MX4IEHFQJrA5Af99MIwqff0J9YOMvRMoqwTOiy3P/dsH8No0ItmV8PYe
-                                3mNPR7kMI1Xi8DdErB2P+wYO5w5KYuOybwDbEPRPInyK50kSmJEkpyT1VJrIhV1tIguRjd2nIdtM
-                                cC6OGsYZTr5vE1xyLtmkUABjQETHeSKUShXqFSCf5Ew8PH4I4DE5zniJJ3c8OIHvK7lAqNWEyrBS
-                                d3mHUd2lnEU2nh6GoMagagFk3FbdJ8kO0l0gYG2x4wE5mNoF553njT8ViNDbb3CJJzYM/PPxEQEB
-                                4KF0ZNyPY/++njI8CD2bYXhAU9/DzjiQ7OBYc5qY7CJXl9H/6R2ENY8oxx0v480A2bxVIeeeJRq/
-                                NPuAd1KiTilJAx/zl1WGB2D9Cw79fHacstUK8DGVR00fk9maJuA2p11nEzxzwLTMT/5OEGkMMWBb
-                                D+A7WQiPjB8CDNFOnkKse451HEA8YWBAU8o1QN0CwgMCgUIbzJkK06fBtA6Y7rJlS3noKkJXG3R2
-                                QlsH5NuhVLQpW6WiTeMqFCCXS/NIvRZEH9/23ofgvX8IlOyBhQtG53+Ohw9gyzaNXcCKN54I0E7J
-                                Zc2OzxuL2nRyB4mjD4EvfRymT4XJ02Bq0XpD44zpmvtucKllzRlXMddqOh6n1jVwlQwGKFASuOYH
-                                QJs93N4BM2dBtTq+IqBUgHWbSMtBdOyjgCkCDDCF9pRhjrXyJyLUqklWJccfCkceRZL9NAgMxEpo
-                                E8A9gVEK+q48r7TYV9iyFW6/F5hkMezoo4VKRcY9GUYEhnrBaWLCyPgogBYBPGaPp/9PjdXqYyAs
-                                mQuhA7g02e3NTyR74SljC6co8OmvAZMdF/Fg0SJv3E1AVecBtLqQFcQFnstUV42xI6idqePn+7Ds
-                                Pyl6qMDSw52Nr2M7yZrxDRgDPQNw4x2peFiy2Jql420CKtDdrVBIDlXx6BkP4FsECJk8ni6wSjWj
-                                gQ/BiUc7JU32PtCbt8Y4/wFw7b9ntMMqnHC8Z51I4zwEpXtbQxSwl5sYGa/7e0RMT55Fxv51RwZT
-                                m3/x4Y1A2pvAjindaPpRp0jmFb76nRQBDjksThcffzdoEAibeuIHRzCsH9f7k6M9iT+N8Qz4vjKU
-                                cXG85SRb+PZala6sxzIL9AZkiL8rqFi37+evdoqfMxd+Z6mH6r7wgSu5nNC9NeO18MYnCpgigJCL
-                                zY+x1n6NQm3YOV+G4dRT4LW4npsBn6V8beIKsckX7w8PwfdvSql//jxo7xB0H7B/EMJQGRzKEJ/w
-                                zPgiQMhkVwU75trOYB+pu7MIxxyxa8DX5kYVsU+gGfjSeCw5L/YXCFzz/YyyU4OTTvYIQ8XfR2HQ
-                                chmGqxnvZDR+JiCODiaNvQqoeL4ysD0FxmEHwIzOHQO/WS9oZulqUopPPqZR4zcZ6jcKYRm+/oOU
-                                +hcfbL2G+yoDQkQpV8BUEg0AelkzvhzAo2s8WJ0xSnkkxfTzT4ehHbD/ZopvYPNZhMiy9wz1a5b1
-                                u/MLOfjDvwa6Ekpj6bFO9u+zHAhhW1+UKoAC3DfeSiB0JgqIjB0HqIxg5awPbIf3nd9aiduR7a47
-                                0vjj30wj4MmKBGDtS3DLnVifP7BwkY0bsC8roBS2bMuIRR1f4FsEUBcJHFNWBwO9KetdtBgWzITt
-                                TfJ6lwGeof4G5c9xguQ67tPWBn/+9w74CtThpBM9jKFFnf54MgClt5e4GFQxPLovEKCYdPsaK0XD
-                                FwbjqtcQPnghbG+m9izApdF0a6Dq7LkttPyYE2TP+cUKePgprLfNwHEnuJL0fZz/FgTCpm2a4rs3
-                                9tXArURAcUy5nCr9PaRx/zpccG6jEjeK0rOcwDSx+p1xguZj7ofPXEXiai0UYckhsm9Zv3vaUlF4
-                                ubEW8NnfOgTwfaG/L4Xa4Utg7gwYihopdxTrb6ZyabLtW3GCpmPt7fD7n4RK6MRPDZadJkRR3Ehi
-                                /H3/WQUwipRaP9CZRAHHhgMcy2wm8ybgcISXuJ3vchTwuHUE5ceOGmzDo9qI4wAGfu9t0B+BNLPq
-                                JsptSO+Lzb5XAXijX0C4daVyz5oM9bdBtaaMDAulkk0ayeVimQPGaOIRbO74Ngb6H5u2JAqg7TJW
-                                4qXXfMHTaMeni5AjyHEkwsEIy1BOGJURdRYlbucbqSdQxooYhMHtmvYRHIIPvxcG6hnbvYVCNwqg
-                                0igCWh1DbTKNuh/EU+57hGyUjWod7rsPG38O1GYP5aGjw/bo62oTSu1KZ7tQarfHiyWlWJBEL0ki
-                                mXENh0pisopk+uFlTNlkmz1uoHtzJgoolPlvNraEwRHM5kBmUGYBeeYTMgWPgwhZQMABwDQMUxFy
-                                FBJga6bBlmYTqlEugBgB0u56ex38fqD0bSXJy/vQhTAYphG5BqXPNMnxZsugWes3jW+mCRK446Hw
-                                h7+vrLwPNm7G9g6MexDm7T0rdajUoH8I6G7SKONGjq53oRSgo2R1iDgFrZizXCQIwAtA/LQhlS82
-                                xyBrZcQOKRPZ51/fbXUip7wKZ7GSs+nCMB2Yi0eQEGfcOi7KeA0D0ox6LwF1bNJbiqi7SgP3zi7M
-                                /HI2FuDttBXba9f+GNqeYDeMwCXvdvn7tLDZ2QEn0BZiQhzgHVlpFvAZDmKM8IsfKo88Bnc+CE8+
-                                CauexEagOhx3aGaP8UT6jj1nnmuwAoNVoH8HPL2VLN0RaY3OSi4gnNHUoJIGH01z51FIk0jqdo4R
-                                ZPJsWDwfZs9G5s0Tpk+BL12t1gy2zaf+J6sESotmxXvO/D3Yvo2E/S9cAIcdAsOVJirfgT2fde/m
-                                cmngRDWjwYvge7bYo1aHMJs06K4xXBaWHKwcusS2pOtoU7b1w9PPwHPr4JWNsHYjrN8IPf1gQpdL
-                                GGcZx5eMuYfQunx+d9LZW//e3HVUHLVK9v4B4AfItMkweybMnSHMmAHzZ8H8BcKBc2zORU8fvPCS
-                                srUXfrZCYx+I5SUj/CJu8x+MlZZTjytdnPL3v99lKYid2PfN5p4xUK7At38Ajz+rbNsOI2XL7vM5
-                                y4Ynd8KMqbBwPixeAIcvVpYcJPQNKPV6OqeR2nZxvf12Rg89RDnkYMuuCwWhmLcco39IGRiAkSEY
-                                qMDQEAwOwfYhZWgIyiMwXIZKBeo1+6nVoB5ZJKxHlstFkYtFaNqX0PfSJpX5wG5zOdt6N8hDsWC7
-                                ixbaoKMNJrULbe1CewnaS7YraUcHtJVsf8NqFSoVpdQm9PYqDz6qfPtHyroNsK3XxjnyORgYJNvT
-                                +SFWUU2x7h2uL6WCBLaZImRKqDKlVJD214v79LXquydA/1YYHHA3Hob190HfSCbNTVs7ctRhhlHo
-                                H4C3Xw6d7XYCq3X7DoUAprbZZ+ivwVDFTrq6XrvFPJxxIpx+Iiw71jZvrIVOT0h0BnHRQkkwUjPH
-                                G72LjXw8PjTKN+G0POtfci2G3T2zru0kcJVpVKk6WimOs5hGx0DU9k0UZdVjyn/fpry0wQJcBGqR
-                                fT4RiyRhlWwBzQDKOdxmF/0IxsIbLuJCv476P/F70DOyY0pHwUg8g3ZbLCif+KoFviosngF/ewGc
-                                sgjaXRZv8uShpewXe+CZbrhvLTywFq68FXIlWHa0cu6p8JbThYEh5wE0goo2AUhaRh/RFICJwirN
-                                rmtNrmMB6DUgdGyd7NB0ddfVTNFKo5lsr5EPbBXxzSsj7nzQttwt5KyOOC0Hv7sIzlgAh04TZpes
-                                uf3SAHxnteq1jzBCwADwl8D59s3Poxr7AvYKB/BgcBtp6LcGv/qJNbN0lM9fGicumXhlWy+855OW
-                                zS+YBg99EapDGWFp0kmSjBURdw31BEYi+H8PwDV3w5Pdlu1e/j7hHWdZORn3hEZbKKYtdJLRsQlt
-                                4FxZMzQWPaMSU15N2d3BNu47/L2fGu5/1JqvRi21v2UhfOYUYdkcqIdCZBQTx/YMqChtAXzuTu3/
-                                u7sZRpjJK7TzJDXhPMqxPry3RMDGF9MXO/0YuObLMFLOvrgDvMoo+z7+/tP/Ub57A5RrcNefwdI5
-                                GU6sGQ4gaQygufBDnMlV7BCe2ah88y742l1w0Cz4m08LBy+QhJpbKaTZfeIWvjo6WmkSLmFFiMnm
-                                I8Rb07hvjCbHkuOm6XyTvuK9q5Uf3qCUinZ/sAxXvAGuPEmY12V1JREZ7dLJcKtSSSl8XjfWrJH4
-                                16zgW8J5DLiQMOLKpfcEASpD0LfZPcEQ/Py7MGe+JAtgqGba7O8g+lcswEf+Qlm30cr65/4WqrXd
-                                Q4BEVkegzkMTeMpwCO+7Fu56EeZOs7pDMvHGVSCZxqQSo6NTz1rK7QzPlmbr0KW+7yz1MPubQHb1
-                                EHzHXashvPEAuP6d0BkIdeMAv6M08mReVFWFq+8xA5+7m2GUu7iN9wcY6klv2j2O+lnlL3b8HHsU
-                                LDnEdsA2ccBRZacyD6x2vPrXMGUSnHWYPe+1mCrZ+hJ1Hb8LItz8CeWqX8JP16TNpVv9V1vY8qKt
-                                K8xlJ42ld6svRatCWXf/yMD7j4Q/PEkoV4XQaNqd/FXdMiIi8PbDpO1zt+ogJY6JlcDq3vJtj/Rn
-                                6vdG4JMfhYFhaSnzkrCtaWKzCmuesuaQAsuWOO1fRvtVdsd9mdS+C1RGhE+eDp86vcG50gg808JJ
-                                pC2iVe67tAJaFqhG7UuYHUQi3f2MMVZJbQJ+bD6FEZSrssM4xY5yLO0llYWT8UvteOWQqZzJ9IC9
-                                tLqXFyd9uIc+4EA4dqmVTS3TuGgd2TMKT72gFAowMAKnH9z4QvFc+om3Ly0r00auuVNsiJtMtBQj
-                                2lqkZFYoavy91fdW11Yay71a/C9+n5a/08TSsrGFTDZMMSdxjEFrQ4pJVkcQJpXUO7AL/5nttFNj
-                                boBQ3huxgEoZothfHcIVlzjFT1oEeKTJ20f6g+fB+k2uT0IdFs2D2mAKBE/gzhdh5VPWFz9rCpww
-                                H45fYCcprDkiM7+9Hc+F5rW4lGJReHar8tMn4FcvGx7vRvtr1K69QMILlmibxs1fIpGjZ2numT7K
-                                FDkiQKjsqfwX35p+sbNhcgkufLvQu71Fxs6oxM2s/ayU8rCh254zb8poMdNfhQu+bnsFgJWLQxWI
-                                qnDofHjjwXDGEjhlISyaDeEwRBobZb/ZGNEQaQSKBeWBV+BHv1Z+9KSyZbOz5zTBk+1X3KTmnX8i
-                                7XatIqQWKodOkwB0COWQwIVGZEcKzC7EfKiPWJcoYjWKP/0k9PSl8dGWET6a7WmHzZ6wtc8yrbnT
-                                GzUUAX7566aIoweT2sAUYcsQ3LAG/n2V1ZpndcK7joE/OF1ZOA2qlX2cA7I3wK9QKipfuU/52irY
-                                OAR53+leebLrn3koYc8AunGQaGYJTwSJVHR2l3pYvXx2gGFgT3oDex4M9qaTOnkqnH0a1OqyAzNP
-                                M4CXjIfMBbXqMOxKI6d3goYpxgM8/LKl/vjavg+T2u0Clx1t9jejNsTb2w//shL+zworIv70HOWi
-                                o6y//jcRCxTl/z4Mf3mH9fF7Yj19hxwsrF6ddF0xCGWeZBpHsg5DtHGQaFZb4gyW2W14Dp/mBjTm
-                                Z+72qFUgzAR9PvJua6tqxkEe+8gVMhk34o5Jgzu0WlfqoWUeU0uWxcfNIgIPXu5NZfsBc+AfrrR6
-                                gx84375JswTKVdjaK/z7jcr9jyof/iFc2QlffRe8c6naZhD7NUuwnLGUV378BHz8lzBUt67feh0O
-                                XiB86CKf5bcb8DVevNLDcBEbqXI4a/A5amu5cfWhmSV85yqc5hHQB68tI8DzYbAnlf1F4IMXgxpJ
-                                HCuRqt0awRgPo4JxC0TZ76mzJTKuVZx73ELQyAA9H7YOW2QpV+CS84V6KFRrwvCIMjysjJSVkbIw
-                                NOIRRsKUScKnLxMufbeQ82yE773fhcuuB9/TMUmF2HvgtwGfD90Il9wI1QhyniWKD77L4+OX+gyP
-                                KLfdadL+QsKdrOSXTmZ2Wz2pUbZ35JNQ8yQP6GvizrsskWplq3WjVlZfeQX09du2pzbrV9yimySL
-                                b2a9Z80RMlSsZ04bczOyDDtGDgPMn427pmbu5TVcTw2MVIQ3nyZM6rDco70A/3YvrOvdz7V9gSe3
-                                wXWPQrtTevM5+PwfBSw93CPIwdf/NYpXSrUcoM75nJYAqYhCvqnwMfCTMoBZATWMSzza7Ycb6ksh
-                                0zkJ3nyGUA8zQZAsi5dMVC3j2GiOBZiMvVttUbEbu54LgV0T0MTeRJMN40pTtE0xxnYc1diEFiiH
-                                +78mEDb1SfrrTwfUXXfUG35m6In7Ldhlby/jrkyPQWE+BqY2lf4Yk0xR2SNn2cTuWgH1irP7nXz+
-                                yHtsaFJVUKMJIEYVbjZn/DRl/Gafpb/amFNnDEwppRzAmFiXkPRatOIwkgA9nk9foK+y/yt+1TBN
-                                KJky2RaTCLbV3i9WmOw6x0+ykn/juAa2ORPQGSV8TXtAUKkn7nrxXosS6Hkw3JcCv92HD7zbyvZI
-                                M7I9+9HU+xZ/Ik0jXsYtGSueNe0MsG3IJlvGuBkZmNvhqrtq9kWMsf9tuJ423dekXMvlauD7sG14
-                                /0eAcpRyqVxg36dYVL757QiX0B87OH6X04HVwAzgHGZimEoB6czbJNEYA3qrRHG6QsAg3TYWuBua
-                                /4hbOt4DKvCnV0LPdhqaOO88jp5yhQZnEBB4QuBZDrKl19m29fTa0yal3KSnDzo7duRbGJ1u5mWW
-                                ww082DoAoxpV72djuJ4u4pXL2QbaN//SsGEzJKLbcCUrMzUFWwHDUjxyU4rUOgt4kroRdGOZyJUD
-                                1jw6MyKAV+/XIwIjGeqfPgPetExsHNw0UbnSpOVntsbGxNPzFaOK70PO2fkvbrPhqixAl0y3bLFQ
-                                gLUb1HKOTAw9ynCE7D1Rm3sXXyjnw/qB2EO+n1oBak3ZeBXXfE7o64Of3WziXC6D8AIruYqjm9k0
-                                70AZnNOB31YQSfUIle1DSTb9iEeVYaeQ7ZIGUB1xxRGuzu+KD7rOX46OR8ngFt9psAYyGrzaev1J
-                                jqpNHSqDjUrQ4XNtbkDgw7NrXXw2RrJm/SKjd0RGaSs2WhXb+vfveIEAA1WXeyEwbbLw1W+EWdbv
-                                EXEO58CoumLh/Xh4y+aTd51ZFSDnCy/0a4jNWuvzKDGITSmTV+MAng/l7SlAZk+Ht5xtywoiIw0U
-                                ry1kvjoqtxQbZ884n4HaJhKVGsyabm9RaIOH1zUWjcyfbFurGoUHH1W6Ouwayw1dQZzvwahN0lKj
-                                hJFHe6lRJDzVY9PE9uextWLFlRq450FDdx9k7OpPcwfruDXzh2XAOZzjHEJ66oGSr4ZpFk4QwFNb
-                                iNw1tnj8jBGEEfTVRUBlMNONo2Lt/u392pBBE2v1BgvwlMrVAUeSTxb4sd+gVlfmzrIYVsrBqpca
-                                S67mdFkXMVhO8NQL6mr6MsBXkgxfYwSjHvUQOtslMQONwvObgOL+uUZu/FR9I87KU/u+GQp/mtu5
-                                etRyX/cBwu8DVYbQ8w+lJIJoUi6mPNdL6FwmG6wF6TFAWmW1Q7ZYHUyfbuFCOOYoL+m91yD3iald
-                                nGyPge05TtAE/EzqlYmEA+cKYWSv89BamwApqWzj+APs11IRVt5rrNVgNLmnJl5HHKIp9VCZ7Jrh
-                                xOrwpj4aysn2N/bvifV8igcjw2RLRwSfs3gT8HgT9Z/BFJRzEGThHIJpHXiCxDkD0lPGbLRCP8Cw
-                                zqoXIZtjXWhHk1EbTp03jMCffEwYHrYOlgZ5bjQBesLaVZJu33HSpGlKlkzy7lCOPNQWZAjwwIuN
-                                rvpKBd5yVOotfOBRUrdyfE+k4V6qQhgJk7rSdDTrEoO1mxX204Wy8wG80A8jIw35hoLhIyxnE3e2
-                                oP6ATwIhBr3sBNrK5dTbLQgvbic0ZdssnZDHPTcRz+90yRUPqgMkpVEnHAcHL7TJlpblptSXULoD
-                                ROLoMdKQKRsv99JsKagK+TzMm2M50YY+eKUvk4wjcOmprugEGBqGhx5LRUsSZ2jSRVDbkj7K+ATa
-                                irBq/WuMg4+HCMgrz2+2gZ+MR/0eVvKdUX84DTiTyQhXAoY6+v6l0gYJ+0dVuWOtVig6v3yepz1n
-                                Rz4f8x1tJgiBan+Gaipw+f8Sm+qlMaVbOZt4/5QEEJqh/sTpo2n/f9OsO6gtxTrx6NRmX/FUJh4g
-                                kFO48A2u0DcPP7zBUChoktWrTZU1MWeZP1dsllLMADx4ZrPNqtX9UAQgwtbuBqWgiuFtnNx08hzg
-                                V0DAdah17J2+mPyCSQQJ+1ellBf+8wkqrkxsKyvo9hyFd2dCzg0YoJHtrxc/xLITYd4cSVl7wuYb
-                                o3uazXU3af588rsZnTevzjowRjhhqUWyQgDfuzvu5+dyTkL4zFuhv+y8ghF8/z8NQaAN12/kMMKU
-                                SdablkXyx16BQn7/iwmqwroeza6jJBjexkoGub/p5E3AOVyGOtQYwVzzDplcrkvGFyc6UFN94EVq
-                                DpZr0oCbsrop6Jbs1YYyR4fhU5d5jJRdEauJFa6mQojsxNO4yldL4MeOIk2RYME8j6lddv/Op+CV
-                                /sYk25MOcgmjTln61QPKI79WRNKCi6gJwYaGhcUL0vwCBR7b5C6wn/EAVWX1euK2doqwmZXc0fLk
-                                czgb4SsIVUL0b95G18GTCeJ1QBXFE+WbD+ogna7O2ON/SJqU/zdrXOWoNtTvRRBlqP+97xSCXAz8
-                                Fl05TRP7pTWws0Eg43QI6xeIdQVrBZx8nHXed3XAF2+wiRAxN6xW4aZPQM4hZz4P37rO8MJLloUZ
-                                Hf181RosPNAphi7AsmUI+oZ0HzWL3onPRYQnurFruikR2qKB1OeA01mMcD3KAArvOZLin58mXaGK
-                                xF3QBNHAR762yrWhF6aynO8iaci94jpPSJLFKy4b153hKVx0oW2w1Fw100DFLRQwzchmYzRx/Uaa
-                                2urqdIjIiZYoEi54i0fZIeD/exC2DmVS+gQChcf/KkWCQgH+5VrD+k0WCbQh4GSRbPECj1otdQht
-                                H4H12/c/j2Axr6zakLClbTSvJHYu8CBTKHAPShUDv7uQ/E/eL9OqoWgm+qeqysp1WtnQm6xM+P2M
-                                fp/w1dVxfraqdcNqPWX/F58nLpjSotS5+Tt8xgbdAAAQoUlEQVSNAZpmt6wmZWJp+XSsQ5AxB8MI
-                                Ln6H5QaBD5/+jzRLKBaNU4rwxOfBdwpjLgdf+VfDulfUVf9qpuxbOGCO4PtpiLVYgLvX7vmaBXs/
-                                GUhYs8l1D7a+mkeTUO+bgE3kUFahhAhy2gHkfv4BmV6uWC9HXCaoIKUScul/0UcBAdqJ+MfRCAAP
-                                ZANjYcYHX1D40HstVRqTBliy3xPKd4peFDUGeUzsnjXuOhmzLTJpMWSUcBL725nLPKa79PDr7oPl
-                                TzcVighMLsBTX7QBHhEbTPqXaw1rX8bV0YtbjlaYPAmmTU4Bnvfh7hds3eB+pADKlkFlwyCDQAVh
-                                On38jNXAGcCdwBzudhk/ctJsgrsukxm1SFREJQ39IIGofvlOHdgw4nqRCreyMl2VLIsAT8b9ZkzV
-                                9fV1ad4f/6gwMAgmNhKac/sbAjspBceUp8alaiUubEl1A5oKRBpkt1Ktw598zCeKoLME7/kmbBlu
-                                WgdSYFIenvsCdOXsfj4H3/hBxGNPqoumWUWvWheOOkwaehT/7AkIOiSzbsY+NgEFnumhTsWl7Csb
-                                WEUPbwTuAM7lZpQDEOTYWQR3fURmxpSfLWdSRV8cIPzMCgbdtLczxIc4pcHFk2gBq5L/1kh6+8yY
-                                Cae8wVFrJI2hXZOWOqeh3XibJoFGKi5EK61DxSa9XuN17X09D/7qj7ykH9BxX4Rt5dElYyXfcoIZ
-                                JecvyMH3/yPi/tWGfBArmcopJ/gMj6R+hpEaPLNh/8kOVkXvfI6RTBfnnwJwN3Au30I5HkWPnkGw
-                                +gqZGUWiYmugM04fdDhSPeWbutU1AixheBshFe5thQBF5w2MMhZRFT76AbHNFDRD/dnQb/a4pnI9
-                                LgUf1dN/Rz3+Gd1AIg0fC20l4Quf9pk/B4ZDOPzzcPvzlu1nVwr3gSc/D4um2eP5PPz0F4Ybb4nI
-                                5604mDEdDpybIlBnCf7zMdhfjMFSUeXHjzqHDXQS8mOn+P0tyrsRwqNnEjzwMZlZronGWnGcDmmM
-                                6pYK0UFXa3evfaFJGC7mNh6wjWFaIcBN9OCxjWoaFFpyMJx8vCQyOYoyCRdqqT5ygZ3GVO+mtO8m
-                                PUGzx7KBpKhRv2jmLiB8/NIcZ59qo3tv/Rf4zM+seRgjjeeQ6pE/g+Pm2yzifA7uWqV89/o6QaCU
-                                y3DuaR61ejoRNz9hewDuDz7BgQrmiZeou0fZyB08wrl8GOUKlOox0wnWfEJmmljmp4aR+CiP91A/
-                                6Mu6eThyRpPhBG7ntlb38hv25nMsuACjwoxpsOEVZfMW2N5v08DrEXiBUMwLpZJHe5tQKgqFopDL
-                                C0FgY86+7ypXXLsWya4M3tw9ockVq0qDPFaxlCuuRv6QxcIRS4RHf63cvw5ufBQuPtn1f3QNLcIQ
-                                PnoqPLERnthkkWRLDzz8uGHZCR6LFnjcs8oQuqTLrcNw2cmQk0xUbGet33ZUp54tUW5+V5HGLhAt
-                                /qeqeu3DDN/yMnWXtHEdCyjg8W2E8gmz8O+/XGbV6rG27/qQqkjOV73hGcpv/Z72uB6IVSJO4Pa0
-                                MWRLlzMAxwJTuRDlhqRcprlePu6eGZKu9erbqJpfsN25innLdnN5iwhxS7TAcx00nRz3PBdb8iQx
-                                yWTUUzX2bkl7+liLIozggadtGpkfwV2fhePnWySNYVAI4PLr4Jq7wHcLM/gKs6fZ5eJHqg7havCf
-                                l8PvHp721tm75eGZ/gDs+H+FnOGE/8uWh7sJEaZQ5XgK3IOh/IY5BA9eITPLVevHcsikKlDwVP75
-                                fgb/+L91wC0AsJleTuRA6tzwKjGHhnF2U4fKRLzsgB50R3bsTjWqPV+hJAsUL0lS0S+9F/ns220h
-                                qIi1ZgpF+Ieb4bM/oaF3cMPy8sD5h8CNfwC1EAuocUYABXpGTDT/S3STI4fyYzwuQtE3ziN3+0eY
-                                GYbilhm3UTdFtFRU+YMbte9bDzJCQA54gEO5gOdQlu98GhtFwFuBFXyRRawHNjgbtN2BSlIbbteC
-                                Wa8CuqbCgd380MSdQAngtsfh8ZeRS5ZBGKGiSBgKZyyBxXPghgdQgibkc+zimbXw2QtBjajsDIXH
-                                RgSooHx7FUMr1lJHiBAWY/DPOoj8HR9jZq0uKja8ZwPxtmGmXHidbvv3J6jikcdnBSt4Dx3QWurv
-                                OqAax3G0M4N2RphMQCc5CtQoUmcSPp34tBFQwJAnogAUUQrYHrh54r7EfsaRl/IXL0GwV38u01Bt
-                                lo1g2kk7B8O0BZNh9RcptoEnzjUSiOoDLyGnfpkB/KTLLtlI6N+fR/5TZ1DCZFBgjDlAvOZRsU3J
-                                /Ym+EvpJujfnHUb+xg8yvVaTuM2luDRHcgGc+R3dds966ngUEa5hBX/OMbCra4/99vXQmItwJLej
-                                HEadaPUXmXHULPKRiX2jqt1loiM/x5bhaLScn9eJt/7vmFWtiMi4iQAFI/r9NTr8sRt1wLZHQT+w
-                                lNJ1lzC1XLGcLL6YUWv0H/HPunndIAahiPB/WM4/cCjsztKT3m8dAixCWcGZwPfJ037cX7L12vsY
-                                KhQ1aR84s4i/6SpmHzbNtsjNlgi/so3ozueojadLQFU0l1P5/K065LyvesXJtP3wvUwtVxzHJyl/
-                                15EIs/Bq3bxuEEVoI+ITLOcfYPeAP1oH+G0YLwOHAqu4lYW8TI5337SagU3biS44llIYWTnqC/zR
-                                OXQ8so7qM92EeHgIQgDPrKd++Zl0RKE0NKcYCx0gror68eOUf7iKEQx84c10fvltMrlSt5Ru7WSL
-                                wP11MQv/UTdvr2MQOlHex2070/NfbwgA0OO2a3mCg/g5OT788Fpqdz1D9ZJTKGGXi5MwFD50Em2B
-                                DyvXUCFnA+IbthKdcSj5eV34nictE2X2mhKIqBcoJ/2zbjV1+Oo76bryNLpqkSCxA8RpKC8NEC39
-                                CltG0vUF3sKt3LVHcQdeD+MY2pnJKiImTS8hT/8ds9p9BCOCor6v3PkCtXOvZht5q4wumoL3/F/J
-                                rFqYae+5F3UABcQohRxccr32/uhhyj/6kEy56HBtC42T+AZR6+DX57cTHvVPbHEWTBvKKdy65+sM
-                                e68LBJjGMMs5Ao9HtlUJDvo03U9toR54NvUlMiKnLyT/wt8ya3bJ5uC8uIXw2gd12AXV9n7ED1Wj
-                                6J0vafVH9zFy80dl6sVHUgpNEssXBXxRXb2Z2lFfSYAvRBzHkr2zyPTrgwNYB5e1i8/ln4APUaNy
-                                y6eYdtZiipHaaJoa1PPhvK/Ts+JZalQxm7/CnK6c7bCFyl7iAIoa0aqomfpn2v3YZ2Xmki4CIyJq
-                                jFor3wr+RzZRO+UbbHPiKQCOYTmb9hbk/NcNAqwFDgMe5JcspoLPW6+7nb65M/FOOohCZARx0cxL
-                                T6N9SgFueYrajU9Q/uQZdMZm5F7QAVQRPF856+u67f4/lpnz2vFTr77NVgw81V+9TPWMr9HjvJeG
-                                iGMZZjMf3XvT8vpBALCZdQAv8gCLeIQC7//FIwyVQ/StR1GMA0NhXeSkAyj83qmUrrmDkXvWUvvg
-                                ybSFodMG4kKC14AAqlAsIpdfr33Xf1imtXmI5znu4tx7Aty9ntq5/5YAH6oczQFs4+a9LYpez+MM
-                                lpHj51SpfHAZbd//MFPjKJtNUBQtFlQ+9VO2r+8j+o+PMK1STRW03RQBqiLUIrh+NUOXvZHOyjBq
-                                mz+IxBXQvhhd+RLVt3yDbZScxC9zHB49e6bvTyBA63EW8/F5kAhz9hLyt/4xMyplUTEqrrGV5n2V
-                                tdsJr72H4SvPprPoi6CZtad3AQHUKMOhmLXbNTpmluTCUNRFwq0v0KZN6/0btXrmN+lxK4p6DPM7
-                                XEgvfzo2rz+BAB8FXmEude5ByZ08n9xdf8zMKMw4X9UuE1AsqqzdQjivU3zdTQ6gRvE8UWNcJA9V
-                                jEjcONsX1VWbqJ36T7rNpYIpNY5H2DyqCHQCAfbyeCfQTwc+j2IoHD2bYM1fMKtSsRk32dbsSeb0
-                                ztq6v4oVkByOW8Sr6vO9hEuv1q1uIb8iIUtZyStj/ereBPSBG4CAIXK8AY/yo1uIlv4dm31fRVWS
-                                BGiXOtCQ3LSnVKeqummYaOlVusUBPwcsY3DsgT+BANkxBBh68TgGqD7eTXTKVWwulrJuwL0z0rWd
-                                0cE6esRVuoWCXc+BkAtZwbM8ND6vPYEA8bgXuAUQhvE4BQ95qJvwnK+yNR+o7M36YUHVGFQC5fiv
-                                6GbXY6uI8mFWZpO2JxBg/MctwMF0U+MUoHjbs9Q+/hP6ioV0XZM9ZQCKSDGPnPp13bq+Cig54Ovc
-                                yn+N9+v6ExBvMVYBL7Gdg3gan4sfepGROZPxjptP3qYov3ZPoKpIIVA+e5Nu/6lt1iAI93MrH9sX
-                                rzqBADsba3mGRUzC5w03rWHkgydTmlTAc6t6yWtBAFH0F89S+cR/MEDeray8ntOYirIPupdPiICd
-                                jaXArfw52Mrad32L3mIpjdS9FuWvZtCLfqB9FBGgA7iYBRie2zevOIEAOxuPJbN0FYr3682E/7WG
-                                ETWqspu6gIL6wBeW60CU/vOH3MqaV0vdHssx4Qja1XEuPSiVo2fjr/kzZlUrwm56AtUEQvvH9RW6
-                                8BCKVDmMZWzly/vutSY4wK6T8DUAj64jfKmXcDeTRNQT5KrbdICupC/T7dy1b4E/gQC7M0JuROgk
-                                hyx/mupuqgGSz8P3HkpWac3j8Z1snf4EAuzvw2MdhhoB8sTL1Ly0/+4uGP7K5kGitb1JJ6YCy7ll
-                                fF0+EwiwZyMiAkIEXhnE+LLrjaVEhN5hDFW3erDuD6CfQIDdnamFCCUUnT8ZP1R2b5G1bCGaSRLX
-                                JxDgN2YEXAMMMoK+81hKqrveWU4V5nbh5TpcDaTvFnY7YwIB9r9RaNo/m7dyLo+jzKIG7z+Z0mkL
-                                R531KiJApSOH99dvpoMKipLjzfyAMtP29eu+fv0AZwIrM/tn8TvAYeRYSMh8hKUIh6EEKFUq8I0P
-                                0HX5G+ms1mwxd9KObRf9ALmcyE/WMHLJD7WPAA8PH2UrPk8S0YuwDZ8hItbxIjfzIgN8DKwBOoEA
-                                e2+cBgwizODzKO/H4xCUYQzDjFAlgsIk/MXT8JceQO7tR1B43xtoMzVQ48D+WusCIjRfQm5+gvKv
-                                1mp1zSbCrQNEW8pE/SPo4BAGIUc7MzDc6p6vb6y8ha9fDnA2/4xwMba3Pm9aTO6iN1A85kDyh00n
-                                aMvhFX0RT2xvwWQ1lT0uDLHhYDWqOU8kcEu/1yPFKFoJVR/fTP38a+ntjzAIG1nBiWOn2rxeh88p
-                                GCIE79ITKVx7GVPLQ3HXLdvIMjSa5O3uxXQQAfA8kch1RgUUI+IJUvSU0w+icNIBBMttp7B5vJkS
-                                yylPKIF7cxi+DHQBetdaajbZTzOLR2gCrL3IJjV7vcwyeqKggSilIvLJm9i+/HlqwFSUvxkr4L++
-                                RQDAmzkJ5UsIx7dF1P/iPIJzDqftwMn4XQXx2vIIPulaSXETzWyfoubuktq0BSs3YlRSgQhGaqqV
-                                Ktpfw2wYIFqzQWt3v0D1J6sJaKOMcC+Gv+S2vVMEOoEArREAlgNnMJOAN2M4nTJH0caiSUVMZx7a
-                                i8jUIl5XESnlkJxvm0vEExeli19rvBxObPuHrvFlJcSUQxioYsp1qNbRkTo6HKL1Ch4RVfI8RY5H
-                                CFlBxCruZIizgNvHdgr+P1s09m3W5WsJAAAAAElFTkSuQmCC</field>
+            <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QAxACcAA+BYKlhAAAACXBI
+                                WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMdCSITq3pssgAAIABJREFUeNrtvXmcXVWZ7/191h7O
+                                UPOUVOZKQmaSMAYIiDIIiIKCXqFRabyK2tfb9qA92Gq3b3uV621xbBC1VbRFEEUmgaDM8xCmEMhI
+                                5qkypypVZ9p7Pe8fa5+qSshQVakkBdb6fA4pqs7ZZ+/1/NYzDzC0htbQGlpDa2gNraE1tIbW0Bpa
+                                Q+vPaMnb6DkEaAAmApUDeG0L7AbWAZsATV5DABgE9+4lBL+8tpL3njYzGDlrklfRUGv88psUQPtG
+                                LxFJPqtEMbpzl8bL19vc/NdL29a26mPAb4EnEnC8pQEhb8H7zaZTjAwDrqipMFefMdsfdf5pIVPG
+                                eXgGjS2iA0wOETCCiiAbtlgenF/i4fnF/PrN9jar3LBrNwsTLhENAeDwLANMS4VceOqx/vsmjfHO
+                                PHm6z+xJPoGPFiPEWnfQ5TA9kbu2IiIEvgPDyg2WZxdGLF0drVm4Iv7DivX2HuBPCRB0CACHfm8G
+                                mO17fPXy88PTzj05bGyuN1RXiqOJIqraxbKP1Cp/pwBioFBUtu5SXlsRddx0X2HN0jX2euBHQJyI
+                                iSEA9PGegsBnehjwzfednjrvkx9IUV0hGsVwFOjdK+4AijGiIsjD8yP+685ca+s2+/mOPHcAnYOV
+                                Iww2AHjA6ZPHmU+dPiu44uJ3hDK22WihiFhVQJBBzLPKIijw0WIJuffJIk+8XFz42Mvx94BfA7nB
+                                BoTBsp0GqAa+/1cfTF307lPC2uH1BgG1qKCDm/D74gYigjFoe6fKK0tL8Q9+k1+8plX/BngkEQ1D
+                                ACize9/jjKkt5qYvXpVtnjDSI7aD/7T3RV8wRhSQ/7w1z60PFH4RxXwB2D4Y9APvKJ/6caOb5JpL
+                                z05975+vylYOqzNqFRF5exC/7FNQVQHhHcf7zJ7sH7ezzX5gbatuBJYebRDIUQTeWXNn+T/69KXp
+                                CZPHeFhFVR2vf7u4J/fgBG6z1Qi0d6rMe6ZY+PZN+d8CnwSKR0s3kKPwfUEq5OPnzglv+IePpgn8
+                                o2LJHXUdwfdEF6+O5Z9/sHv+pu1cBqw6GtzAO8LEb2pukB9c9b7Ml/7msjQgqqryZ0N9nJUgIlir
+                                0lRnOG1mMLJ1u714zSb7egICfTsCwAAjJo+V2778iYr3nXNyoKUY/tyI/2bdAK2rMpwyM6grxXrJ
+                                a2/EOeD5I8kJvCP0HcMmjDJP/vtnKmdNHutpbJ0j7c+V+D1xYBUJfTh9VhB4np79wqK480iCwDsC
+                                1589e4r3yP/5TMXY8SONRrEOEX4vkQCCVZXjJgdeJiXnLFgWtcf2yIDgcALAACe+6wT/d1/5RHbM
+                                8HqjUTRE/APpBYDOmOiZbFrOfXZh5AOPH24QeIeR+KNPnGpu/6crs8c01JhE0x8i/kFMRRHghCk+
+                                qUDOfO71KAc8ezhB4B0m4jdNHG3u+Mcrs7NaRnpq7dDJ771NLsRW5fgpPrHVuS8vjVcCrx8uEHiH
+                                4RnSFWnu+n+fqzht6jhPo8h5wYbo3zedQBWdPsEPtuyIz1m+1v4RaD0cJqIZ4OuFwPe+8/cVZ0wa
+                                42kpkfm9J74OISABgapKKkA/e1mmpmWk3AdUHQZ6DegFA2O4/G8uT/3l9PGe9I/tD7GJPf0EKrUV
+                                6DWfrWisr+ZuID3Qm+QN4HVa3nG8f9unP5CpDHwZEvr9WHavZEYRpw801Xo6aYw/9r6nSxngYQYw
+                                nDwQABAgU13BA9/6XMW4mirzJt++anfi7BAu3ryi2GJVsbYMBLAWIpvslyLD6414PjNfXBw/zwC6
+                                jP0Bkvv//s9XZY8d2WQ0X1QBiC20F5T22BJZUAGj4CPUZYSUCGKShH758wOGtYpVaCtatueUjljp
+                                KEFH0dJRgKwvHFPrMbJa8A14nuiFc8PK+a9HX395aTwf2DEQloE/ABzknR97T/DJs08MNF9UUYUX
+                                t5a4e3WRbXml0yqlGGJ1t+sJ1KYcAFpqDKOyhklVPpMbDKKCMWDepoBQVWILnZHy9KaIV7dHvLEr
+                                ZmekFGKlGENHHopFx1cnVhn+/vgMxw7z8IzKqCajf3Fe6sSXl3Z+CfgiUBgY07P/n22cMdH86muf
+                                rjhveL3ROFaZv63Ef7ySo6juDaUSDK+EaaOhrsKFQ9tysGEbrNgGRQuBDxrDuCrD6SN9zhkeUh0a
+                                PAOeeWuDQdWd9CiG5e0R96ws8fSWEkVNcghx7N4mXLJjdzdVPIFTh/n888kZarOCMaLpEPnyDTnu
+                                e6p4KjD/UPWBQ+EAfjrFuy84NTyvucEQxyptJeXmpQWK1p3iK+bA350D40YCJbqz5U239rFpK7y0
+                                Dl5aA/PXWJ7dXuS3y4s0pw3njwo5rsFnRKXB995aQCif9vW7Y17ZEnPvhiKr2i2xQlUI02pgWj2c
+                                1SKc1AyT6wUTgC3BE6uVrz+mPLkSXtgasWpHzKy0jwiSL8IXPpLmuYXF67a1cSaHmGja3x01QNX0
+                                8Wbh9z5fOTqbFrVW5aXNJb7xSo6ihUtPhJ98FKLI6QMAkuiCZWW3XNDnJWzfKqzdDqu2w5Mr4b+f
+                                g7Z24ZxRAR8+JkV1KHh7AUFVBxHRu5W49qLy08U5Xtkes62g5CKo8OETx8GFE4Wp9cKICogT8WhV
+                                URUExTdCZwk+fKvl0dVw7uiAvz05QzpMOIMR/dPzxehfb8j9NfCz5Hj1nwO0/C88QFdd32ulIgA+
+                                f8UFmdHVFUIUI1GsLN5hKSp0FuGaS6EUOdYmsidGu+iXgCEqV/UojKiBEVXCKWPgH89W7npN+Ze7
+                                ijzxRImvnJhhRIVHZKwryFO3ebF1m142NqJYKSbXVKXrveWffYFIoT1SFO2q7nPJOoJ1v+265/Ln
+                                JNG6rHY/TjkVPLLK9pIlskJHUXm8tcSuWLvUtM+dCP/6DsGnS7Mnl8j6sgtYku8vRhAY+Pu5whOr
+                                lWc2RxRLShgInhGsIidO8YO5s72rnnolvgdY318u4DuNtE8FjgZomHWM+cKFcwNyBQsIpRgW7Iwo
+                                xXDeDGisgkK+9yxm7/cZgTgWLpkOF0yBr85TvvhMJ8XoIPxL9vxZ9vWz7s8Fe2DfZF8cmgp4CqeO
+                                hmvOFmY1Cfmioj2+aH/XM4l7bmItzBgOL29RVm63HJv2ulx39dWGM2aFp768JPeOzjy34fIK+weA
+                                NTf0yZwIgC994aPZdKHoMrrAabDL2mIKMVxyvJNlhyqxRaAYQyDKN94rXDgV8nEiSvZiveXflU/q
+                                HpTTfVBT90NtPbCXem8Q6f6uqY5TnDYSKkMhFylCXxJelZHVwtQGZeFmeGFLxLQRXpfSZhU966RA
+                                bn8k/5Vla/WeRAxovwDQR9k//rxTgvNbRhqxCfuLLeyMHPFLJXjnFMfWD3SStJcnSgCrglo4rWUf
+                                lq8ehHh6EAD0/J3d+4PiVPN9Xb8LALb7Sd70dwVrKMVvznotP39ZhJT/tYkCrSqkfJhSLxijLN0V
+                                E8UQ+l3XksZa4dxTUtOWrc1fCNzWH13A78f7z7/gVH+86enps/DKthgxMLoGqtLdJk5Z6V+/C7bu
+                                dvI35bn31KShOt1tBtn+qKo9kbQ3qvZFNNnPz+znGvsCkezFfeRgIJbkY4oR59hpK0Bru7ItB2va
+                                YEM7DM/Ce4+BtJGug3VMA6R9WN1hiSNFw+7gWrEEl58bctO9+X9t6+QP9KMquS8AEKB2zgzv/RNG
+                                +0ZEurbCKqxtt1iFMU0gPRQ/I9Beggt/4ACQChzx67PQUAEja+G4UTBnLJwwLjk0JSjF2q0YvZWd
+                                P7iy8pQRTCg8vVa59w3l5U3w2gZYvQtswVUZpz344UXCR2ZBybrPjq2B0INcrOSKSkV2TwuoIiP6
+                                F+enpv7o9sK7gHn0sUdBXwDg+x5jJ43xzmpuMMS2mzbWwvpijFoYVgW+6X740Iebn4TVOxySO4vu
+                                1drWDavbXnKASRt470z42BzltHFCFCn2LQwBTZRZi/CLhcp/PKlsyrvf7+6EqMywU5DCHZxn1ikf
+                                nO64hKrSXCl44rTK1pzSUE2PGK5QKMGlZ6f40e2FTwEPJY4hHWgACBBUZblq7qzAWW+JKCp7unZ3
+                                OHFZme5miZI4ix9b5lh/WdZVG/AQsC4+0CVPY/j9fOVnT8G4BuXq0+HCqUpLvRB65WjZ4AaEKhhR
+                                jBFW7RTuW2H51lOwoQMyAVQYqFHDxFAYVWUYlzFUeMJ920os7Yhp3Q2dJahOuR2szoKfmLDbc7qn
+                                LuX2U7IpeP87g9l3PlqaCLx2uACQaaozHzlxqk+S1r0H0nPW2bzVoUN9l2j1YflGZ9qowgzf4+Ss
+                                T13GkA3AmG42by1sKVrW5yzP5Et85R7l+w/DOVOUL5wNUxuFaBBDoHziC7HwnWeVWxfBkm2O81Wl
+                                4OS0x/QKn5YKj2xaSIdC4Dt/iRfAN1fEtJeglBTHqkJdKlEOFXYV7JvaHZXpMHeWP+rOR0tzgSV9
+                                MQn9PrzvnWefFNb6Hl3Vuz2VwM7YbUDg70UhA1s63MYEwJwqn+nDfWqrDGGQgEW6r9MSeUzPKSfs
+                                8rlxfZ7VRcudr8IfFsJvPq6c2SJdYdPBtgTYWVQ+8BtYuCVpaBRAU0q4pCZkfI1HfbWhKiOEgTj3
+                                toFCQSlGHnZFEhPo6TTr4SXtLOk++12JCKOHed6MCebM11bY3/TFJDS9Zf/Ax94zN6AUvVktV6Aj
+                                2v/3lRKCVYvQWOHRVGdoqBFqq4SaSqGmInlVCY01wsgmQ8sIj4tGhEhyh4UYvngXBMHgTRzzDdyz
+                                BJ7Z4DieMXBMaPj0iDSzmgNamj2a6w01VUJFBtIpIfQhCKSLe/hmLw4q7LEHqvt2f49sNIxt9s4A
+                                6vvCJP1eAiA9tcU7fVSToVB6sxzWxOMpAqV9qCChB/nIoS2dglTo0G+M7BOSnufMpaqMdPsMBEpR
+                                klQwiPWAOIltAIwzhqtGZxjRaKitFFIh+N6+731jzmLUOY2CZF+0R+xEcW5v3Y/wyaaFsc3e2IpM
+                                aUJHjnW9FQOml+859ZyTg8rYJqXu+1iZJLq3u+jYVU/20FiR+M9du7Uk3n8gD6DgGQg86TLBRWDr
+                                bu0+HoNUBOSjbngOSxmaG4SGaiGT2j/xrYU3dls8heq0Evrd7nDUiUYO5KRUwSo66xiPVMj7+mLd
+                                mV5yibmnzPDCON53RFYEMgmx2vN7uUcjGFHrfle0LmjS25UNpMvRIgKbB12HnTevjh4AyIZCRVoI
+                                gv1wu+SUR7GyaGeEAMOykPG7EdVWSJJpeLMLvOf+W4vMmOAR+nIuLktLBgIAAgQjGmRWY63n6X52
+                                X4AwSe/aurvbDSwJT5zQ5LxaHaqUrPv5oFFcAd/bM3Qcx7CrY/AyARHoKHVvfV3gMpwOdLtWoRjB
+                                ig6L58HIKul6PgF2dTqxIuoihAeyQaorhImjvRlAppeHu1cAGDZ9ojcmDByr2d+DZ3znoty43bF6
+                                7eE6ndycIF1he0GJrfbqINen99T4fQ/WbBucAChrJh09krRCIwdNYoktzN9YIrbOYphQ2y1CRZTW
+                                MgAE0v7+PaOqgrXo8VN8gDPoZcKv6cXfR7SM8JoCf99yu1z4MarCYIA12x2rL781juGU8VAouast
+                                2R1TLHXLtQOdJmNcEKgsB30Db2x3qVKDTRKUn3d7vntT06ZbfO2baEoUwXObYyJVKkKY1NCT6wmt
+                                7S6nUgSqwv0X2YhAFCPHTe4CgN8bMdAbAAwbVif1+1NgSLTe8WmvywpYsrE7ph1bmDUGUr57sKW5
+                                iHxBnUZ7EDlgcGyvZxxm5bZkUwcjBzCwMRFRpQiqgwPHMmILG9pilrc7N3pDCqYME5I0FYzAyp0u
+                                JG6AurQcMIM6tjB5jAE4vreK4MEA4FVVyLDKrEkf7LROq/WIYwhD5/r1elzZWJg7yekGG0vKmvaY
+                                UunAeoDgQNSUcopg2YJYshmXaTEYZYCnXTGOQgFqQ+my4fdJsBhe2RzTmneRn3MnCqJgrXOTi8Dy
+                                7UoUO0o1p81BIo9KJi2MGWYmJ76bQ+IAAgQN1TK+tlIOZIVgDDSkDWnfsekHFoF4PaKoChdMJ3Ei
+                                wT0bi+SKyoEMAhHH6htSphsQAos3KvgySPuuCqt3uiCPjSHlmf1SILbKrpzlwfUlJ+YsXDbTcVBj
+                                HDfZnoOVu7rFSUX6wHWWiY6mE0ebDK7x5iEDwM+kZEx1VjjQxYw4Z8+IrME38PwK2NGZ2PsJCM6a
+                                CpkkqXHh7phF2yKnCxyADRgjNKRkD1Csb4difvCJACPQmYednVBKXDCp/ehNZdn/6JqIJe0xYuG4
+                                ETB7lOxhJm/pUFbscNyvJeslmdEHPjTWImNGGB8Y1xtL4GBvCFIhI6sq5KAKW9oXplV5Xdr6rfOT
+                                uEBi646ugbkTuhM/7lxbZHfeEsf7dwYZAy0ZryuKWE4CfWPr4LMEjIGlm+nKyfHoznbeW2bHMWza
+                                Zfn5soIT1Hm45nyhWNjT0trQASu3ugM0tdYj8A+eH6EKoxs9A4wYEBEQ+NRnMwcDgAtuzKj2CYwD
+                                wC+eTHYh0YKbqlys3zMO0Us6Yx5cWyJXdGVS+1MumyuMyyxO7qgQwYqtzkQaVHEAgYWt3VtenQR7
+                                9iaBY/3KV+d3EscKEZw/E45vdjqSkXKGlDJviXvGWOCUJv+gHKAMgIZaDNB4qBxAAM/3pLrMug+o
+                                LRoYV20YnngrVm+Dx5eQJDa4ypiPnAzTm518tAq/XVfgpc0l8vsBgQiMrTAuRy558FwJlm5VPBlc
+                                eoAY5dXW7v+fmPFI+bIHp7JWacsp334xx4YOF9odWQtfPUvwTfd7jSgRwk2vgDXQkjbUV5o31UTs
+                                DwBNNcbQHRSSQ9IBPE8rA196xQKbsh5TazwEaC/Azc8550+ZhVem4NaroSbjWHnOwncX5ViwxekD
+                                e4PAJKJleChdAZFiDMu3JNcdLAZAUmzw7Bp1OyowNitkwu4Ta61SKMGPX8nz/JYIVec9/eUHDVMa
+                                uwsnrELoCTe9orR1QsnA2cMD0qlu0/pgxkgmjeAGZx2yDmBCT8LeVGQZ46JdF40OqU6SPOYthAXr
+                                97RTh1XC81+E0YnHK6/wfxZ08uS6EoW9QGAMpEM4Juv0gLJptHqnUzIHkwu4mIdl2xOvKDCq0iMM
+                                JGHpSrEENy4scN+6EhJD1oP7rzTMGZmYeQhWHSfNW/i3BxUNoDEQjhvmkwqkl3qPEvgiQMUh6wBG
+                                8PyAsLdHzfdgWKXhQ6PcR9bvhP83z/2+zFKsQmMG7vormDUqqeoRuG5Zjj+tLZAvlhNOEuUyMEyu
+                                9rp8rZI4g7Z1MmgiQ4KT/0V1LTyqAqEpK/iJuVqK4GcL89y2skBKYWQN3PVRwwkjlHxJuk62ESXl
+                                w7/80dIROeqc2uDTVOUyh3pXG9nVbzscCA4gpg9eNyOQSQmnjww5tz4g5cPdr8LX7oFUtkcuPNBS
+                                B7d/GqYMd7ZvzsL1Swr8flWeXL4bBL4PY6oMVT08kcu3wNbOwZMX4BllwSaIk2KYWl9orjJ44moj
+                                b1lU4A+rS3jqMqF/+UHDcc1QiGQPtu4ZYd4y5ZbXHWUaAsNZo0IqM2YPx1pvOJJnCA7ZE5gkIdje
+                                1l8mE7WorhAuHhcyu8Yj5cE198F/PdLtHSwnkNSm4Pl/gjMmdBeQ/mp5kZ8vztGRc7/zBMbXeIwI
+                                TbetCzy1qs/jAA+rDFi40cl4MTA8Y2jIGmKFP60ocdOyAnGk1KXgtr8wnDTKOcFMD/1AgFU7lC8/
+                                pLTnwTfC+0YFjKs3pML9h5P3x5HKM60ODQAKccRB0hHeDIJUCMNqPK4al+a0ap+KAL7wO7jmfke8
+                                rkQHXCXRHZ+GK+ckBDVw76YS31nYyc4OV2uQCQ2z6jwXBFIIPLh/sTMFBwMGtnbA65sTrRnh2DoP
+                                z8D9K4r852s5pAhTG+GeKx3bL5ScPNeE+NlQWLJNueoO5fWN4HnCxc0B7xwbUJmVLhHaW5+0On1L
+                                94pT9UsE2GKJTlX6xG49I2TTMKrB44rxKT41Kk3ag289AOd9H3YWnOewDDJP4DsfhL8721W7ADy9
+                                NeJLL3Syo9NiBN41InBZDkne3KPLYHfEUe8/KAKtu9X5AJKGFic1Bjy8rsiNSwpoBDNHwU0fNkxu
+                                UHI9ZD7qiH/3YuWim5SXNkJFVvj42JD3TAiprzakgr72RRBKMapKO72YamoOJgFiS2epH/Mwfc8l
+                                PjY3epw4KuBLLVmmhR4vrYfJ/wb3Lu7uD1SOF/z7xXDtpd1fviZn+dtnOnhjZ0TWN5zWGHSVnBkP
+                                bn1RCL2jywWshdc2w/YdLm5/Uo3Pqt0RN79RpFBSpjbCrz9saKlz9f/GlOP9rujlVwuUK29XtnZC
+                                fcpwdUuKU8cFNNaaxPSTPgOyrd1aYFtv2PZBOUAp0vZcoe9brKpOKQyhoVZoafb4+DEpTq/yyRXh
+                                QzfAP/0eclF3JVEhB589E371MWhMQy4Pm/PKl+Z3cu+qIufUBQQxFIrOJLzhMUVSRy85wFoHxFte
+                                Ag0gZYRJFYafvlGgo0N513i446PC6BqIYun6jJ8ktn7zCeXTdyidMUyq8PjrSWmOHxPQVGvIpB0n
+                                7Q9H2rRDLb0cSnUwDhCVSmzbnevfDsfqEBz6UFMhjGowfGBsiv9RHxIX4LsPwpyvuV5BqURnLRTh
+                                gqnC7VdDYwryOWfz37i8wLWv5ynlXag1Kjofw8sr6KOMHEjt39U8PLQIIg+mZTxu3VRkV4fy4RPg
+                                px+ExgqhGGnXyfeNkouED91iufYpxRo4s87nk5NTTB7p0VAtpMP+Eb8sqHfsUgtspXu4df8BkC+x
+                                ZXen9gOJQtlyE3E2cXXW0NJkOGt8wF+1pGjwhaVbYfpX4HcvdGfPxBZmjoBF/58woyk5bcDqnKW9
+                                p2oj8F9PKb5/5C0Cqy5799pHQD2oFOH1XExnSfnATPj2hUJ1KikVM4JVB4L17XDpry0Pr3Ca/jsb
+                                Ai6flGLsMI/aKumzxr8vj+zazdbSPer+kDhAsSOna3ft1jeZAaq6x8ta9+oZ3u2pvMRW8Qxk08KY
+                                Jo93TAj5mylpTq32CYDLfgxfud0FewIPSrFQESjPfUn4+BxXH+eT/CvJzwIPLIENO45scEgTRbe1
+                                Q7nxRRf0ylslyiufPAl+dKmQDbrzHcqa/ssblct+ozy1AkJfeO/wgMsnp2huNNRUOk55KI2wkgxq
+                                XbvJWmBtb0TAwZhnGMc6Yc6M4PyWkXvmhCUzX/b52reTSJIQr6t8TYVCfYVhRq1PS2BY1Wl5ZJky
+                                bwFcMFNorFCKkeMi7znW9RF4fBF4nrMaPHE331mAqcNh9ugkf7C/vQT25qM92cw+9Jt0SvjKfcrz
+                                65J3luA7H4C/PV3wjRLbshtYyKaF3y1QPn67smYnVKeFq8akeMe4gGH1hsq0uFDvIZo0Iornifzw
+                                9/nt7Z38EDfS3h6KEhh35NnanrP5gdS1jRHCAGoqhZGNhlPHB3x+aprxFYZFm+C0rysPLwWTlA4L
+                                8IX3CDd/RghND+Mm8bT9/mXYmQN7hJiAZ4RFG5V7Frv/T/lw7QfgyhPKlUw9klgM/OIF5VN3KjsL
+                                LsPp6pYUJ471GV5vqMiA7w+ULSt05pQNW3Q5LjPh0JVAYPOGLXZHFA3sJooIvucqZuprhEkjPf5x
+                                dpYzGgJ254VLr4frHgbjuSqhXA4umqU88nnhhNFJYEjdBv9pIby6XvHM4TcJrbrill+8pKzfAVUB
+                                fO8iuPoUR/qysmdECTzh+mcs//tupSOGsRnDpyemmDXapykx87wBzGzxDCxdG4MrEe/VMEqvFwBJ
+                                11bKBWccFwz3vYEf/FAuAwt9IRUKU6o9GkR4vc0ybxHMXwHvP8HZ+8VIGFYJ7z/O9RNctKH7Ceav
+                                hs+eJZRKB3AODYAIEJQ3dsDVv3VdTu75BJw9waVyWZVE6VNSgfA/f6tc96w7iidW+Vw5McWkEb5z
+                                8IQDS/ykGYfe91RJnn89uj4BQeFQASCAtOf0nPefGU7MpA6P261LN/CdbtBc4TEhZVjUZnmtVbn/
+                                VTh7ulCbcQpVyocPnyqEIjyyzN3ltjZXh3/mJHlT+fpAAKDcEEs8uPhnSlUK5l0tTKiD2Ep5DiDG
+                                QC4SPn6rcvsix6FOqPL56KSQsU0Do+nv75bDEPn53QXWttovJY6g0qECACDIFZjy7jnByY21xhxO
+                                9moSbpAKhbqsYWaFx8YO5dVWy7yFTtmbOkqIIohKwjunKqe1wEtrXUnak6vg3VNhVK0QxfvgBP0E
+                                gE1OdegLV9+qFGK45QphXK0DmzHS5eDZWRA+e4fyh9fBejC3zudjk1KMaPScph8cvpa3ubzykzvy
+                                S3fn+Dmwi170Ee4NADygcli9ueikab63d3eQw8ENPAOB7worp1Z62Bhe2mq5+1XXRuZd0wUbK6VI
+                                aGkQLjne9Rx6dQUs2gYXTBOy4T4o3E8ACI74X77XUlshXHuR0FghSZq7c/EGntJWFN77U+XJ1RB7
+                                cGlzyPsnpGhuMFRX9CWm33fzz/PQV5bG8sdninfmi9yfWAA6EAAwQOfO3fqXHz4nlT0SmraI4Hlu
+                                wzKhYUKlh4lhSbvloaXQ3glnHOOiZDZ2rP9DJwgThsMPH3GNFN4xQfCMk8si/QOAVdfa0SLMW+Tk
+                                +mfnCn5ywXKPJM8I69uFs25QVux0puolzSHvHh8yvF6oyg6MmXcg969nkHlPF3lxSfzNKGYpkB8o
+                                AACkdrTp8e+ZG06qzh65ZMyeesG4SkM9hhUdMQ8vgdZ2OGOycxZZdWJh9ijhQyfCb+bDss0wd6Jr
+                                LhX37FfcSwBYW5bTwgvrlTiCS2YKPcehWOuSQZZsgytuhpU7XE+D9w0POX98yLB6oTIjA2jm7X/l
+                                i8o9TxQ3LF5tfwxsoJcNInoLAA+gMiMXnzrT11J05Dq3lxsrhoHQXGEYFxhWd1oeX6E8sgTeN1uo
+                                TiuxCmqV+grhoplCKoBb5wvjGqAuSULdo7ypT8hyAAAOSklEQVTlIAAQcRk7r7QKLTXCsSMk8XZK
+                                V9Om0IcVO+Cin8Pq7YAPHxuV4uzxIU21QsURIj6gazdbufOx0mPbdult9GGaSG8BYIDOXe16xaVn
+                                pdJH2u/ufAYOBLVpw+SMx5L2mOU7lLtegvNmCHWZpKYu8YePqxdOmwib2117ttDruwiIrTCmWkj7
+                                dDXscSByaenLtsNp/6m0FZwz5+qxaeaMDWiqM4743pE5Jaoqi1ZF9ub7izcBT9CHGQK9BYAAYWx1
+                                5NQWf/boYeaITwPtqRxWpoQZVR6r2yxLtjuv4anjhdG1SmS7Ey5EoKnChZttHzmAtY6d792t1Dl5
+                                hJc3KJf8QmkrQtoTLhsZcuo4R/xsemBt/IMQH4Bb7i+2LlltrwdW0Ic2cb0FgAJeMaJQUykfOuXY
+                                wByNhMw9lUNnIbQX4MXNzkI4bYIwoclZB2WZ31Vr30cdQOTNjiCXtu3q9T74S6V1t9vBK8ekOD1J
+                                4jiSxC/vSWce/bcf515U5b+AnfRhjIzpAwByqqxcujp+YdPWo9uoz/edcjWq0XDF5JBTG3125OHC
+                                65Qn3yjn0A2cnNLkv56BrXnhXdcrG9tBDXxidJpTxhwd4rsaALjjsYLGltuAdvrYK7gvACgCm15Y
+                                HD+0fF2sR3tUi+87JWtEveET09IcV+1TsPDRG5Xn1rje/ANlsqoqvies2amcc72lvehS3i4fmWLO
+                                WP+Is/1uUAq5Avx6XmE98CD9mB/UF89enDgXHrzvqdKmnvLnqIHAE7IZoanOcPW0FKfU+axrh4/d
+                                CBvaSPwAA2OObmxTPvU7ZU2bSwM7pzHgXQnbz6SO9Ml33p9UiN76QIGd7VyXaP7FwwkATZwLyx6a
+                                X3py1cZYjREdFCBIw/B6w8empJhW6bGpDc7+rmKlZxJmf0+Z6+L1tYfg2ZVOJZhZ5XPRhJCmOvfd
+                                R0rb30v26452lfufKa6FLs9fn0fI9dW3HyU+5h995+Z8PvAYFCOCHQiE5nrDRyaG1KWE1na4/Cfq
+                                mk31s35ArYv1//JF5aYnlTiAcRnDVZNSzs5Py1EhfqLUysPzS2zcan+OC/zk6Yfi4/XjUChgN27V
+                                +nEjvOOnjPU0io/+rGgRB4TK0NDeqSzvsKzaDiOq4cQx4ubw9tEMDH3h2TVw5c2K9aEmED51TIaW
+                                YR7Vlc5LeTSeW1Vp61B+eU9+8Yr1+n1gNS70q4ebA4ALMe4AfnLTvPz23XkVGQTdGsrOosqscPHE
+                                kKzvXMC/edG5jfsqoo0Bz4e/u8NxDxUn98c3GqoOY2CnN2dQRHTB8jh6akF8L7AyOf39Ms1Mv+4A
+                                OoBNq9bb6+97suR8Y4OgRst1KnG1iecOD4gFnnoDlmzumzLoQrvC3QuczY/A8NBwwnD/sId0D6L3
+                                IYjmCyrfvTm3Cvh1IpL7na/VXwCUgB25IvPueqzw0vZdlsFSqu0ZIRMK540NHIuP4L7X+nZ7xrhG
+                                FPcudp0/jcCUKo+x9R7plBx5jb/H1mfSwnduzrFxq34L2JiYfvZIAoDkCzuB1YtX25vueLTYaXq2
+                                OD/qSiFUZQ1jMgbrw4PL3Ob15dY2t8OCDYluIcLJTR6VGZeyfrSo7/vCQ/OLMu/p0u3A44d6+g8F
+                                AGVdYCcw76d3FR55aUlE4KODgROIgTCAusCAgdWbQfo4IG9nHtbscuzfMzC1wScM5KgWo27dYfnF
+                                H/Jro5hrgc391fwHCgBlv8Bm4Btf/1nH6o1brXje0fcNlNemokUUsqm+M8lYSfoYQo0nXUMujpbW
+                                b1XlzseKuQXL7XW4WcHtHOLo+EMFQNkv0Aas27iVL3735lzkcgWOnlWg6nruPL6uxOa8RWI4bzpo
+                                3IehrQqVAQyvSaptY+2a8nk0FD9jRBevivUndxQeAO6llwmfh8MPsD9OEAH5dZttXF8jc6a0+AbV
+                                w3paylxGkxm91kJHUVm9y3LvihI3LingRTCyzvUeqK90fXh74wcQcZ3MdnbCkyvcd+wsKmMqDWlv
+                                z5L27mijHJZn9D3RDVut/PW1u9/IF/iHxOYfkNMPAxfT9YAaYGJFmm985+8rz501ydMoGlgHkaoS
+                                W9hdUFbusmzJWbZ3Wrbmlda8ZUde2dKu7MhZxMKH5sDnz4HJja4DN7ZHw6NyGdneY2ETQBmjFCLh
+                                1lfgWw8rG1qhsdrQmBUq00I2ECoDl5vQmDbMaPAYW+N6+QxEyreqYoxo226Vf/jB7h2vLrefBJ4D
+                                ttCLfP8jDQBw3akbgEmZFP99yzeqxg2rNRoPUOJIbJUFrTHXLcizrjPG1+7egZoYpqlQmTsBzp8h
+                                /I8TlYpyo0Z1eYN7zJs6AABIWrsZI9hYsCiLtwh/fF15cZOyZqsb+ZovCGrA+BCrMr3e56unZKhI
+                                D4ipqKVI5T9+lSvd80Tpf+Omgm6gHxG/IwUAcBNQhwMzxzXLT67928oRo5qMJhM/5VBOw4rtls89
+                                1uHaq1ph0jDl7CnCCWNgYiNMbMaNVY1AI6UYyx5j5fcgei8AsMf08HKpV7llWnkUQwlWb1ceWqp8
+                                7WFo7YQZ9R7XnFFBOuyfWHAVvm7Dfj2vEF33u8L3gJ/jqn0PWux5NHSAvf0DJaC4azfLVm6ITz5p
+                                ul+dTR+aSmAVFm6OeGJDhLVu+vjvPgNXnipMb4YRNRAmzRrjOBk3vy90H1JlkBBbd/2o5DqC2xjq
+                                MsrIGvjtq7C9E2KE94wJkiaR0mfig1KZNfz0rrz88LbCjcBPDxfxDwcASJSTArBrwxbdsGxdfNq7
+                                54QZz7gCiv6AQBVqfcOqHTFrOi226Pz05yQFInsPmN57osgehzqh6wHHvvcAQLnSt+v9yeAKT8AP
+                                4J7F8Je3wLJtLlj0d1PTDK8xpIK+1wGIKKlQ9IbbCvLj2ws3AdclSl/bQCl9h1sE9DQvK4FRwIVz
+                                pvtf+vL/zNQNqzf9ihyqKvkibNtpeXZtxEOtJTa3W2wIFx6nnDwOJjZBZej69HjGJYKWp3AK3aKg
+                                S3tnT9avPQc0xq4DSGxdVlHJusYVuwuwZies2AKvtirPrhTSJaiuFI6r8XnXKFfvX1fVt3hBwvax
+                                Fm5/pGi//5v8b6OY7+ACPTsGyuQ7kgAoc5cyCM6cNcn7ly98JDNmcj/Dx3HSb3d3p7Jrt7KhzbJu
+                                V8y2DmVzp2VbUYkDJZt2MfzQcwDwZM/UTt3r356+S1ueSYCLJBZj1+W8UEra10VuElh92mn+9Rlh
+                                eKUwutqjKusqgLIZIfB6bwkkhSaaDuG63xXkv+/N/3cp4jpgFa7RU+kw0uiwp/Z6uKbFo4ATxg43
+                                X/3m57LHjB3uqWr/OEEcu9ayhaLjCoWSki8ohZLuMY9wIJw2sg9R0bOUPRW6hk5h4Nq7+P6+B0Qc
+                                jPi+B1/5Uaf88ZnSdcAvE7ZfTvHirQyAMgiyQDMwI5vi3772mexxpxwbYAS1/QSCJs6fWBOWbZPU
+                                r8PprktG5JmyeCm/pG8af1nZM0Zo3W659le59ideia4F/gCswcVYIo5AYOVIObYNrov6MGC87/GJ
+                                y94dXv7xi9Imm5ZDLjLp6RU87Bsmh+b5c/cqZNPoE69Ect1vc8uXrLbfxlX0lH38pSNElyNa3SG4
+                                bur1wFjg3OOmeF/4+mey1XXVrtKo3OH47brKLD/w4Ybb8nLjPYVHreX/JsreJvqZ2DnYzMCDmYh5
+                                XC7Bhk3bdP7vHy5OGd1sGkY0eCYVOA/IYQ4jHFmi0/VA6hmRlRtjueYXubY7Hi39UJXrgDcS4ncc
+                                Djt/sAGgDIJiAoIdUcyTD8+P8qs3xeOHNZiKMcOMOGXu7YECAcJAtDOv8vO7C9xwe/7RhcvtfwDz
+                                Ek2/3xm9bzURsC+9IAXUAiOByZ7h05ecFb7zc5dlCHw0HgTZxv1n9862N0Z4+tWIb9+U27Jhq/2W
+                                tTyXePa2Jqc+OtoAPdrf7ydWQlMChLm1VXzyc5dlxp40zQ+a6gxJM1IZ7FyhLOONQXJ5ZfUmy2/+
+                                VNg+7+nSQ8DPEiWvFZfKVTwaLH+wAaAnNwiBqsRSGAG8e8YE790nT/ePf8/ckGNGG4olNLYqyVyc
+                                QXPSk1RtwgAtllQeeK7E4y+Vtjz2cvRgscQfgYWJnN+Ji+bFDJIs2sF2nLzEUqhOOMIoY5hakeEj
+                                Z8wOT/zL96aYOMpoKXZ61dHmCOXevJ6BYknl7sdL/Pr+fNvmHXpLKeLBxKZvTZw6nQm7t4Npwwcj
+                                P5UeQKjC5Rg0AZOB9x8/xZtz8Zlh1fTxXlhfbah0U03Vjd3pf8CpN/K8zHlEoBQ5l/SWHaoPPF/s
+                                uOvR4rrdOe4DHsAlbWxJWH0nvWzbOgSAfQMhxMUUahIwNAOnDKuTmdNavGkTRnvjjxntyaxJHiMa
+                                DQIaxXRZEiAHjvwd0IBzgSXPQz2DdBZgyaqI11ZaVq6Pd72xLl66YHm8EHgZeDVR7HYkzpzcYDzx
+                                byUA9LxHkyiLZa5QkziUmkQYlk4x2zdySnODTJs92U8fN9ln5kSPpnrjmkV0KZHdEb83bYJ0j7Ax
+                                yWSyjpyyfG3MgmUxryyLWbIm2tCZ11eKJZ4ulngDF6zZksj2tkSrLw4mGf92AMD+uEIKF2iqTEBR
+                                RXf08VjgGM8wZlyz1I8c5gVNteINq/e8hhrxaivFJKPWKZZUc0XVjhzxzna1rTtsvHGLjddssp07
+                                2nVD4qVbkihyHYm3ri055R3JSS8kRLdvFcK/VQGwt+VQ5gxh8krjYg7ZHj+neoiQ6uSV7nGdKDm1
+                                uYSg7cnJLiYOmnzyt1wPYheSz5UDNvpW3cS3i+tdeoiKMijKr6DHz16Pf3sKe5uc4LgHYcuvUo+/
+                                2bfiKf9zAMD+nkv2AZC9/7Z3SujeL95OBB9aQ2toDa2hNbSG1tAaWkOL/x9rLN0eoKc8bQAAAABJ
+                                RU5ErkJggg==</field>
         </record>
 
         <record id="badge_problem_solver" model="gamification.badge">
@@ -625,8 +615,7 @@
                                 xS55x8zlXX2219YToT5/lg0a9urAhnfYEGcePO2v6I1/NRjAlYwhCoFjP3gshWyiFIwjA3aErGIc
                                 GA6vJwOf2Qyko6t4LMNcCNz6Yov9Rzs8Bv+uH9CZV8tpfzUbwJWMYTBuGHwkA8+jAcNZlwkaKE65
                                 gc0swvN84Hkx8HqfhWsHClyv2iV49a/BsVryoocaMJTBnxsci+wucttm4O/sJV53/BNagn9aS1zj
-                                c3eZ58/32vV1fV1f19f1dX1dX9fX9XV9XV/X1/V1fb0a1/8He8q//0YPCp0AAAAASUVORK5CYII=
-            </field>
+                                c3eZ58/32vV1fV1f19f1dX1dX9fX9XV9XV/X1/V1fb0a1/8He8q//0YPCp0AAAAASUVORK5CYII=</field>
         </record>
     </data>
 </openerp>

From 6aee67db9fd9f1268cc5393a4ac20f15b50d7c16 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 10:51:46 +0100
Subject: [PATCH 227/547] [ADD] brilliant badge

bzr revid: mat@openerp.com-20130329095146-5g7hy3gmn6hoju90
---
 addons/gamification/badge_data.xml | 267 +++++++++++++++++++++++++++++
 1 file changed, 267 insertions(+)

diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index d04dca39a56..6351f3772c6 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -617,5 +617,272 @@
                                 gc0swvN84Hkx8HqfhWsHClyv2iV49a/BsVryoocaMJTBnxsci+wucttm4O/sJV53/BNagn9aS1zj
                                 c3eZ58/32vV1fV1f19f1dX1dX9fX9XV9XV/X1/V1fb0a1/8He8q//0YPCp0AAAAASUVORK5CYII=</field>
         </record>
+
+        <record id="badge_idea" model="gamification.badge">
+            <field name="name">Brilliant</field>
+            <field name="description">With your brilliant ideas, you are an inspiration to others.</field>
+            <field name="rule_auth">everyone</field>
+            <field name="rule_automatic">manual</field>
+            <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QAvQBcABUZb0TlAAAACXBI
+                                WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMdCTAQSodN2wAAIABJREFUeNrsvXmUbVd93/nZe5/x
+                                zlPN9eZRehqRkBACZGywmWwwNnjAcXDbTsftOEknbnevtnt5OXHshHjICrEhcRaJzdDGYIyZBEgI
+                                DJLQLCG9eX41j7du3fmeYe/+49yq9yQG6UlV9QT99lpn1V3vVd177vl99+/3/Y0brq6r6+q6uq6u
+                                q+vqurqurqvr6rq6rq6r6+q6uq6uq+vq+sFf4ur3/7ZlrgLgB2P5QBbIOpIbPYsbLCmuk4KDAnYK
+                                KdLP/QOtzaKBGWO4EBtzMoh4phPzGLAKtIAGEF8FwMv3uxwC/lfgna8csfOvHnecW0YdO+9KpBBY
+                                EqQAJUCIb//q2hi0AW0g1hAbQy+GYwtB/NhcENw/0QtWenwL+Evgw30w6KsAuHJrFPiVsYx8w2u2
+                                ubdeM2D7e4oW2/MKCcQmuYwx31Hgz7eMASEMUoh14FS7mnMrMSerIU/NBWcemAofBv4a+EIfDOYq
+                                ADZf6K/bVZC/c6jiHHr3tSn2lS3Ti4yI9IsT9OUDI/kcRyWa4vOnunzhTIep1ejPVgM+BHzr+8VU
+                                fD8BYAD4zBt3ua/6zVdlsZQwxhixFQJ/oYCwJOaLZ3rijx+qd4OYXwY+AUQvZ63w/QCAt2Zs/uS3
+                                Xp3bf9OwTc6RJjaIF6vWNxsIUghjQJytRXz46Vbt6xPBJ4F/BgQvRyC8nAHwI3sK6o/efsC/6V3X
+                                pkwnNOgN3vHGGB6bjqn4mu1FGyU35r1Nn0CkbGmOL4fifzzV0t+YDH4f+COg+XICwssRAIWUxad+
+                                +ebM6991jW+CePM2+qnFAK9yLccnZrltuEHWEcgN/jBjDEoK5pox/9d9NX1hVf8k8MW+RrgKgOes
+                                P/6Za/1/8Us3ppWthAEjNusWjTE8MmczOryTIIroVE9yoGJjq817JMYYztYi/re7a7OR5k7gwpV2
+                                I9XLRPCHxrLyvj94ff7tP77fFwZEous3TxjaQNWUsC0HKSXTy8sMZQSO2tw9UfKV+blDqWwYm39+
+                                ZDHKAV+7kiB4OQDgvW/a4375A28uDRQ8KRJPbvMVU72r6ahBqtVlMuk0F5aajKRjfFtsms3pv68Q
+                                wB3jLreNOnc8MtP7yXbI3UD9SnCDK2oClODrf/7m4mv3lSx0wpy2zI//h/MRe3ddyzOHjzA6OkKs
+                                HKzeBa4pb64ZeI7raJRA/O/31HhyLnwrcA8Q/v9BAwxsz8kT/+2txeu35Syzxu63yq2LtGEhHiDo
+                                dmg2G4RhyPbRYc7OLDKel1sCgDVtoI3hTXt8U3Dlex6eCQaBe/uxgx9YANx626hz9P1vKhR8K5H6
+                                Vvvzta7ByYxxfmICx7bRWpPN5Wj0IkpugGdtHRiFEBhjxHWDttmZt269f6J3rYbPbxUI5BYL/65X
+                                jzmPvu9H8pbZIlv/ndZsUyCkoNVq4TgOxhiCICCdytIITN8cbaEdFoJII16zzeFDP156p4T7gfxW
+                                mOitBMA/ftc1/tf+7evzJr6Cwo+1YaHr0+n2CMMQ27YBqFarDBVzPD3TI7xCUXwhBGM5Zf76neWb
+                                gGeA0mbLaKsA8PP/+IbU//yXt2eNMVeWeC40Y0YHBzl+/gKObZFOJ2UBrVYLYQzSztGJDMZcsWCd
+                                qKSk+bt3lcezDt8Aipspp60AwOt+8oD30V+9OW06obni4fv5tiLl2Kwsr+A6NuVyGcdxEEKwUqux
+                                Y2iQlU685WbgWR4CiJwrzUfeUb4mbXMPkNssc7DZAHjlnePOP/z6rRl68ZXP3WhjiGSWRruDKwXZ
+                                bA6tNYODgwC0221sJVlqG4IrXOZhjBEZR5oPvKV0M/BVILMZINhMAKTvHHe++gc/nDcvl6xdpEHY
+                                aeaWVnBsRbFYZHV1lUwmgxCCTqeDpSQTNeiEV9QMrLuJ23LK/NmbCjcB7wdS3y9uoBxKiQv/6ceK
+                                pSvJ9p+7Hp7oMjI0zhNHT5D3HQYGBjDGEEURnU6HMAxxHAdpuaRkm1y/lOyKagIQg2llXEvc9Phs
+                                OMsGF5tsigZwFZ/64NtKw9+t9u6KsH9j6Moiq602OorwfR8hJVJKjDF4nodUikajwWgpx8SqJnyZ
+                                VPvF2oifO5Qyd+1w3w9cA1gvZwD80h+8Pv/2nCMNLwfhCwFC0oslY0MDzCyuUEi7lCsVpFIIpZCW
+                                Ra5QQCmFTgoB6RqPbmTQCK709xBCEGsjfu91OQZT4nMb6R5uNAC2/dge90O3jDhJudYVFrqQEoQE
+                                IVjsCjzPp9Ftk8/lSGWzKNsmBoRSeKkUbiqFtCwQEtvP0Qg0SNV/j4vvdcVAYOB9byiMAR8E0i87
+                                DpB1ePSDbymVwitl9/uCT36KRHjSItaab1V9BiuDnJ+aZnigTKFcxrIdwjjC9XyQEsuyieIYISWl
+                                Qp6FRpOhnIOSEtPPTgvWqoWvDBBKnjRScM2T8+ETwJmXygc2UgP8xvt+pLA/1FcoxbgmeClBWWDZ
+                                COUgbJuuSjMysoPZWp1isUChUsFNpXHTaWzPx8/lsH2PfLmMn8kQC8jmc3RUgVC6GNsBaSOUjZE2
+                                KAVCYK6AeYgN4j3Xp82OnPwQUH6pMtwoDTD02m3uV951bcqYrZb/pbteKpAKIW1QNsJ2wHJZCF3K
+                                w9s5O7tAOZdmaGQ0Eb7vExlNtlBAI0hns/SiEMu28fwUru/jqhDfsRB9oSMEQrAufGH697CFqXxj
+                                jLhx2HE/c7I7QJJCDq4oALIOH/yLt5Wuj/UWl2mvpZClxEgLqaxkpzoOwnYRtge2z7LJkylUqDab
+                                DA8NUBoaxEn5OL6HFlAol4kxZPN5hJQI28JxPdKZLJ2wTca1kSrhAGINbEb0M3n98MwWIl8IwWBK
+                                mpWOPnR8OfooUONFVhVtBABe+Y4D/vtvHra3TvjPsvX9Xa8ssByE4yFsL/nppYiVT5AaxvEdImJG
+                                x4bIFQu4aQ837aFc1QdARDafxc+mkm4gS1IsFZlabVHMOFjKSsxL/3MTLdC/lzW9t4XcINZG7ClZ
+                                6pPHOncCHwe6VwQABVf8v//pxwo7tNlC4a+xMalAKYTlIOxk12O5CM9H+mlkKsUKDuPbd7LYblIq
+                                ZRneth03owjjCXq9kwS9EwTBWWI9j+1GpLI57FQey1GkMymk7eLYGttRCGlhpEo+W8j+ljd9Usi6
+                                STBGbzoQhBDkHGkcxdDjc+EXgNkXQwhf6l3u+Ve3Z06/bZ+/dRZw7cH37T2yb+sdF2G7SMdDej7K
+                                9xGeS40cY2M7OX3hEWx9nl77LEGnQT6vSGUreH4WhCQMu7SbyzRWWsRIUtm95PLXUiq/grnZc/im
+                                C90ucbeD7nYxvS6EPUzQxUQBIo5AR6Bj0EmL4GZvCWMMsYGf/MTSA+2QdwDLl0tGXmpE6Qtv2OVt
+                                ofDFdxS+sD1w3ETwKR/lp1G+j0qlyEvJuZPvxwTz+PkyN93+asb3vw7jDWCIQBiQFkL5CCsHQlGd
+                                +DonHv8cC9NfYm767ymN/Di2P4RxbIRjEVsKrSRxR6w/bvPc3aQ3v09UCIElMHeOu3fec673SuAr
+                                l0sIXwpIR37j1szET13jq3grcvxrvn3f5mNZCMtNbL3rIv0UMuVjpdMoP42VSjE1+TlazSn279nO
+                                odvfg/AKyN7TyM59YBbA0qB04kjJPq+QOUzqbZjse0BbzB77CA998X8gVZ7tu36WuNsjaneI2y10
+                                u4PuttHdLgQdiEKIQoSOwMSgDWILtocl4a6/Wvwc8F6gejnIe9GCy9j88d/8VOVfOWoLiE+f7Rsh
+                                QVqJH245SCdR89JPoVIpVCaNlcpgnJiJs58m5Qa86nXvJlfeDvXPIqLDCCuGzCgmdT3C3QYqk4BK
+                                hKBXIT4HvSdANzHOzZD9TYJwmMP3/i6nnn6Ake1vwXNGiRt1olYT3emg2y10t4sIAkzYgzhE6BhM
+                                nABgE7OKxoCS8If316Mvn+vdAJzmMiqLXywJVLuL1t0/ccDfGta7xviVQkjVZ/su0nORvo9MJzvf
+                                ymTA1Zw7+deMjpR4/Zt/DdtMo6r/DZw2ovw6GPlnUHgbwr8G7FFQA8klB8DaBvaN4L8FnEMQnUS0
+                                /xylBKM3/3tcp8XJJz6BmynhpQYxxmBMX9Ubc8nPS9R/X/hiExWjNoaMI+WXz/YUSaNJb7MB8I9+
+                                93W5nxxIb0FRcZ/1GykRUmGUjbQdhOsg/YTsqXQaO5NB+hZnTnyU3bu28crX/Cws/S0yeAAGfwQx
+                                9puQPgCW0xeOvOhRrEX0DAknIASRRdg3QHgcwqeg8ykK+/6c8mCOIw/+FenCNmwng9E6qRvQGkxy
+                                GW3AaCQmeb9NjhEIIdhdtMzHj7R2BZqPkoyyMZsGgG05+Ye/cVt2bxhvQeBnPcpnIaSFtO1E+K6H
+                                8D1UKoWVTmHnCpw7/TcMln1ufe3PIRb/BinOYnb9DiJ/J6j4op1f4xOIb0/wiOeAz7kJET2N0C1M
+                                +6/J7voT/JTFqSc+SnHoFQgERsf9S4MxmDhOdn58CTAuEdZzmfx3Ve/9SxuIYkMvMjQDTaOr0cZg
+                                q4vl67FBlH3p3T8Z/C0wzwssK38xXoC4ZcR9cy/69i6e44sxK0EKRMIKpUi+giVAiYQQGQxKCETi
+                                MKP6c3sEa79rMAKk0STBN4lUCmWB7UhcBZYWOEph2zbCc1Fpn+ryEwjT4lWv/V+QK19EyhnY8x8Q
+                                buGi8M3ajpcXBWzWwrgWiDVhiYvqW/hgXYcJjiJFD7P4U+x79VdYvPAIMxc+zfD2n0YHhl4PugJ6
+                                kSCMJGHHJugFEEdEkUZrQ6R1wjcMaAxSJJnGRMgCKWSi7YRMnq1QKCnWR9QYY9A6Rgr4+4fP8qN7
+                                LW4ccbCkINaGm4cdaUneG2mO9c2A2QwA/OLtow7aPHvjBJHmyTnBjTuL6xMzjDGEYbiOZoRAyrUk
+                                CkiRZNm0TL6wFIJICKSUaCkw668VoVSEjkXo2tieTdfySNk+ws3g+Bnmjz3Ea17zQ6hoCRkchj3/
+                                GtwsqDDxGnQfaWu73vSFby6J5q2DI764B7XBOLcjojMYYyNMDb3ye9zy9g/zuT+5FkvU8Muj2CqN
+                                JdMI0ULTJoi6RFGXWEfEIkITExGjI00UxYRRTKxjtNGYWBPFMRhNbAxhFBPFMXEco9C4UlCpVLj2
+                                2muZm5sjjGPCKOR8zXBgwCbjJJqg5EtcyS9Emj/sh4fjzQDAb9wx7hA/B1uRgcnFKq1uwGuv3UWs
+                                DdVqlXQ6TaPZZHJmlkgn9Ej2XRdjIO7vNnMJXKWQSClQEhxl4Tg2juuQyvlkC2mypRz5Ug4nZbCU
+                                y9Lk3QwOlBkd249Y+hBm+EcR6b0go+TTzJqNV0k4V4vncIA+J0Cv2+x1LSBAiCG0KCLpYIxAtD6B
+                                k/019t/2Hk4/9nfkh99JbXmR1eVV6tUGjZUGzXqL9mqHsNfDhBE6jjFGo3VC2tYUkFoncsm1ZhHy
+                                +QyjY+N0ux3arRaVSoXFxUVqrS73HzlNFBuGcz6xvjiiRglh3rIv5X7iWPtGYAbobDQA7DvH7R2W
+                                xMTxs3mNFII3HszyjdMt7n7sGLfs285ApcJKrUa302H76Ai24/SBsQzJOJV1VWu4GFZNFESCaqkU
+                                yrZxfAffd3E8B8e1sRwLx1UIZajXznDrrXdgeheQTgjF14Ls9Xe8uqjqhUiEL2Ty70ZetPkiyY4b
+                                o/saIkruo39vQg2g46WLGcDqb3L9j36cEw//TyxRJZf1kXGMbcCXkqzj0vV7BJ0QHUVorRFrmhFQ
+                                /XI0y7LwPA/btnEch1QqxeTkJN1ul+WlRXzfZ+fOnUgMD5+a4OTMMsWcwx2DDgMpiXtJG5sB8XPX
+                                +XziWPtWkkriDQeA/6N7/GIYfzupdRTsKtlYB7M8PdXmm4fPsHfbIAfGh0in01SrVRr1OkopXnHT
+                                TXS7XXq93sWbN+aiqbiUMEmJsiwc38ZLu3hZj1Q+RTqfIV3M4qQ0UdhhdHwfsv5hyI2CWwQZgLEv
+                                Eb7sC1xhUAgkRva5wPocin7gxujklQgxQpH0rLsg/MR8SQHRLJiAwZ13EdRPMTTyBjKpFu1Uk3a2
+                                TbfZodvo0W2HxGECAmNMQhSFSHwPIbAsC8dx8DyPXq/HyZMn6fUSL65cLlMpl5larPLA8Qv0wohd
+                                wz67ijbjOcVwWuKoZxPKii/NYEq8ZqFtPkgy4PJ7Zgkvq5jAFty1u2Cp+DswVykEOVewq6C4Y1ea
+                                V+7PsrK0yD1PHAMhGRwcJJvNYozh+PHjNBoNcrnc+o2LSx6K6hM8y7ZxbAfXdfBSHl7aI5X2SWfS
+                                pLIpMtksjdUTDA+P4cgmwmpD4dUgurAmqHUXT/YJmEIImQSVjARhJ8ElkVwahV7zOIyNMFYCGh0j
+                                pI/Ax4gk92G6DzC05420m7NYjsKyJMpWKEsilURaMkkgrtUOCEHU1wbGGGSf+yilmJub49ixY/R6
+                                PZRS7Nmzh5Tv8+jpSR4+ehojDa/Yleb6IYeDZYttOUXKfvZIm7Uew7Gsuomkt/B5vbzLAoCU/HzW
+                                /e6ds1II0rZgPKe4dsDmpj1ZxvKSh54+yonpRSqlIoODgwghWFpa4ty5c7iui2VZ6xpASEmv26Ve
+                                rxP0ehiSB2VJiVIKZank4UqJcixWlo4xNr4HE8+AC3hDlwRh+gAwqi/8NcFbCGEjhIPAQmAjcBBm
+                                7d8Umr6mMBboBka4GHyE9EF4gA/tuxnc9cP0OlWElFi2wnEdHDeZOtLrdamt1qjVV9eFXl1ZIYqi
+                                pO6gT5RPnz7N3NwcxhiKxSLj4+OsNls8cOQ0Ry7MUi773LbDZ3/JYl/JopKSOOo7y8EA2/JWFhgC
+                                7A01ARJ+ImOL5w1KOAoqvsS3bHKe5MxiwNT8PA80GtywZzujoyNUqyu0Wi3Onj3L0FBiJrrdLug+
+                                IyYhS61Wi06vTTu0yZJBuQI3dhNXU0KnuUixfCdGnkHYgOpHXdb5hbhoBqREYGFY0wQKQ9/1AhAK
+                                QZx4DCQcQAuDCJcRIosxnXW6aoSG3tPkhg4RBYY4Dmh3WqxUV2jWmoTtCMexKVdKzC/UODc5jYkj
+                                hgcqOLaNUopms8ni4mISkFGKSqWC77kcnZzjyPlZlKu4aWea0azFeFYlLP8FhN6vG7D5zMnuncBj
+                                QHujAJDeV7ZTSgqjX0DyR0lB1klYfNqWlLI2F2ZafOPJY9x8cDcDpTKpVIpqtcr8/Dye57Ft2zZ6
+                                vR6ZdJpOt8vZC5Ok8zl2bBulNJDD9izCKKTRqoML0k1cNsvzQHYSDaBngT19965fwEG/VtCoflWP
+                                wvTVvTD9Sh/67N9IkHFC9CCJ6es2SA+hExsuhAYRoXUDS2UA6AXtpJi0XCbjZ1mar3L85AQTE7OU
+                                HJed46Pr6lopxcz0NEEQIITA8zwGBgZodXt88YmTBN02lZLH7rLNWFYxklFkHIH1AsfYXVOxAW4E
+                                vEvcnJcMgPGbhmwup7tXCIFnwVBakrIFWSdDZjlg8txZTrkZXntoL67rsri4SLfb5cyZMwyPjJDy
+                                fRCCQwf3o4HZ+TmOzc4wNFzi4N5tlItlUoUMqWwmidUoCbYBS0DwJLh39VW/uCh8ZD/oogALYxRC
+                                2BcBAhhhEFwSCMJAdB6E2w8KGRARxsRJ0Agv+R0J2WweohZnpqeYmFqgubxKyXW4/dAB4kAThxFK
+                                SlZrNVZqtYQMAoODg7iOzem5KjMz0zRCODCWZiyjGM8pyimFq7isDqW9JYtkF5B6TmDjJQFg+NCA
+                                zYtZSgpyLrjKImMLLviKqbk2X3/iGfbu3MHo8DD1RoOVlRVmZ2bI5XIMDg0RRhG2UuzfvQtpQyPq
+                                cW5mjsVem7GxAcbthNDFaHBsUA7QAr0IYugiw+nvfGMkyETtJyHcvvspZN/dS+IByaxPCxPNJN5C
+                                olqSnY+LMVFiKoTfz/3D9OIyC7NL9Lpttpdz2MUiYSei0+yiwyRqNj8/T6fTQWtNyvcpFgrECB4+
+                                fp7J5TqFgsstIw7juWTX59wXvuufSwXKvsgtd4z/fHmoywHAwIGy9aKz21IIPMswnEnYa97Lcm6h
+                                y4nTZ6kODrJ/fJBR32dxaYl6o0Gn22VsfBzLUsSxxvFdxsp5/IxHV/cIwpDF2irKydFsNigOFTCx
+                                gxAeJngS4b31YmSvX8UrEOtt35rEFGAkJk4EZNbKuSQQzoPuYozdDxGHGGMhcDAEiRaQAwTdBYQE
+                                yxhGS3lEtkC73qG92l5n+r1ewPzMDLof+yhVKqRTKaardR47fhakYN94irFswu4rKYlnvfihlVob
+                                saNgpZY7ofd8RP9yADBSTknTi158AkgIga2g6CdfMOv4FLI2c7OLfPWpKnfdcIDhoSHq9Tqtdpup
+                                yUkK5TIjo0NJ+VMcE2tNPpcnU8qiPIv53m5mJyfZfu1eaB/BGAcRz0B0AuxDieDXKnj7O19rA1Kg
+                                Y03f+STWOomkmJCoO4mlBAKFwUYSo42VaBIsDBZohfRvpjb3NI7rUi4UaK+2affaSTZQG5SymJud
+                                pN3oghA4ts3w0BA6jvn60fPo9iqpjLNu60ezirz70odUaQPDKekmrsr3dgVfsBuYtRndqE5fKQQp
+                                WzCaVRys2OzbmWNbQfHE4aMcmZynXCwyPDwMQrBaqzE5OZUIzQhMnAhKRwbHdti289VcOHGYSOzD
+                                YGOEhcHDhMcxwWEEQeIFNL4B3aN9M2Anc95ZC8EaTNQg7s0QdqdB2Jj6BeTs/4lYPYXWdn+vJN4D
+                                xkZriUy/kfnTX8JND6AjjY4NJtbYlk2702FqcpIwiIjjmEqlwvjoKNPVBvc/dZTl2iqpvMv1Iy4H
+                                Kza7ixZFb2MmlGkDlQQAzoZpgKwrhzeyrmXNXSz7Et8SZJ0U55YV84vzfKPZ4oY929mxfTvL1RU6
+                                7Q7Tk1OMbBvBTVXQsQat0UGMlfJQSjF9eorxHa9HREf6kT6Fiecx3SZCDiKiL0InjWx+Cq0Oou09
+                                GLENLTNobTBGQBxDbw6r9yBW/FmIHYw3moSqjcLEAiEUWltJvYCzi9lTX6JQPEgcxX39IpibmWVl
+                                pUYURti2w9D2YWKtefz0BBemZxGuxXXbU4xmFeNZRd6T2HLjKqv6AHD6AFAbAoCULYY2o7JJSUHG
+                                AUcp0o5HMW0zudDl4WeOccPBfYwNVohjTbW+xNLiIpGJ2O5vJ440URghQkGxcgPHHvk64/v/KSY6
+                                izB9lo+FkW7CW6whhDiPjm+D1qeQpoU0BjTouNBPB9QQNmgsTFCCwRG0lUXokKTmQyCFwmiDyryG
+                                xtIZVmYPM3Tj61FGsLJaZWZyhnarg4kMuWwe302zWm9x32OH0XHI8GCK0YxkPGete0cbNaV8HQAY
+                                Cp6SGwoAJbDZpCWEwLVgMCVJWYK045OqOcxMnOfM3DJvuOUQOwu7WFpZoNVsMXlhgjExjuM5hN2Q
+                                bPFGps99kie/9iA3vOZnUcHn+/Zb9P18A/btEEyivYNo73XoKIJgGdk7hRDToEO0GCBSB8Hbi5f+
+                                7xj2g07cw6TWQ6JRYO9B5d7E1/7kGvIDd9BpNmmuNKhXV4mCEBNrBitDEBu+9tQZmotzaAU7BnxG
+                                05LxnKLoJXH8zSioMUasUX9rowAg2ILOJyUFWRd2KousI5j0FXPVDvc9/CQHD+xj/84x2kGbRqvO
+                                3PQMURwyMDpEEHbYse/tnH7qw1TGDzG+562Yzj8k9YNG9IXoIygjommwhjHCw9jbiazdaC3RRiDQ
+                                aB3hsAJxRGzfkVT0iKTc32iJ5RRwh36Vxz/3z7GtFLa7g1a9TrvZodsJ8ByfQrrE1FyNpw6fYrHa
+                                IJOxuTZjGM9bDKckaedFu3cvcEOtzzqUl8jOvORcwFYsuR48UuwvKfYN2QzmFadPneDRI2exlMv4
+                                2DZMBCtLK8xOTdNtB+jI5dAtv8Ijn/lDZi70wP8JtE58f2PWagF2QLTcL9k3iSunQzA90B101MUS
+                                Ghkewcj9GFJJjl4rokiDLOAO/wqH7/s3TD3zScZ3vo1us0OvHRIFMcV8Ed9Nc2pigUeePEK11WW8
+                                JDk0aHGw4rA9q8i6myv8tf0avUB7/YIBEJkXXmm6ESbBVoKCJ9lVcjgwZLNj2CdcXeQrD3+LZr3D
+                                0OAIvpui3ejQbXZp1OrYqsC2a3+eh//ut5k+X8N4bySOzbom1PaNoCMkHQRxvyxN9ws4Y5QEo3tI
+                                oYnFQUwMBpswNGiypMd/icc+8+uceui/cujmX2N5uUbQCRBGks8UMJHgnkePcPzUWdyUw4Ehl4ND
+                                KfYUFANphWexJTOHBBDE31Zn85IAYBo9Pb3VMxGUAN+CkbRgb0kxVrEpe4ZHn/gWjx05S9bLUC4M
+                                0G12WK2u0m50yPojjO//aR797G/T7eXQokIcgzYKZI5eVCZoTyOVj5Q2UimkVEhpY1kOSik6HU0s
+                                RpKwcazo9gL88p1MHP5bpo9+lh37foZuq8vM3AqenSLlZTgxsci9Dz5Jq9Uml3XYmZPsKwi2ZQV5
+                                V2LJrWsfFwIaQRz1Q8AbAgAW2ua8FJitHp0m+oWiBQd25iW7i5Ji1qK5MMuD3zpJHMQ06x267YD5
+                                2TmUUVj2EOXhV3H0oc8grDHiOE5iCAgiMUirWQdhI5WPstNYdhrLSiNkmubqJN0wjZAlEBbtboCO
+                                YtzsHp64+/9hePuPYwmP1VqT2mqb6nKNsBNx+NQFYmDIk+zMCHbnBYMpiadAcLEaaGvMKNQ6JuTi
+                                wZZmI+oBJhvB1h/TtsZgLGFIKc1IRrArJ8jKHlnXo7q0QrveJu7G1KsNOs0ulnCQ1jCN+ira+Ggt
+                                CKMYjMRyR2k0ekmsQLoI4SKkC9IFIVlensNOXQdI2p2QOOrnErCTv9MuxJKJmUVEp0dtsUqn1WXf
+                                8ABDnmFPSTKWFuRtsGRSJi62eNNIAYstHSQ57e9dGHo5AFg8XY24MsusP0hHGkouSGUxki9w5sRZ
+                                gk6Ia6fotQIunJvAlh6OU2Rm4jjYO/vhXkXRUnzjAAAZNklEQVQUG2yvTC/0WJg9h5AWQiZt30Ip
+                                mo0VeoGP7Q7R6gVoLVDSxksNEUVtWoGF7+WZnV+hUa0zUh4g6ERcODfBtmKZtNRU3ASoUuikN1CY
+                                i+VtWwiAmVbcJWkU1RuVC1g+uxJx3YC95eeaJIOZ9HpBpgS0zNJptanXGni+j+ekUY5Ls95kfnaR
+                                ke1j1Bo96rU6+dQedDCHjtuEscbxixw/fhjlZohig9YaJRRTE2cIux16vZUkyytsbCeDldvJ/OQR
+                                pD1EtxUyMT1P1nbJeFminma1sUIpW6EbKkzUQ1gJuRRi63c/gCWEObsSdUh6AzZMAyycrcVXbGSe
+                                ECJ5mCZpssim8ywsLvVj7x46NKScLJZ0mZmeY7XWYdv4Ldz/lc8ivWtotxss1RaYnDtFN26ysrrC
+                                4sIxer3ztLtTVBsTHD52jFq3zakLzzC/NEO9vkB1+Qzp8jV8876PMzJ0PcfPTeNpQT5bptcJsZVD
+                                s96g02qirTytbq9fNHJR+FttNtuhEZ2IFZKpIRsGgLlnFkK4gocein4Dx9G5Dtl0ivOTkwjAdz2C
+                                bkgcaAZKw3iWz8TENNuGD3DqxAkefvBhVOHNDA7G7Nlls39fFsf1CDWMjA8wsm0AZTsoN89tr3sV
+                                Ow7uR/o255cFY9e9lyceuocTR56m03Www5hSfoA4hHazQzaTxcQxJ06eYudAibO1pLmDKyR8gGPL
+                                ISQj5LpsYFVwNNOIpoPYXNGxmcbAfDfD6mqddjM58UNJSRgEBL0esQbXzuBKF89O8+pbX88XPn83
+                                Tz72BF7pF8A6hBQBr7h1B4NDuX5Tr2BgMM+rXnN9/zNihne+grve8F5OHj/CJz7yF9xy7R2klIMU
+                                DjqGsBcQBSEZP4WSknq9TrPZRLhlepG+YsIHOLIYARwjqQf8nhtWXZ5tYffb9vu3+daVw8ByW+Pm
+                                xjl+bgLikKGBAdKZNKLfP2DZNiurNSqDIyjX45vPHOHC3BxTk1WqyzXGd72KTPkuUukcqVQmqeoR
+                                aSy7QDa/Dc/fT3ngh4EBvnrPF/jExz7Kwb17GSuW8YRFbXmJXquJNBB2u0RBovLrtRUsxyGVziHD
+                                FbLOlRs0/aljHc6txh8kmRXQ2CgSaALNR+o9/etF78pFkBdaglTJYrnWYDBtk06l0Fqj46T9am52
+                                Fj+Xw3UcJmZnOXziLGN7HF55R5aHH5ji6w98gOuuG+Ktb/shKoO3I2wPW1j9bF/M8vIUn/zkf+XR
+                                h47juBYTUxPsGi4yoxSDjkXKTzG3uEjW99FxRNDrkctmUVJyYWKKO2+/lSeOxVR2K/wr8JikgNlm
+                                NNsX/PNODrussnADpx6d7nV3FywvvgJMINaGqaZPxWoQhyHpVD4Z8BzHxLFGa02zUWdk2zam5xcI
+                                XY9MyqO63MW2Ne/+hX1IOcjDDy3we//uc0gBrmcn4SatCYIIY2DHjhSveOUQcdQkDEqcPHeenZUy
+                                xyem2JZN4dgOtWqVtOetN7XYtk2j3WBhaZmhoe00gmlcS22pFjDGYClhztXioyQHUT5vh/DltoY1
+                                P32iu/qLN2bcdrj1XOB8NWT74CjfPHyCjCNIZ5KSbKM1SkrmZmcZGh9nuVZntt3l4N6d/Oq738W/
+                                /vd/zFOPjTEyJqmUx/jpd+/i3T/zKhYWmtRqrf7Di1AqBN2hvlqjulzj7NkOM1ML3HXrLZRzWSbO
+                                T3B+Zp7hfJ6VhXlsmRSQaq0ZGRmh1WpxYXqOG689wNKKoODxrNatrSDJhxdC0Y05StIW9ryjYi5X
+                                SYWzLf3NyXq85cI3xrDYdTEIWp0eac9NyscBg6HTbqP7pdYnJmfIew4D5Qpff/Qxhkbz3PbqIuXS
+                                IUZHfoxi7nUoy2F0rMyBA6Ps2lVmZCRDOu1gDPR6EROTy5w4OkHQC7jthutxHZdtpQJzK3XmqiuU
+                                SmVWVlbW+/2y2Sye67Jar6PjmJMrit4WHz4lBeYjh9sAJ/oAiDcaABp43/0TvS0/TkUb0FaGlUaD
+                                lIJ8Notl22AMtmWzslJlYHCAx4+fJm0Jdo4khaRPnzjF7r1Zut0AJb11MK1rxv6hFqI/IubcuXlm
+                                52qMDOe59fb9eL7H1x95FCEE2UyG3QM5jl+YXQ9QdTodDBCFIel0Gqk103OL7BrdznJHb+nhU93I
+                                iMdnggVgos8B9EYDAOCpJ+d6S7bcWiVwaimkUihw4vwUWUeRyWbXeAkr1Sq5XI7TF6ZxhWbv+GgC
+                                Gh2ze3yUk8dqBIFgYelhFhbvodF6uD8TwtBotJmZWeTCxBwLi1WGhgtsGysn/YhKMjBUYmZhEdnX
+                                NJVSmT2DBR45cZZKpZIcN9f3TweGhnBtyfmpaUq+zYWGtWWnjhhjWGprejGfBpZ4Aa3hLxYAwTcm
+                                w8+aLVb/Ew2PTrdHux3g2hae7/eLOgxhHNPo9qjWalyzeyeWUug4mbzxltfeSb3W5egzKyiVxbJH
+                                iSOfZqNFs9kk5dmMjQ2wc8cIgwNFPNdGSNDaMDdfZ/LcDAd3bKfX7UKsMVozOjTIWD7DkbOTpDMZ
+                                ms0mRkrSvk82k0HrmOrqahIZDPT6QIjNXLYS5stnO4GBJ/oACDYLABr42F8+3d6yqGAr0AyXy0zM
+                                zpN2IJdP2D9CJG3m2SzT0zPceGAPUqqkxh+Io5CPfvZz7NpX5JbbygwP3UGpcIhC/kbSmQzZbBZl
+                                W2ht0Lrfoi4kq6sdpqar7NgxyO7927n/yadoNlaJorD/u5odY8O4UrPa7q5PCe31egwND5O2JVOL
+                                y1RyeSbr8VoF+qZzwA8/06mSDIh6wdPDXwwADPDA50+1F+ItmhA9Uzf4nsdirU7akeQLSRVvGAR4
+                                nse58+c5uGcXSiq0jlFS0qjXWFpYYGG5RqHoEkURy8uP993JtSlqieiUkv0e/SonTkzh+S5794wQ
+                                RSEDgwWW6w2Wl6vMzMzQareSPgIEe3buoF6rgVK0WklzaCqVwnEcJmYWSNuCM40UvU32mY0xfPFM
+                                F+DTfQC02MwxcYBphSy8eY/3joyzudEObQyPztq4tsPk9BylbIrKwACyP2ql0WgwNDSE63kIqbBs
+                                m+XVVbpBiFEWpUqFB588TbGUY2S0DGqKSC/16/xiup2AeqNJdXmVVMZjfLxMHAXMzS5x/Mh5nnj0
+                                GK+69hrynsfC/AL1apWw10MiiOOIYjbL7Ow8xUJufeRLFIa02y1ioRgfHkRFK6RtsSkxAWMMjhLm
+                                g483GzNN/RfAUS5jaPRLuaPhmwat8//5TUV3M4nO9GpElTGePn0euk22jY1SLpcTUtaf9yeVhbJt
+                                hG1TXV1FuS5eJsvQ2DaypRJPTk7zyOHDtFodCoUs11y/l+HRZCaB47oEvYCVlRoL88vMzcwzP7tI
+                                HMX4vsfOkWFu3XcAR0cszkwzNXEB0+vi2zaFbBZJMhcwDgMsZSUVTJbimWeO0JMONx7cy/zCGe4Y
+                                d/A2J4Rual0tfuqTy58nOVzy4b4JeGHh/ZcSln9qIfrI8eXol3cX1KYlPpY6Fm7OotNuUfbtZKzM
+                                +iENSZmXsixa7TarjSbKcfBsl0wmR68X8PThU1gpn7e85tWEQnJmYponnzgLjx0jikLW2kalkjhO
+                                itjY7Nt7kD3jIwgdE/c6zExcoNEJ2VHMMjo8wqmTJ2k1mrQaDcrFIp7tIJWVTEAzEMeabDbD4twy
+                                Jo6Z7mZph90XNNzhxazf/uoqwBeA6b76f8HrpcSpDPBgZMyv/9AOz9abMDE81oZTq8kotNryMqVC
+                                gWKxmBCXvvAdx2Fxucpqo45BkMnmyOULrLa7PHJ2BiE0xZQFaCwpqVQqnF/2ePs738vb3vGLvPb1
+                                b+cVt7+R7btegXLLrDY1u0bzEHYJOy2iTotu0KHbqDM9u4hnOwwUcjQaLRr1Br1OBykFju2s8woh
+                                BEpKWo061XaPW/fvZGZ5gaHMRoeGDa3AiA883vq8TqaCHQealxU8eokAqN99uveJyUYsNiMwNL0a
+                                UcoXOXZuEldJcmu+vzFJ9k8ppmdmaLWaCAT5XI6073Nmdon7njmDQ4+SE6HCNqLXIWw3CZqrjJcs
+                                vvKVe1leXkKpRChB0GV+fh5bGaJOk147Eb7udbDiAM82WPQ4cfo0c7UWu8bHyOby1FstFhcWWFmp
+                                9iORydCn4ZERcimPZqNB1Ouy2EsOotxQ108K8+/ur8eR4d5+8KfOFh8YEQK/9fvfaLz3v7ypkBwW
+                                uUEIN8ZwZtWmUtQ0mh2KRR8/lUqGuipFFMfMzc1g+rttYHAAjeCrR86x0gm4ZnueSgpyMsQVAUQC
+                                jcaYmF0Fm3Y35uMf/zipVArP81ipVrEtycEhUDpERgEiDpE6QJgAR4bYaYkyDtXZC0wvpLlpfIB8
+                                2ufMuXNEQUC302F4YADlOtiWRalUZrU5SbPbJRRZmsEKvmU2rBfwqflQPDwT3gecIxkMedmnh21E
+                                qiJeauvl125z31T2Ny7zEWlDTReZrzUJ23UGSkWy2Syu41BbXaVarYIxZNIZyuUy7V7El545RxSH
+                                XDOaYjCjGEgpso7ElkkDpiUuzi0eykkqGYktImzTYbwg2JbXOCbEI8IxYf8KcE2IS0RKanypkZYg
+                                bDY4v1BjbKDCcKXE/PIKvXaboNtBSkm+fwJZvVZjqVbn1oO7eejMNPtK9oZ0BmVsYf7vr67Wljv6
+                                /cAzffsfXQkAaODUvee6v/yua1IpuUEHRk/XY6Q3yNFzE2QsGBsbw/M8FhcXk8oboFAsUsjnOLdY
+                                494j5ylnFNeOeoxlFMMZRcYV2BIkBiUMst9jYIkYC42nYvKOpujEpGSER4hPiKMDbBNg62D9tUOE
+                                S0RaxmQsg+spoiDg3PQCjpfi0K5xmp0eSysrdNttut0uQ0NDLC0t0mq1KORz9ITHkNdNegVewjMy
+                                xvCxI23xpTO9jwMPvhjbv5EAAIgizb05V/zq9YPOSx6Pb4zhoWmLjJ/mzPlphooZypUKs7Oz64MU
+                                h4aGsC2Lx87P8ciZGfYP++yr2OzKW4xmFVlbYKmku8haE34yBhJFjDIxNvG6oF2TCN7SAXbcw4oD
+                                bN3D1iEOEY6JcIhxhSZtGXK2Ie1baGOYnVmgFkr2bxvCdV1ml1fotVq0W80kTdxsYBDk8wVEWHvJ
+                                x9JHGn7na6tHgpiP9Xf/HC/yCNmNAoAGGo/Ohte9asw5WPLlS0J4ta3BG+LY+SmU7jE+OsLy8jJx
+                                HK+PVBNS8qnHTjFXa/KKHWl2FS12Fy0G08kMIkuAJQRKaCzo73ydgEDEWDrG0iG2CbFNlAheB9hx
+                                f+ebxAy4JIK3iXDQWEJjS3CkIWMZUo5EOhYL88scnVvluh2jDFZKTM0v0263MDpGKcVqfZVd46N8
+                                6dgs1w3aOC9yEogSmF/9/IpYaJk/BZ4GTvEizwzcSADQtz//8K2F4F0/f10691IOk5hqCJRX5OT5
+                                SXaNDBBFEVEUUSwWKRWLTCzX+eyTp8m4cPM2n50Fxa6CRdlXSc89a3MizcX+aBMjTIxcvyKkDlE6
+                                wtIhSodYcYBlQqQOsXSYvDYRysR94CTnGEgMEo2tTH+eAXieRa8bcGxyAS+d5eD2EertHtVqjW3j
+                                YzQbDTzXJV0YJE19fcT75Qr/y2e74rOnuh8EHgEOc5mHRG0mAAwQ1Hvm6JmV8D137bhYLnW5od/D
+                                Sw62ZbNarzNYKtLr9RgcHMTzPJ6ZWODrx6fZNeBwaNhjV8Fie94i7ybj5Z91O+tDDTXJiCiDNDHo
+                                GKGjBAg6Oe9P6AipI4QOUXGUAMTESDRSa2S/v0/Sf91PAUtBf+CVIOVbBLHh/IUFtONyYHwYIyUT
+                                kxOMj42xtLzMvvFhppeXGc7Iy/IGjDFcWI3Fb967+i3gU8C3Xizx2ywA0LdD8+dX48XrB+0fG8ta
+                                xlzm+drzLU1sD3Ly3AS7xoZpt1qMjIwgheCzT53h3GKNV+5MsafssLtoMZa1+kOT1/oIL2Egxqyf
+                                TJIcXtLv1SMZCCm1Xhe81FFfQ+j+T4PQMcLoi7/fB5Tpv6/oz6OWJMe3ZBxB1lNYns3M9CLnVrtc
+                                t2OYUqnE9MwMoyOjCAHfmm2xr8jlRAaNrYT4p1+oLjRD/rS/80/zPGNgrwQA1mIDZ+4523vFK0ed
+                                3ZXL5AOH5wXZbB7fdYijkEq5zEqry989fgopYm4eT7GzkEzVGrhkiuZ6VQ/PBcLaoU0XBY/WCK0T
+                                zWCec60J3ST9fcIYhNF9JXtR8KIPhvXPFGBLQdqRZB2JlbKprbY5NbPMSKXMYKlIq93G8zzS6Szd
+                                7gqV1PNHBpMAmxD/5PMrTNT1+/rCP9KP95uXIwAMSTXq1x6c6v7om/f6A64lzAtJPMXaMB/kyefy
+                                dDttCvkcR6aX+OIzFxjJ29ww5rO7aLGzcHGk2nPB9e1AuHge0bpW6P9bImhzyaUv/h96XYOsgefS
+                                eSs8S/gXAaikSKaeuZJMyqYdxDxzdg7L89k+WMIAlYzHE1NV9hbF9xwLt5bp+y+PNXlgKvhj4Mk+
+                                659/sax/KwCw5hV0uxH3fPlM9x+9/YDvWfL5QVBtawJnEEyMNnDP4QscnV7mhnGfA4OJyh/PJoOT
+                                n89+XiqU7waIi8Jeu3jWa/msv/nO7/kd4+tC4CpIO4JcysJ2FOcmlphuhowU0gRhSBebAaeLb3+X
+                                se/GoKQwH36mLT56uP0x4P6+3Z/kMg6G3Mx08AtZaeDmgsdX/+adFet7BYmMMTw4CaXiCM1ewKcf
+                                P4Ul4YZxn7GsYnveouxv3mStTcnTGkMQw3JHc74WcmSizWooeMON+2nF0GtM8prt7re5hGuJzr96
+                                ui3+8unWp4G/7+/+Uxth97cSAALIAq/cV1J/94E3lzLwnd3DWBv++6N1pJXmzEKNwazFgSGX8dzF
+                                YYqW/P4Q/HcKa692NVONmGemO8ytxixHFq0w4t/+SIG8K58FGtcS5mOHO+IDjzc/DXweeIqk1LvJ
+                                BpfhbUXbQgBUqx3zjfvOd9/xpj2+a6tvNwfGwFwzYmqlzY6Kw74Bl90Fi+05i6z7/Sv8iyZBkHEk
+                                +ZRFaED3AgoZm2sqNqm+GTDJYZDm40fb4s8fb30R+Ew/2HOSyzgN9OWkAdafAckZNjfYki/8zU+V
+                                UzlXPit7GGvDSlczWU9OpBpIJydkeN9HKv+FmIRuDEvtmPmWRgI78oqiL5HJKBHxR99scPeZ7seB
+                                ey8R/iqbVIC7lU9WAjng2pTFh37/9fkDNw056EuCRWFs6MXJyaK24vt6138vEMQGulFyRJ5vC1T/
+                                VJt/8aUahxejPwce7bt7p3gROf6Xmwl4rnu4Gmru+9LZ3vasK/ddP2ATrx18KAWOSlwjKX7whL/m
+                                nUiRfE8nAbmZbWnxL79UWzlZjf9j394/zcXW7k0tKVZX4BkEfVQ//MhMsHhqJbrzddtdJYXY0IKS
+                                7xcwPDMfin/yhZUTtZ750766/xZJgUebLei7uJJP2wOGgZt9xX/+D28sjF9XsY3+AQeB6TNeJYX5
+                                P+6ticdmw7/sq/wzJHn92b6m3JKlruCziEgqWJciw313n+560434hjvGXdQPKAD6Lh73nuvxW1+p
+                                XTizEn+QpJVrLbw7v5FBnpe7BriUHGaAceB64A/+zV253a8edxA/IGbBGIMthZluxuIDjzU735gM
+                                vkRSxTvZ9++n+j6+3up7ezk9WReoALuAH0pZ/O6fvaVo7chZ3/dmQQrM+x5siLvPdJ+A/6+9c3lt
+                                IorC+G+SmSSaPhJqYxOh2KiLFlsR3boRlwU3XWtX/jv6X7gRXYrdSgtduDPaSh9aUSlpWm3znplc
+                                F+dMGcRFEW0zcT64XCYh5HLPd+7jzLn34ylQ1SF/GznI2TmrtvVbryaQ8HERKAPzV/LJxcW5bPbu
+                                VJq2Fx2PtxMWHd/wZLXO68/tN/UuS8BH9fpNJI3rTLy+nwkQwNGYQQm4DCyUc8l7C9PnS3cmU4yk
+                                E8br9Vvb5YSRk4RK1WVpq+09X2u/A14Cn5C07W0kiePwtOf6qBEgaFtKiVAEJhE51Efz19LFB7ND
+                                zmjGInjLaE7xNu7Ay8P/13INb6td83j1qLPbMMvAKzX0N+TQxlckotflDC/bjBIBfiXCMFAALgFl
+                                C26OpLk/W0hNPJzLcr3gmI5nrH99e5kRyUHshJwtf7He4tlai1rTX2m6LOvQXtP6i67sD/vN8FEi
+                                QLitNqKHm0fk0Sd0irg15FjTswX7ajlv52YuOMyMOxSHksbvCSl80XLkJJkpQR5b0jo2Nj1j8WHf
+                                pVJ1Wa95bBx4O2t73oYGb9aRqF1NDb6LJGs2dLtr+rlTo4ikjgpZIKe7hzElRh64rVvK0o2LdmZ6
+                                zE5P5exUcdhOZGxJ1kgfh5tFMdg3oiXp9gxd31DvGnYOPW9z3+u83/M6W9/9pi7eKsAWkop9BBzo
+                                Sn4PSdNqcIJbumMC/L32B/p45zSeMIK8eRzV56x+l0KijwULxi2LcX0G8DG0jFys9MOI9x6o93pq
+                                0DYSnq3rXB6UI+R3wd38JmodOEhQnXicECnCJaPxhkBV0yakMa5e66vRXTV8S43fUgK09fOwJEuk
+                                PWiQEU7tS+jUEdRBsUIEMGpQ/ze1iaKH/+8E+JM+MHGXxIgRI0aMGDFixBho/AQiCqY+GRZzJwAA
+                                AABJRU5ErkJggg==</field>
+        </record>
     </data>
 </openerp>

From 6497d80190f811048e4da589505bfd83e3ff1456 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 10:54:57 +0100
Subject: [PATCH 228/547] [ADD] auto install with mail

bzr revid: mat@openerp.com-20130329095457-qfu4hi9cx23454qp
---
 addons/gamification/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index dd27c82d94b..c9ecdf0252b 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -59,6 +59,7 @@ A **Badge** is a symbolic token granted to a user as a sign of reward. It can be
     ],
     'installable': True,
     'application': True,
+    'auto_install': True,
     'css': ['static/src/css/goal.css'],
     'js': ['static/src/js/gamification.js'],
     'qweb': ['static/src/xml/gamification.xml'],

From 559d5f70428778146b573eac55ecd3afa5cf031c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 10:59:32 +0100
Subject: [PATCH 229/547] [FIX] users shouldn't be able to write to badges

bzr revid: mat@openerp.com-20130329095932-gc58i4q2j32vpcxy
---
 addons/gamification/security/ir.model.access.csv | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 2ba1b2e4c38..8074e3f58c0 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -9,8 +9,7 @@ plan_user_anybody,"Goal Plan Anybody",model_gamification_goal_plan,,1,0,0,0
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
 planline_anybody,"Goal Planline Anybody",model_gamification_goal_planline,,1,0,0,0
 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
-badge_user,"Badge User",model_gamification_badge,group_goal_user,1,1,0,0
 badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0
 badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1
 badge_user_user,"Badge-user User",model_gamification_badge_user,group_goal_user,1,1,1,0
-badge__useranybody,"Badge-user Anybody",model_gamification_badge_user,,1,0,0,0
+badge_user_anybody,"Badge-user Anybody",model_gamification_badge_user,,1,0,0,0

From 84b2b3411ac27aafc15c55c0d6c0c76416375df4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 12:52:15 +0100
Subject: [PATCH 230/547] [IMP] render progressbar

bzr revid: mat@openerp.com-20130329115215-bpm450x04kp0os9z
---
 .../gamification/static/src/js/gamification.js   | 16 ++++++++++++++++
 .../gamification/static/src/xml/gamification.xml |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index dfd8b2f607b..d415d35a890 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -68,6 +68,7 @@ openerp.gamification = function(instance) {
                     self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
                     self.$el.find('.oe_type_description').hide();
                     self.render_money_fields(self.goals_info.info[0].currency);
+                    self.render_progress_bars();
                 }
             });
         },
@@ -87,6 +88,21 @@ openerp.gamification = function(instance) {
                 money_field.set('value', parseInt($(this).text()));
                 money_field.replace($(this));
             });
+        },
+        render_progress_bars: function() {
+            var self = this;
+
+            dfm = new instance.web.form.DefaultFieldManager(self);
+            // Generate a FieldMonetary for each .oe_goal_field_monetary
+            self.$el.find(".oe_goal_progress").each(function() {
+                progress_field = new instance.web.form.FieldProgressBar(dfm, {
+                    attrs: {
+                        modifiers: '{"readonly": true}'
+                    }
+                });
+                progress_field.set('value', $(this).attr('value'));
+                progress_field.replace($(this));
+            });
         }
     });
 
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 06dc0292ccd..fd607fd09f1 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -22,7 +22,7 @@
                         <t t-if="goal.type_condition == 'higher'">
                             <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            <progress t-att-value="goal.completeness" max="100"/>
+                            <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/>
                         </t>
                         <t t-if="goal.type_condition == 'lower'">
                             <t t-esc="goal.current" /> (less than 
@@ -59,7 +59,7 @@
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
                         <td class="col1"><t t-esc="goal.user_name" /></td>
-                        <td class="col2"><progress t-att-value="goal.completeness" max="100" /></td>
+                        <td class="col2"><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
                         <td class="col3">
                             <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>

From 59c61a755421ecec69fcd30a4fa154711709f774 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 13:53:31 +0100
Subject: [PATCH 231/547] [IMP] change plans

bzr revid: mat@openerp.com-20130329125331-0fxnwymun04i5itr
---
 addons/gamification/goal_base_data.xml          | 2 ++
 addons/gamification_sale_crm/sale_crm_goals.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index ea6b32c1120..ded06f45dec 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -11,6 +11,8 @@
             <field name="field_id" eval="ref('base.field_res_partner_tz')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id">base.action_res_users_my</field>
+            <field name="state">inprogress</field>
+            <field name="autojoin_group_id" eval="ref('base.group_user')" />
         </record>
 
         <record model="gamification.goal.type" id="type_base_avatar">
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 1ecc144c47a..f32b58423a0 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -179,7 +179,7 @@
         <record model="gamification.goal.plan" id="plan_crm_marketing">
             <field name="name">Marketing team</field>
             <field name="period">monthly</field>
-            <field name="visibility_mode">board</field>
+            <field name="visibility_mode">progressbar</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
             <field name="report_message_frequency">weekly</field>
             <field name="report_header">The following message contains the current progress of the marketing team based on several criterias. The progress is reinitialised each month and shared weekly.</field>

From 6305bfeb3c812ff9fcafdb13945b85a8d1ba6af1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 14:07:14 +0100
Subject: [PATCH 232/547] [FIX] grant badge button and action

bzr revid: mat@openerp.com-20130329130714-suw4c3y0856rfg1h
---
 addons/gamification/badge.py          | 2 +-
 addons/gamification/badge_view.xml    | 5 +++--
 addons/hr_gamification/badge.py       | 4 +---
 addons/hr_gamification/badge_view.xml | 5 +++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 1ee779880d6..13234d94b91 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -368,7 +368,7 @@ class grant_badge_wizard(osv.TransientModel):
     _name = 'gamification.badge.user.wizard'
     _columns = {
         'user_id': fields.many2one("res.users", string='User', required=True),
-        'badge_id': fields.many2one("gamification.badge", string='Badge'),
+        'badge_id': fields.many2one("gamification.badge", string='Badge',  required=True),
         'comment': fields.text('Comment'),
     }
 
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 044e37238b3..e3c2cc3429d 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -43,7 +43,8 @@
             target="new"
             res_model="gamification.badge.user.wizard"
             context="{'default_badge_id': active_id, 'badge_id': active_id}"
-            view_type="form" view_mode="form"/>
+            view_type="form" view_mode="form"
+            view_id="gamification.view_badge_wizard_grant" />
 
         <record id="badge_list_view" model="ir.ui.view">
             <field name="name">Badge List</field>
@@ -65,7 +66,7 @@
             <field name="arch" type="xml">
                 <form string="Badge" version="7.0">
                     <header>
-                        <button string="Send this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
+                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
                             '|',
                                 ('rule_auth', '=', 'nobody'),
                                 '&amp;',
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index aacac358e27..1e99ce39eb0 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -69,9 +69,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
         'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
         'user_id': fields.related("employee_id", "user_id",
                                   type="many2one", relation="res.users",
-                                  store=True, string='User'),
-        'badge_id': fields.many2one("gamification.badge", string='Badge'),
-        'comment': fields.text('Comment'),
+                                  store=True, string='User')
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 57557cf63ed..03d22a40fd0 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -50,7 +50,8 @@
             target="new"
             res_model="gamification.badge.user.wizard"
             context="{'default_employee_id': active_id, 'employee_id': active_id}"
-            view_type="form" view_mode="form"/>
+            view_type="form" view_mode="form"
+            view_id="gamification.view_badge_wizard_reward"/>
 
 
 
@@ -62,7 +63,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button string="Send Reward" type="action" name="%(action_reward_wizard)d" />
+                    <button string="Grant Badge" type="action" name="%(action_reward_wizard)d" />
                 </xpath>
                 <xpath expr="//page[@string='Public Information']" position="before">
                     <page string="Received Badges">

From 00d76ef66600e5127175b6e5e1dc19b434453ad6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 14:14:54 +0100
Subject: [PATCH 233/547] [IMP] template and css

bzr revid: mat@openerp.com-20130329131454-1eyyt4mw75p1s6i2
---
 addons/gamification/static/src/css/goal.css      |  4 ++--
 .../gamification/static/src/xml/gamification.xml | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 072655cd470..030aca800d2 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -73,11 +73,11 @@
 .openerp .oe_mail_wall .oe_mail_wall_aside table td.col3 { width: 45%; }
 /* ... and 10% left for ranking */
 
-.openerp .oe_mail_wall .oe_mail_wall_aside table progress {
+.openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar {
     width: 100%;
     display: inline-block;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside li progress {
+.openerp .oe_mail_wall .oe_mail_wall_aside li progress,.oe_form_field_progressbar {
     width: 80%;
     display: inline-block;
 }
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index fd607fd09f1..9dfebe14f62 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -18,22 +18,24 @@
                         <a class="oe_show_description" t-att-id="goal.id">?</a>
                         <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p>
                     </t> -->
-                    <p>
-                        <t t-if="goal.type_condition == 'higher'">
+                    <t t-if="goal.type_condition == 'higher'">
+                        <p>
                             <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/>
-                        </t>
-                        <t t-if="goal.type_condition == 'lower'">
+                        </p>
+                        <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p>
+                    </t>
+                    <t t-if="goal.type_condition == 'lower'">
+                        <p>
                             <t t-esc="goal.current" /> (less than 
                                 <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                 <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
                             )
-                        </t>
+                        </p>
+                    </t>
                         <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
                             <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
                         </a> -->
-                    </p>
                 </li>
                 </ul>
             </t>

From d435a85c60a5d3e36ae64af3ab33f0063196e754 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 15:34:07 +0100
Subject: [PATCH 234/547] [IMP] removed image attachement

bzr revid: mat@openerp.com-20130329143407-0oi1jk24fotgzt4y
---
 addons/gamification/badge.py                      | 1 -
 addons/gamification/badge_view.xml                | 6 +++---
 addons/gamification/templates/badge_received.mako | 3 ---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 13234d94b91..7ff80fc3967 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -223,7 +223,6 @@ class gamification_badge(osv.Model):
                                     partner_ids=[(4, badge_user.user_id.partner_id.id)],
                                     type='comment',
                                     subtype='mt_comment',
-                                    attachments=[('badge-img.png', base64.decodestring(badge.image))],
                                     context=context)
 
         return res
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index e3c2cc3429d..9d36250a7ca 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -126,14 +126,14 @@
                     <field name="stat_count_distinct"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="oe_kanban_card oe_kanban_global_click oe_kanban_badge  oe_kanban_color_white">
+                            <div t-attf-class="#{record.stat_my.raw_value ? 'oe_kanban_color_5' : 'oe_kanban_color_white'} oe_kanban_card oe_kanban_global_click oe_kanban_badge">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" /></a>
                                     </div>
                                     <h4>
                                         <a type="open"><field name="name"/></a>
-                                        <t t-if="record.stat_my.raw_value > 0"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
+                                        <!-- <t t-if="record.stat_my.raw_value > 0"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
 WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htF
 FIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLm
 wOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV
@@ -141,7 +141,7 @@ wOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV
 BR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2
 SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7mypr
 vrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7K
-jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t>
+jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t> -->
                                     </h4>
                                     <t t-if="record.description.value">
                                         <em><field name="description"/></em>
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
index 802590f9e59..b846ab7ff4f 100644
--- a/addons/gamification/templates/badge_received.mako
+++ b/addons/gamification/templates/badge_received.mako
@@ -10,9 +10,6 @@
         % endif
     </p>
 
-    % if badge_user.badge_id.image
-        <p><img src="cid:badge-img.png" alt="Badge ${badge_user.badge_id.name}" /></p>
-    % endif
     % if badge_user.comment
         <p><em>${badge_user.comment}</em></p>
     % endif

From 1c52d7e3b9c3f514f719e644feb8d7efd7371aa6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 16:45:35 +0100
Subject: [PATCH 235/547] [ADD] change avatar function

bzr revid: mat@openerp.com-20130329154535-a6v8shsc3igv2wiy
---
 addons/gamification/goal.py                       | 13 +++++++++++++
 addons/gamification/goal_base_data.xml            |  2 +-
 addons/gamification/plan.py                       |  4 ++--
 addons/gamification/res_users.py                  |  3 +++
 addons/gamification/static/src/js/gamification.js |  4 +++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index a020e98e6e5..e695322e9a0 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -343,6 +343,19 @@ class gamification_goal(osv.Model):
 
         return False
 
+    def changed_users_avatar(self, cr, uid, ids, context):
+        """Warning a user changed his avatar.
+
+        The goal_type type_base_avatar requires a change of avatar. As an
+        avatar is randomly generated by default, trigger warning when change.
+        Set the state of every type_base_avatar linked to ids to 'reached' and
+        set current value to 1.
+        """
+        goal_type_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'type_base_avatar', context)
+        goal_ids = self.search(cr, uid, [('type_id', '=', goal_type_id.id), ('user_id', 'in', ids)], context=context)
+        values = {'state': 'reached', 'current': 1}
+        self.write(cr, uid, goal_ids, values, context=context)
+
 
 class goal_manual_wizard(osv.TransientModel):
     """Wizard type to update a manual goal"""
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index ded06f45dec..5c8158f5523 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -19,12 +19,12 @@
             <field name="name">Change of avatar</field>
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
+            <field name="action_id">base.action_res_users_my</field>
             <!-- problem : default avatar != False
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="field_id" eval="ref('base.field_res_partner_image')" />
             <field name="domain">[('id','=',user_id),('partner_id.image', '!=', False)]</field>
-            <field name="action_id">base.action_res_users_my</field>
             -->
         </record>
 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 9bd658703ed..53230c5cd87 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -128,8 +128,8 @@ class gamification_goal_plan(osv.Model):
             string='State',
             required=True),
         'visibility_mode': fields.selection([
-                ('board','Leader board'),
-                ('progressbar','Personal progressbar')
+                ('board', 'Leader board'),
+                ('progressbar', 'Personal progressbar')
             ],
             string="Visibility",
             help='How are displayed the results, shared or in a single progressbar',
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index c8fa6c409be..af887319f74 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -20,6 +20,9 @@ class res_users_gamification_group(osv.Model):
             plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
 
             goal_plan_obj.plan_subscribe_users(cr, uid, plan_ids, ids, context=context)
+
+        if vals.get('image'):
+            self.pool.get('gamification.goal').changed_users_avatar(cr, uid, ids, context)
         return write_res
 
     def get_goals_todo_info(self, cr, uid, context=None):
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index d415d35a890..7f49f66785f 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -39,7 +39,9 @@ openerp.gamification = function(instance) {
                 });
                 $.when(goal_action).done(function() {
                     var action_manager = new instance.web.ActionManager(this);
-                    action_manager.do_action(goal_action.action);
+                    action_manager.do_action(goal_action.action).done(function () {
+                        self.get_goal_todo_info();
+                    });
 
                     //var form = action_manager.dialog_widget.views.form.controller;
                 });

From a3c5009a7ac704dc99b9e93f3ba7ef8d28468b7e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 17:31:37 +0100
Subject: [PATCH 236/547] [ADD] autostart discover plan

bzr revid: mat@openerp.com-20130329163137-l6e45b0qj89yfm5c
---
 addons/gamification/badge_view.xml                     |  5 +++++
 addons/gamification/goal_base_data.xml                 |  4 ++--
 addons/gamification/plan.py                            | 10 ++++++++--
 addons/gamification/security/gamification_security.xml |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 9d36250a7ca..cdb2c4dcac0 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -147,6 +147,11 @@ jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t> -->
                                         <em><field name="description"/></em>
                                     </t>
                                     <p>Granted <t t-esc="record.stat_count.raw_value" />x (<t t-esc="record.stat_count_distinct.raw_value"/> pers.)</p>
+                                    <div class="oe_kanban_project_avatars">
+                                        <t t-foreach="record.owner_ids.user_id.raw_value.slice(0,11)" t-as="member">
+                                            <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
+                                        </t>
+                                    </div>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 5c8158f5523..e2952df60be 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -11,8 +11,6 @@
             <field name="field_id" eval="ref('base.field_res_partner_tz')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id">base.action_res_users_my</field>
-            <field name="state">inprogress</field>
-            <field name="autojoin_group_id" eval="ref('base.group_user')" />
         </record>
 
         <record model="gamification.goal.type" id="type_base_avatar">
@@ -47,6 +45,8 @@
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
             <field name="planline_ids" eval="[(4, ref('planline_base_discover1')),(4, ref('planline_base_discover2'))]"/>
+            <field name="autojoin_group_id" eval="ref('base.group_user')" />
+            <field name="state">inprogress</field>
         </record>
 
 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 53230c5cd87..76df8e7b3ad 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -25,6 +25,8 @@ from templates import TemplateHelper
 
 from datetime import date, datetime, timedelta
 import calendar
+import logging
+_logger = logging.getLogger(__name__)
 
 
 def start_end_date_for_period(period):
@@ -208,7 +210,8 @@ class gamification_goal_plan(osv.Model):
         Start planned plans (in draft and with start_date = today)
         Create the goals for planlines not linked to goals (eg: modified the 
             plan to add planlines)
-        Update every goal running"""
+        Update every goal running
+        """
         if not context: context = {}
 
         # start planned plans
@@ -280,7 +283,10 @@ class gamification_goal_plan(osv.Model):
             if plan.autojoin_group_id:
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
 
-        self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+            if len(plan.user_ids) > 0:
+                self.write(cr, uid, plan.id, {'state': 'inprogress'}, context=context)
+            else:
+                _logger.warning("Can not start planned plan, no subscribed users")
         return self.generate_goals_from_plan(cr, uid, ids, context=context)
 
     def action_check(self, cr, uid, ids, context=None):
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index d3c30a97efc..8a60957558c 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -3,13 +3,13 @@
     <data>
         <record model="ir.module.category" id="module_goal_category">
             <field name="name">Goal</field>
-            <field name="description">Helps you handle your lunch needs, if you are a manager you will be able to create new products, cashmoves and to confirm or cancel orders.</field>
+            <field name="description"></field>
             <field name="sequence">17</field>
         </record>
         <record id="group_goal_user" model="res.groups">
             <field name="name">User</field>
             <field name="category_id" ref="module_goal_category"/>
-            <field name="users" eval="[(4, ref('base.group_user'))]"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         </record>
         <record id="group_goal_manager" model="res.groups">
             <field name="name">Manager</field>

From 48d075ba6fe27df9bee93fb5f248ae5a0ffcd320 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 17:35:42 +0100
Subject: [PATCH 237/547] [FIX] can not create plan without users

bzr revid: mat@openerp.com-20130329163542-pqjg9wl43mwqoqsz
---
 addons/gamification/goal_base_data.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index e2952df60be..977ae4ce827 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -46,7 +46,6 @@
             <field name="report_message_frequency">never</field>
             <field name="planline_ids" eval="[(4, ref('planline_base_discover1')),(4, ref('planline_base_discover2'))]"/>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
-            <field name="state">inprogress</field>
         </record>
 
 

From 85feebfe9880d0845739f63a42c49247123063c8 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 2 Apr 2013 10:40:27 +0200
Subject: [PATCH 238/547] [ADD] display list of unique user in badge kanban
 view

bzr revid: mat@openerp.com-20130402084027-n3g0lp3riikfukk0
---
 addons/gamification/badge.py                | 17 +++++++++++++++--
 addons/gamification/badge_view.xml          |  7 ++++---
 addons/gamification/static/src/css/goal.css | 10 ++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 7ff80fc3967..f53683fbd91 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -27,8 +27,6 @@ from openerp.tools.safe_eval import safe_eval
 from templates import TemplateHelper
 from datetime import date
 
-import base64
-
 
 class gamification_badge_user(osv.Model):
     """User having received a badge"""
@@ -71,6 +69,17 @@ class gamification_badge(osv.Model):
             result[obj.id] = len(obj.owner_ids)
         return result
 
+    def _get_unique_global_list(self, cr, uid, ids, name, args, context=None):
+        """Return the list of unique res.users ids having received this badge"""
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            res = self.pool.get('gamification.badge.user').read_group(
+                                   cr, uid, domain=[('badge_id', '=', obj.id)],
+                                   fields=['badge_id', 'user_id'],
+                                   groupby=['user_id'], context=context)
+            result[obj.id] = [badge_user['user_id'][0] for badge_user in res]
+        return result
+
     def _get_unique_global_count(self, cr, uid, ids, name, args, context=None):
         """Return the number of time this badge has been granted to individual users"""
         result = dict.fromkeys(ids, False)
@@ -171,6 +180,10 @@ class gamification_badge(osv.Model):
             help="A message will be posted on the user profile or just sent to him"),
         'owner_ids': fields.one2many('gamification.badge.user', 'badge_id',
             string='Owners', help='The list of instances of this badge granted to users'),
+        'unique_owner_ids': fields.function(_get_unique_global_list,
+            string='Unique Owners',
+            help="The list of unique users having received this badge.",
+            type="many2many", relation="res.users"),
 
         'stat_count': fields.function(_get_global_count, string='Total',
             help="The number of time this badge has been received."),
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index cdb2c4dcac0..c6e08a9763a 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -124,6 +124,7 @@
                     <field name="stat_my"/>
                     <field name="stat_count"/>
                     <field name="stat_count_distinct"/>
+                    <field name="unique_owner_ids"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="#{record.stat_my.raw_value ? 'oe_kanban_color_5' : 'oe_kanban_color_white'} oe_kanban_card oe_kanban_global_click oe_kanban_badge">
@@ -147,9 +148,9 @@ jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t> -->
                                         <em><field name="description"/></em>
                                     </t>
                                     <p>Granted <t t-esc="record.stat_count.raw_value" />x (<t t-esc="record.stat_count_distinct.raw_value"/> pers.)</p>
-                                    <div class="oe_kanban_project_avatars">
-                                        <t t-foreach="record.owner_ids.user_id.raw_value.slice(0,11)" t-as="member">
-                                            <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
+                                    <div class="oe_kanban_badge_avatars">
+                                        <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
+                                            <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
                                         </t>
                                     </div>
                                 </div>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 030aca800d2..f3134f704b8 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -19,6 +19,16 @@
 }
 
 
+.oe_kanban_badge_avatars img {
+    width: 30px;
+    height: 30px;
+    padding-left: 0;
+    margin-top: 3px;
+    border-radius: 2px;
+    -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+
+
 /* Mail Sidebar */
 
 .openerp .oe_mail_wall .oe_mail_wall_aside {

From fc43fd390b8b0986008b6b2e50659bec362c7981 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 2 Apr 2013 11:58:54 +0200
Subject: [PATCH 239/547] [ADD] admin goal plan

bzr revid: mat@openerp.com-20130402095854-arjpvw7q40mi2oq4
---
 addons/gamification/goal_base_data.xml | 67 ++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 977ae4ce827..c599abb0c7e 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -8,7 +8,6 @@
             <field name="description">Configure your profile and specify your timezone</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
-            <field name="field_id" eval="ref('base.field_res_partner_tz')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id">base.action_res_users_my</field>
         </record>
@@ -18,12 +17,35 @@
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
             <field name="action_id">base.action_res_users_my</field>
-            <!-- problem : default avatar != False
+            <!-- problem : default avatar != False -> manually + check in write function -->
+        </record>
+
+
+        <record model="gamification.goal.type" id="type_base_company_data">
+            <field name="name">Set your company data</field>
+            <field name="description">Specify at least a website</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="ref('base.model_res_company')" />
+            <field name="domain">[(user_id, 'in', 'user_ids'),('website', '!=', 'www.yourcompany.com')]</field>
+            <field name="action_id">base.action_res_company_form</field>
+        </record>
+
+        <record model="gamification.goal.type" id="type_base_company_logo">
+            <field name="name">Change your company logo</field>
+            <field name="computation_mode">manually</field>
+            <field name="computation_mode">count</field>
+            <field name="model_id" eval="ref('base.model_res_company')" />
+            <field name="domain">[(user_id, 'in', 'user_ids'),('logo', '!=', False)]</field>
+            <field name="action_id">base.action_res_company_form</field>
+        </record>
+
+        <record model="gamification.goal.type" id="type_base_invite">
+            <field name="name">Invite new users</field>
+            <field name="description">Create at least another user</field>
+            <field name="computation_mode">manually</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
-            <field name="field_id" eval="ref('base.field_res_partner_image')" />
-            <field name="domain">[('id','=',user_id),('partner_id.image', '!=', False)]</field>
-            -->
+            <field name="domain">[('id', '!=', user_id)]</field>
         </record>
 
 
@@ -37,6 +59,19 @@
             <field name="target_goal">1</field>
         </record>
 
+        <record model="gamification.goal.planline" id="planline_base_admin1">
+            <field name="type_id" eval="ref('type_base_company_data')" />
+            <field name="target_goal">1</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_base_admin2">
+            <field name="type_id" eval="ref('type_base_company_logo')" />
+            <field name="target_goal">1</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_base_admin3">
+            <field name="type_id" eval="ref('type_base_invite')" />
+            <field name="target_goal">1</field>
+            <!-- goal owner not included -->
+        </record>
 
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_base_discover">
@@ -46,6 +81,18 @@
             <field name="report_message_frequency">never</field>
             <field name="planline_ids" eval="[(4, ref('planline_base_discover1')),(4, ref('planline_base_discover2'))]"/>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
+            <field name="start_date" eval="(DateTime.today() - timedelta(days=1)).strftime('%Y-%m-%d')"/>
+            <!-- setting start date to yesterday allows automatic start at database creation -->
+        </record>
+
+        <record model="gamification.goal.plan" id="plan_base_configure">
+            <field name="name">Configure OpenERP</field>
+            <field name="period">once</field>
+            <field name="visibility_mode">progressbar</field>
+            <field name="report_message_frequency">never</field>
+            <field name="planline_ids" eval="[(4, ref('planline_base_admin1')),(4, ref('planline_base_admin2')), (4, ref('planline_base_admin3'))]"/>
+            <field name="autojoin_group_id" eval="ref('base.group_erp_manager')" />
+            <field name="start_date" eval="(DateTime.today() - timedelta(days=1)).strftime('%Y-%m-%d')"/>
         </record>
 
 
@@ -57,5 +104,15 @@
             <field name="plan_id" eval="ref('plan_base_discover')" />
         </record>
 
+        <record model="gamification.goal.planline" id="planline_base_admin1">
+            <field name="plan_id" eval="ref('plan_base_configure')" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_base_admin2">
+            <field name="plan_id" eval="ref('plan_base_configure')" />
+        </record>
+        <record model="gamification.goal.planline" id="planline_base_admin3">
+            <field name="plan_id" eval="ref('plan_base_configure')" />
+        </record>
+
     </data>
 </openerp>

From 060296a0b28864f3e43dfb230b984ba7dd394981 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 2 Apr 2013 11:59:18 +0200
Subject: [PATCH 240/547] [FIX] start also past goal plans

bzr revid: mat@openerp.com-20130402095918-h1ss3infbj4vpqxs
---
 addons/gamification/plan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 76df8e7b3ad..054148b7504 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -217,7 +217,7 @@ class gamification_goal_plan(osv.Model):
         # start planned plans
         planned_plan_ids = self.search(cr, uid, [
             ('state', '=', 'draft'),
-            ('start_date', '=', fields.date.today())])
+            ('start_date', '<=', fields.date.today())])
         self.action_start(cr, uid, planned_plan_ids, context=context)
 
         if not ids:

From a3c3a07d3ab4f316e0c1a0842744cf2d55f5b7e2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 2 Apr 2013 14:15:14 +0200
Subject: [PATCH 241/547] [IMP] better goals

bzr revid: mat@openerp.com-20130402121514-thl9b43jnbu12tr0
---
 addons/gamification/goal.py                       | 14 +++++++-------
 addons/gamification/goal_base_data.xml            | 10 ++++------
 addons/gamification/static/src/js/gamification.js | 12 ++++++------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index e695322e9a0..6c729a65e9c 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -319,13 +319,6 @@ class gamification_goal(osv.Model):
         :return: action description in a dictionnary
         """
         goal = self.browse(cr, uid, goal_id, context=context)
-        action = {
-            'name': "Update %s" % goal.type_id.name,
-            'id': goal_id,
-            'type': 'ir.actions.act_window',
-            'views': [[False, 'form']],
-            'target': 'new',
-        }
         if goal.type_id.action_id:
             try:
                 model, xml_id = goal.type_id.action_id.split('.', 1)
@@ -337,6 +330,13 @@ class gamification_goal(osv.Model):
                 _logger.warning("Invalid XML ID '%s' for goal action.", goal.type_id.action_id)
 
         if goal.computation_mode == 'manually':
+            action = {
+                'name': "Update %s" % goal.type_id.name,
+                'id': goal_id,
+                'type': 'ir.actions.act_window',
+                'views': [[False, 'form']],
+                'target': 'new',
+            }
             action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
             action['res_model'] = 'gamification.goal.wizard'
             return action
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index c599abb0c7e..4a093067b5d 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -26,23 +26,21 @@
             <field name="description">Specify at least a website</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
-            <field name="domain">[(user_id, 'in', 'user_ids'),('website', '!=', 'www.yourcompany.com')]</field>
-            <field name="action_id">base.action_res_company_form</field>
+            <field name="domain">[('user_ids', 'in', user_id),('website', '!=', 'www.yourcompany.com')]</field>
+            <field name="action_id">base.action_res_company_form_my</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_company_logo">
             <field name="name">Change your company logo</field>
-            <field name="computation_mode">manually</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
-            <field name="domain">[(user_id, 'in', 'user_ids'),('logo', '!=', False)]</field>
-            <field name="action_id">base.action_res_company_form</field>
+            <field name="domain">[('user_ids', 'in', user_id),('logo', '!=', False)]</field>
+            <field name="action_id">base.action_res_company_form_my</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_invite">
             <field name="name">Invite new users</field>
             <field name="description">Create at least another user</field>
-            <field name="computation_mode">manually</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id', '!=', user_id)]</field>
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 7f49f66785f..dcee68197ae 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -13,7 +13,7 @@ openerp.gamification = function(instance) {
         events: {
             'click a.oe_update_goal': function(event) {
                 var self = this;
-                var goal_id = parseInt(event.currentTarget.id);
+                var goal_id = parseInt(event.currentTarget.id, 10);
                 var goal_updated = new instance.web.Model('gamification.goal').call('update', [[goal_id]]);
                 $.when(goal_updated).done(function() {
                     self.get_goal_todo_info();
@@ -21,7 +21,7 @@ openerp.gamification = function(instance) {
             },
             'click a.oe_update_plan': function(event) {
                 var self = this;
-                var plan_id = parseInt(event.currentTarget.id);
+                var plan_id = parseInt(event.currentTarget.id, 10);
                 var goals_updated = new instance.web.Model('gamification.goal.plan').call('quick_update', [plan_id]);
                 $.when(goals_updated).done(function() {
                     self.get_goal_todo_info();
@@ -33,7 +33,7 @@ openerp.gamification = function(instance) {
             // },
             'click a.oe_goal_action': function(event) {
                 var self = this;
-                var goal_id = parseInt(event.currentTarget.id);
+                var goal_id = parseInt(event.currentTarget.id, 10);
                 var goal_action = new instance.web.Model('gamification.goal').call('get_action', [goal_id]).then(function(res) {
                     goal_action['action'] = res;
                 });
@@ -45,7 +45,7 @@ openerp.gamification = function(instance) {
 
                     //var form = action_manager.dialog_widget.views.form.controller;
                 });
-            },
+            }
         },
         renderElement: function() {
             var self = this;
@@ -63,7 +63,7 @@ openerp.gamification = function(instance) {
         get_goal_todo_info: function() {
             var self = this;
             var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
-                self.goals_info['info'] = res
+                self.goals_info['info'] = res;
             });
             $.when(goals_info).done(function() {
                 if(self.goals_info.info.length > 0){
@@ -87,7 +87,7 @@ openerp.gamification = function(instance) {
                 });
                 money_field.set('currency', currency_id);
                 money_field.get_currency_info();
-                money_field.set('value', parseInt($(this).text()));
+                money_field.set('value', parseInt($(this).text(), 10));
                 money_field.replace($(this));
             });
         },

From 9669db43ff871aa6a5bbbc0f68e0bfef0d7166b7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 2 Apr 2013 15:45:01 +0200
Subject: [PATCH 242/547] [ADD] res_id_field for specific res_id

bzr revid: mat@openerp.com-20130402134501-96uhx58u2s1gx129
---
 addons/gamification/goal.py            | 15 ++++++++++++---
 addons/gamification/goal_base_data.xml |  6 +++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 6c729a65e9c..4782cd01b3d 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -79,8 +79,11 @@ class gamification_goal_type(osv.Model):
         'sequence': fields.integer('Sequence',
             help='Sequence number for ordering',
             required=True),
+
         'action_id': fields.char("Action",
-            help="The action xml id that will be called to update the goal value.")
+            help="The action xml id that will be called to update the goal value."),
+        'res_id_field': fields.char("id field",
+            help="The field name on the user profile containing the value for res_id for action")
     }
 
     _order = 'sequence'
@@ -323,8 +326,14 @@ class gamification_goal(osv.Model):
             try:
                 model, xml_id = goal.type_id.action_id.split('.', 1)
                 action = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, model, xml_id, context=context)
-                action['res_id'] = uid
-                action['context'] = context
+                
+                if goal.type_id.res_id_field:
+                    current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
+                    field_names = goal.type_id.res_id_field.split('.')
+                    res = current_user.__getitem__(field_names[0])
+                    for field_name in field_names[1:]:
+                        res = res.__getitem__(field_name)
+                    action['res_id'] = res
                 return action
             except ValueError:
                 _logger.warning("Invalid XML ID '%s' for goal action.", goal.type_id.action_id)
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 4a093067b5d..9665a4e1394 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -10,14 +10,16 @@
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id">base.action_res_users_my</field>
+            <field name="res_id_field">id</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_avatar">
             <field name="name">Change of avatar</field>
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
-            <field name="action_id">base.action_res_users_my</field>
             <!-- problem : default avatar != False -> manually + check in write function -->
+            <field name="action_id">base.action_res_users_my</field>
+            <field name="res_id_field">id</field>
         </record>
 
 
@@ -28,6 +30,7 @@
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id),('website', '!=', 'www.yourcompany.com')]</field>
             <field name="action_id">base.action_res_company_form_my</field>
+            <field name="res_id_field">company_id.id</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_company_logo">
@@ -36,6 +39,7 @@
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id),('logo', '!=', False)]</field>
             <field name="action_id">base.action_res_company_form_my</field>
+            <field name="res_id_field">company_id.id</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_invite">

From f72f63e1d91a952ad2a179601e81e70730c3442c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 2 Apr 2013 17:20:05 +0200
Subject: [PATCH 243/547] [ADD] basic doc

bzr revid: mat@openerp.com-20130402152005-oqldhhvtk3gwahcc
---
 addons/gamification/doc/goal.rst  | 46 +++++++++++++++++++++++++++++++
 addons/gamification/doc/index.rst | 17 ++++++++++++
 addons/gamification/goal.py       |  3 +-
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 addons/gamification/doc/goal.rst
 create mode 100644 addons/gamification/doc/index.rst

diff --git a/addons/gamification/doc/goal.rst b/addons/gamification/doc/goal.rst
new file mode 100644
index 00000000000..bdb5f71a253
--- /dev/null
+++ b/addons/gamification/doc/goal.rst
@@ -0,0 +1,46 @@
+.. _gamification_goal:
+
+gamification.goal
+=================
+
+Models
+++++++
+
+``gamification.goal`` for the generated goals from plans
+
+.. versionchanged:: 7.0
+
+Fields
+++++++
+
+ - ``type_id`` : The related gamification.goal.type object.
+ - ``user_id`` : The user responsible for the goal. Goal type domain filtering on the user id will use that value.
+ - ``planline_id`` : if the goal is generated from a plan, the planline used to generate this goal
+ - ``plan_id`` : if the goal is generated from a plan, related link from planline_id.plan_id
+ - ``start_date`` : the starting date for goal evaluation. If a goal is evaluated using a date field (eg: creation date of an invoice), this field will be used in the domain. Without starting date, every past recorded data will be considered in the goal type computation.
+ - ``end_date`` : the end date for goal evaluation, similar to start_date. When an end_date is passed, the goal update method will change to status to reached or failed depending of the current value.
+ - ``target_goal`` : the numerical value to reach (higher or lower depending of goal type) to reach a goal
+ - ``current`` : current computed value of the goal
+ - ``completeness`` : percentage of completion of a goal
+ - ``state`` : 
+    - ``draft`` : goal not active and displayed in user's goal list. Only present for manual creation of goal as plans generate goals in progress.
+    - ``inprogress`` : a goal is started and is not closed yet
+    - ``inprogress_update`` : in case of manual goal, a number of day can be specified. If the last manual update from the user is older than this number of days, a reminder will be sent and the state changed to this.
+    - ``reached`` : the goal is succeeded
+    - ``failed`` : the goal is failed
+    - ``canceled`` : state if the goal plan is canceled
+ - ``remind_update_delay`` : the number of day before an inprogress goal is set to inprogress_update and a reminder is sent.
+ - ``last_update`` : the date of the last modification of this goal
+ - ``computation_mode`` : related field from the linked goal type
+ - ``type_description`` : related field from the linked goal type
+ - ``type_unit`` : related field from the linked goal type
+ - ``type_condition`` : related field from the linked goal type
+
+
+Methods
++++++++
+
+ - ``update`` :
+   Compute the current value of goal and change states accordingly and send reminder if needed.
+ - ``get_action`` :
+   Returns the action description specified for the goal modification. If an action XML ID is specified in the goal type definition it will be used. If a goal is manual, the action is a simple wizard to input a new value.
\ No newline at end of file
diff --git a/addons/gamification/doc/index.rst b/addons/gamification/doc/index.rst
new file mode 100644
index 00000000000..ac48fe051b5
--- /dev/null
+++ b/addons/gamification/doc/index.rst
@@ -0,0 +1,17 @@
+Gamification module documentation
+=================================
+
+The Gamification module holds all the module and logic related to goals, plans and badges. The computation is mainly done in this module, other modules inherating from it should only add data and tests.
+
+Goals
+-----
+A **Goal** is an objective applied to an user with a numerical target to reach. It can have a starting and end date. Users usually do not create goals but relies on goal plans.
+
+A **Goal Type** is a generic objective that can be applied to any structure stored in the database and use numerical value. The creation of goal types is quite technical and should rarely be done. Once a generic goal is created, it can be associated to several goal plans with different numerical targets.
+
+A **Goal Plan** is a a set of goal types with a target value to reach applied to a group of users. It can be periodic to create and evaluate easily the performances of a team.
+
+Badges
+------
+A **Badge** is a symbolic token granted to a user as a sign of reward. It can be offered by a user to another or automatically offered when some conditions are met. The conditions can either be a list of goal types succeeded or a user definied python code executed.
+
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 4782cd01b3d..eb8150f904f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -326,9 +326,10 @@ class gamification_goal(osv.Model):
             try:
                 model, xml_id = goal.type_id.action_id.split('.', 1)
                 action = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, model, xml_id, context=context)
-                
+
                 if goal.type_id.res_id_field:
                     current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
+                    # eg : company_id.id
                     field_names = goal.type_id.res_id_field.split('.')
                     res = current_user.__getitem__(field_names[0])
                     for field_name in field_names[1:]:

From 4539b2fa7d68cf0ae58f5192be99a8c67ac6c0f3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 10:50:44 +0200
Subject: [PATCH 244/547] [ADD] howto create a goal plan

bzr revid: mat@openerp.com-20130403085044-mutz0li66e891nx9
---
 .../doc/gamification_plan_howto.rst           | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 addons/gamification/doc/gamification_plan_howto.rst

diff --git a/addons/gamification/doc/gamification_plan_howto.rst b/addons/gamification/doc/gamification_plan_howto.rst
new file mode 100644
index 00000000000..a0b6eefb7da
--- /dev/null
+++ b/addons/gamification/doc/gamification_plan_howto.rst
@@ -0,0 +1,107 @@
+How to create new goal plan for my addon
+========================================
+
+Running example
++++++++++++++++
+
+A module to create and manage groceries lists has been developped. To motivate users to use it, a goal plan is developped. This how to will explain the creation of a dedicated module and the XML file for the required data.
+
+Module
+++++++
+
+The goal plan for my addon will consist of an auto-installed module containing only the definition of goals. Goal type are quite technical to create and should not be seen or modified through the web interface.
+
+If our groceries module is called ``groceries``, the structure will be consisted of three addons :
+
+::
+
+  addons/
+    ...
+    gamification/
+    groceries/
+    groceries_gamification/
+      __openerp__.py
+      groceries_goals.xml
+
+The ``__openerp__.py`` file containing the following information :
+
+::
+
+  {
+    ...
+    'depends': ['gamification','groceries'],
+    'data': ['groceries_goals.xml'],
+    'auto_install': True,
+  }
+
+
+Goal type definition
++++++++++++++++++++++
+
+For our groceries module, we would like to evaluate the total number of items written on lists during a month. The evaluated value being a number of line in the database, the goal type computation mode will be ``count``. The XML data file will contain the following information :
+
+::
+
+  <record model="gamification.goal.type" id="type_groceries_nbr_items">
+    <field name="name">Number of items</field>
+    <field name="computation_mode">count</field>
+    ...
+  </record>
+
+To be able to compute the number of lines, the model containing groceries is required. To be able to refine the computation on a time period, a reference date field should be mention. This field date must be a field of the selected model. In our example, we will use the ``gorceries_item`` model and the ``shopping_day`` field.
+
+::
+
+  <record model="gamification.goal.type" id="type_groceries_nbr_items">
+    ...
+    <field name="model_id" eval="ref('groceries.model_groceries_item')" />
+    <field name="field_date_id" eval="ref('groceries.field_groceries_item_shopping_day')" />
+  </record>
+
+As we do not want to count every recorded item, we will use a domain to restrict the selection on the user (display the count only for the items the users will be buying) and the state (only the items whose list is confirmed are included). The user restriction is made with the keyword ``user_id`` in the domain. During the evaluation, it is replaced by the user ID of the linked goal.
+
+::
+
+  <record model="gamification.goal.type" id="type_groceries_nbr_items">
+    ...
+    <field name="domain">[('shopper_id', '=' ,user_id), ('list_id.state', '=', 'confirmed')]</field>
+  </record>
+
+An action can also be defined to help users to quickly reach the screen where they will be able to modify their current value. This is done by adding the XML ID of the ir.action we want to call. In our example, we would like to open the grocery list form view owned by the user.
+
+If we do not specify a res_id to the action, only the list of records can be displayed. The restriction is done with the field ``res_id_field`` containing the field name of the user profile containing the required id. In our example, we assume the res.users model has been extended with a many2one field ``groceries_list`` to the model ``groceries.list``.
+
+::
+
+  <record model="gamification.goal.type" id="type_groceries_nbr_items">
+    ...
+    <field name="action_id">groceries.action_groceries_list_form</field>
+    <field name="res_id_field">groceries_list.id</field>
+  </record>
+
+
+Plan definition
+++++++++++++++++
+
+Once all the goal types are defined, a goal plan can be created. In our example, we would like to create a plan "Discover the Groceries Module" with simple tasks applied to every new user in the group ``groceries.shoppers_group``. This goal plan should only be applied once by user so no recurring date is selected.
+
+::
+  <record model="gamification.goal.planline" id="planline_groceries_discover1">
+    <field name="type_id" eval="ref('type_groceries_nbr_items')" />
+    <field name="target_goal">3</field>
+  </record>
+  
+  <record model="gamification.goal.plan" id="plan_groceries_discover">
+    <field name="name">Discover the Groceries Module</field>
+    <field name="period">once</field>
+    <field name="visibility_mode">progressbar</field>
+    <field name="report_message_frequency">never</field>
+    <field name="planline_ids" eval="[(4, ref('planline_groceries_discover1'))]"/>
+    <field name="autojoin_group_id" eval="ref('groceries.shoppers_group')" />
+    <field name="start_date" eval="(DateTime.today() - timedelta(days=1)).strftime('%Y-%m-%d')"/>
+    <!-- setting start date to yesterday allows automatic start at module installation -->
+  </record>
+
+  <record model="gamification.goal.planline" id="planline_groceries_discover1">
+    <field name="plan_id" eval="ref('plan_groceries_discover')" />
+  </record>
\ No newline at end of file

From 57c1ad67fe9cbf7a7caa6bd01008ef49ad4b6f7e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 4 Apr 2013 17:23:59 +0200
Subject: [PATCH 245/547] [REF] cleaning code

bzr revid: mat@openerp.com-20130404152359-3x3gt9xhkrkr0au4
---
 addons/gamification/badge_view.xml            | 15 +----
 addons/gamification/goal.py                   |  6 +-
 addons/gamification/goal_base_data.xml        | 52 ++++++---------
 addons/gamification/goal_view.xml             | 12 ++--
 addons/gamification/plan.py                   | 33 +++-------
 addons/gamification/plan_view.xml             |  9 +--
 addons/gamification/res_users.py              |  3 +
 .../security/gamification_security.xml        |  8 +--
 .../gamification/security/ir.model.access.csv |  5 +-
 addons/gamification/templates/reminder.mako   |  2 +-
 .../gamification_sale_crm/sale_crm_goals.xml  | 63 ++++++-------------
 addons/hr_gamification/badge_view.xml         |  2 +-
 12 files changed, 74 insertions(+), 136 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index c6e08a9763a..32107402990 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -92,7 +92,7 @@
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
-                            <field name="rule_max_number" attrs="{'invisible': [('rule_max','=',False)]}"/>
+                            <field name="rule_max_number" attrs="{'invisible': ['!',('rule_max','=',False),('rule_auth','=','nobody')]}"/>
                         </group>
                         <group string="Automatic Rules">
                             <field name="rule_automatic"/>
@@ -132,18 +132,7 @@
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" /></a>
                                     </div>
-                                    <h4>
-                                        <a type="open"><field name="name"/></a>
-                                        <!-- <t t-if="record.stat_my.raw_value > 0"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htF
-FIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLm
-wOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV
-5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWm
-BR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2
-SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7mypr
-vrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7K
-jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t> -->
-                                    </h4>
+                                    <h4><a type="open"><field name="name"/></a></h4>
                                     <t t-if="record.description.value">
                                         <em><field name="description"/></em>
                                     </t>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index eb8150f904f..6ee819a9610 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -335,6 +335,9 @@ class gamification_goal(osv.Model):
                     for field_name in field_names[1:]:
                         res = res.__getitem__(field_name)
                     action['res_id'] = res
+                    action['view_mode'] = 'form'  # if one element to display, should see it in form mode
+                    action['target'] = 'new'
+                print(action)
                 return action
             except ValueError:
                 _logger.warning("Invalid XML ID '%s' for goal action.", goal.type_id.action_id)
@@ -349,8 +352,9 @@ class gamification_goal(osv.Model):
             }
             action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
             action['res_model'] = 'gamification.goal.wizard'
+            print(action)
             return action
-
+        print(False)
         return False
 
     def changed_users_avatar(self, cr, uid, ids, context):
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 9665a4e1394..656758b630d 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -28,7 +28,7 @@
             <field name="description">Specify at least a website</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
-            <field name="domain">[('user_ids', 'in', user_id),('website', '!=', 'www.yourcompany.com')]</field>
+            <field name="domain">[('user_ids', 'in', user_id), ('name', '!=', 'Your Company')]</field>
             <field name="action_id">base.action_res_company_form_my</field>
             <field name="res_id_field">company_id.id</field>
         </record>
@@ -38,7 +38,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id),('logo', '!=', False)]</field>
-            <field name="action_id">base.action_res_company_form_my</field>
+            <field name="action_id">base.action_res_company_form</field>
             <field name="res_id_field">company_id.id</field>
         </record>
 
@@ -51,29 +51,6 @@
         </record>
 
 
-        <!-- planlines -->
-        <record model="gamification.goal.planline" id="planline_base_discover1">
-            <field name="type_id" eval="ref('type_base_timezone')" />
-            <field name="target_goal">1</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_base_discover2">
-            <field name="type_id" eval="ref('type_base_avatar')" />
-            <field name="target_goal">1</field>
-        </record>
-
-        <record model="gamification.goal.planline" id="planline_base_admin1">
-            <field name="type_id" eval="ref('type_base_company_data')" />
-            <field name="target_goal">1</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_base_admin2">
-            <field name="type_id" eval="ref('type_base_company_logo')" />
-            <field name="target_goal">1</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_base_admin3">
-            <field name="type_id" eval="ref('type_base_invite')" />
-            <field name="target_goal">1</field>
-            <!-- goal owner not included -->
-        </record>
 
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_base_discover">
@@ -81,10 +58,8 @@
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
-            <field name="planline_ids" eval="[(4, ref('planline_base_discover1')),(4, ref('planline_base_discover2'))]"/>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
-            <field name="start_date" eval="(DateTime.today() - timedelta(days=1)).strftime('%Y-%m-%d')"/>
-            <!-- setting start date to yesterday allows automatic start at database creation -->
+            <field name="state">inprogress</field>
         </record>
 
         <record model="gamification.goal.plan" id="plan_base_configure">
@@ -92,29 +67,38 @@
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
-            <field name="planline_ids" eval="[(4, ref('planline_base_admin1')),(4, ref('planline_base_admin2')), (4, ref('planline_base_admin3'))]"/>
             <field name="autojoin_group_id" eval="ref('base.group_erp_manager')" />
-            <field name="start_date" eval="(DateTime.today() - timedelta(days=1)).strftime('%Y-%m-%d')"/>
+            <field name="state">inprogress</field>
         </record>
 
-
-        <!-- link planline -> plan -->
+        <!-- planlines -->
         <record model="gamification.goal.planline" id="planline_base_discover1">
+            <field name="type_id" eval="ref('type_base_timezone')" />
+            <field name="target_goal">1</field>
             <field name="plan_id" eval="ref('plan_base_discover')" />
         </record>
         <record model="gamification.goal.planline" id="planline_base_discover2">
+            <field name="type_id" eval="ref('type_base_avatar')" />
+            <field name="target_goal">1</field>
             <field name="plan_id" eval="ref('plan_base_discover')" />
         </record>
 
-        <record model="gamification.goal.planline" id="planline_base_admin1">
+        <record model="gamification.goal.planline" id="planline_base_admin2">
+            <field name="type_id" eval="ref('type_base_company_logo')" />
+            <field name="target_goal">1</field>
             <field name="plan_id" eval="ref('plan_base_configure')" />
         </record>
-        <record model="gamification.goal.planline" id="planline_base_admin2">
+        <record model="gamification.goal.planline" id="planline_base_admin1">
+            <field name="type_id" eval="ref('type_base_company_data')" />
+            <field name="target_goal">1</field>
             <field name="plan_id" eval="ref('plan_base_configure')" />
         </record>
         <record model="gamification.goal.planline" id="planline_base_admin3">
+            <field name="type_id" eval="ref('type_base_invite')" />
+            <field name="target_goal">1</field>
             <field name="plan_id" eval="ref('plan_base_configure')" />
         </record>
 
+
     </data>
 </openerp>
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 525a30bb6ae..c6ed02491df 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -112,7 +112,6 @@
                     <filter name="closed" string="Closed" domain="[('state', 'in', ('reached', 'failed'))]"/>
                     <separator/>
 
-                    <field name="planline_id"/>
                     <field name="user_id"/>
                     <field name="type_id"/>
                     <group expand="0" string="Group By...">
@@ -204,28 +203,29 @@
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <sheet>
+                        <label for="name" class="oe_edit_only"/>
                         <h1>
-                            <div class="oe_edit_only">
-                                <label for="name"/>
-                            </div>
                             <field name="name"/>
                         </h1>
                         <group>
                             <group string="General">
-                                <field name="description"/>
+                                <field name="description" string="Tooltip"/>
                                 <field name="condition"/>
                                 <field name="monetary" />
                                 <field name="unit" attrs="{'invisible': [('monetary', '=', True)]}"/>
                             </group>
                             <group string="Computation">
-                                <field name="computation_mode"/>
+                                <field widget="radio" name="computation_mode"/>
 
                                 <!-- Hide the fields below if manually -->
                                 <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
                                 <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]" />
                                 <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
                                 <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
+                            </group>
+                            <group string="User Action">
                                 <field name="action_id" />
+                                <field name="res_id_field" />
                             </group>
                         </group>
                     </sheet>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 054148b7504..7819d38cb3b 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -168,25 +168,6 @@ class gamification_goal_plan(osv.Model):
         'manager_id' : lambda s, cr, uid, c: uid,
     }
 
-    def _check_nonzero_planline(self, cr, uid, ids, context=None):
-        """checks that there is at least one planline set"""
-        for plan in self.browse(cr, uid, ids, context):
-            if len(plan.planline_ids) < 1:
-                return False
-        return True
-
-    def _check_nonzero_users(self, cr, uid, ids, context=None):
-        """checks that there is at least one user set"""
-        for plan in self.browse(cr, uid, ids, context):
-            if len(plan.user_ids) < 1 and plan.state != 'draft':
-                return False
-        return True
-
-    _constraints = [
-        (_check_nonzero_planline, "At least one planline is required to create a goal plan", ['planline_ids']),
-        (_check_nonzero_users, "At least one user is required to create a non-draft goal plan", ['user_ids']),
-    ]
-
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
         context = context or {}
@@ -208,7 +189,7 @@ class gamification_goal_plan(osv.Model):
         """Daily cron check.
 
         Start planned plans (in draft and with start_date = today)
-        Create the goals for planlines not linked to goals (eg: modified the 
+        Create the goals for planlines not linked to goals (eg: modified the
             plan to add planlines)
         Update every goal running
         """
@@ -226,7 +207,6 @@ class gamification_goal_plan(osv.Model):
         goal_obj = self.pool.get('gamification.goal')
         # we use yesterday to update the goals that just ended
         yesterday = date.today() - timedelta(days=1)
-        # TOCHECK conflict with date rule in goal update() function
         goal_ids = goal_obj.search(cr, uid, [
             '&',
                 ('state', 'not in', ('draft', 'canceled')),
@@ -246,9 +226,12 @@ class gamification_goal_plan(osv.Model):
         if not context: context = {}
         goal_obj = self.pool.get('gamification.goal')
 
-        self.generate_goals_from_plan(cr, uid, ids, context=context)
-
         for plan in self.browse(cr, uid, ids, context=context):
+            if plan.autojoin_group_id:
+                print("subscribe from group", plan.autojoin_group_id, [user.id for user in plan.autojoin_group_id.users])
+                self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
+            self.generate_goals_from_plan(cr, uid, [plan.id], context=context)
+
             # goals closed but still opened at the last report date
             closed_goals_to_report = goal_obj.search(cr, uid, [
                 ('plan_id', '=', plan.id),
@@ -568,7 +551,7 @@ class gamification_goal_planline(osv.Model):
 
     _name = 'gamification.goal.planline'
     _description = 'Gamification generic goal for plan'
-    _order = "sequence_type"
+    _order = "sequence_type, id"
 
     def _get_planline_types(self, cr, uid, ids, context=None):
         """Return the ids of planline items related to the gamification.goal.type
@@ -583,8 +566,10 @@ class gamification_goal_planline(osv.Model):
         return result.keys()
 
     _columns = {
+        'name': fields.related('type_id', 'name', string="Name"),
         'plan_id': fields.many2one('gamification.goal.plan',
             string='Plan',
+            required=True,
             ondelete="cascade"),
         'type_id': fields.many2one('gamification.goal.type',
             string='Goal Type',
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 44a9178d979..2c5828368ee 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -77,7 +77,8 @@
                             <group string="Notify" colspan="4">
                                 <label for="visibility_mode"/>
                                 <div>
-                                    <field name="visibility_mode" colspan="2" />
+                                    <field name="visibility_mode" type="radio" colspan="2" />
+
 
                                     <group name="visibility_mode_help" class="oe_grey oe_edit_only" colspan="1">
                                         <p attrs="{'invisible': [('visibility_mode','!=','board')]}">
@@ -121,8 +122,8 @@
                                 <field name="autojoin_group_id" />
                             </group>
                             <group colspan="4">
-                                <field name="user_ids" widget="many2many_kanban">
-                                    <kanban quick_create="false" create="true">
+                                <field name="user_ids" widget="many2many_tag" />
+<!--                                     <kanban quick_create="false" create="true">
                                         <field name="name"/>
                                         <templates>
                                             <t t-name="kanban-box">
@@ -137,7 +138,7 @@
                                             </t>
                                         </templates>
                                     </kanban>
-                                </field>
+                                </field>  -->
                             </group>
                         </group>
                     </sheet>
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index af887319f74..bde044c8fff 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -72,6 +72,9 @@ class res_users_gamification_group(osv.Model):
                             vals['own_goal_id'] = goal[1].id
                     serialized_goals_info['planlines'].append(vals)
 
+                if len(serialized_goals_info['planlines']) == 0:
+                    # plan with no valid planlines
+                    continue
             else:
                 # individual report are simply a list of goal
                 goals_info = plan_obj.get_indivual_goal_info(cr, uid, uid, plan, subset_goal_ids=False, context=context)
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 8a60957558c..23ec3679add 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -6,14 +6,8 @@
             <field name="description"></field>
             <field name="sequence">17</field>
         </record>
-        <record id="group_goal_user" model="res.groups">
-            <field name="name">User</field>
-            <field name="category_id" ref="module_goal_category"/>
-            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-        </record>
         <record id="group_goal_manager" model="res.groups">
             <field name="name">Manager</field>
-            <field name="implied_ids" eval="[(4, ref('group_goal_user'))]"/>
             <field name="category_id" ref="module_goal_category"/>
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
@@ -23,7 +17,7 @@
         <record id="goal_user_visibility" model="ir.rule">
             <field name="name">User can only see his/her goals</field>
             <field name="model_id" ref="model_gamification_goal"/>
-            <field name="groups" eval="[(4, ref('group_goal_user'))]"/>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="False"/>
diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 8074e3f58c0..803294832b1 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 goal_anybody,"Goal Anybody",model_gamification_goal,,1,0,0,0
 goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
-goal_user,"Goal User",model_gamification_goal,group_goal_user,1,1,0,0
+goal_user,"Goal User",model_gamification_goal,base.group_user,1,1,0,0
 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
 goal_type_anybody,"Goal Type Anybody",model_gamification_goal_type,,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
@@ -9,7 +9,8 @@ plan_user_anybody,"Goal Plan Anybody",model_gamification_goal_plan,,1,0,0,0
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
 planline_anybody,"Goal Planline Anybody",model_gamification_goal_planline,,1,0,0,0
 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
+badge_user,"Badge Manager",model_gamification_badge,base.group_user,1,0,0,0
 badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0
 badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1
-badge_user_user,"Badge-user User",model_gamification_badge_user,group_goal_user,1,1,1,0
+badge_user_user,"Badge-user User",model_gamification_badge_user,base.group_user,1,1,1,0
 badge_user_anybody,"Badge-user Anybody",model_gamification_badge_user,,1,0,0,0
diff --git a/addons/gamification/templates/reminder.mako b/addons/gamification/templates/reminder.mako
index 632467eb771..f50d798a657 100644
--- a/addons/gamification/templates/reminder.mako
+++ b/addons/gamification/templates/reminder.mako
@@ -10,7 +10,7 @@
 
 	<p class="oe_grey">${object.report_header or ''}</p>
     
-    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay}. Do not forget to do it.</p>
+    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
 
     <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
 </body>
\ No newline at end of file
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index f32b58423a0..d24135c7cfc 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -125,46 +125,6 @@
 
 
 
-        <!-- planlines -->
-        <record model="gamification.goal.planline" id="planline_crm_sale1">
-            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
-            <field name="target_goal">20000</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale2">
-            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
-            <field name="target_goal">20</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale3">
-            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
-            <field name="target_goal">5</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale4">
-            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
-            <field name="target_goal">5</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale5">
-            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
-            <field name="target_goal">4</field>
-        </record>
-
-
-
-        <record model="gamification.goal.planline" id="planline_crm_marketing1">
-            <field name="type_id" eval="ref('type_crm_lead_delay_open')" />
-            <field name="target_goal">15</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_marketing2">
-            <field name="type_id" eval="ref('type_crm_nbr_new_leads')" />
-            <field name="target_goal">7</field>
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_marketing3">
-            <field name="type_id" eval="ref('type_crm_nbr_new_opportunities')" />
-            <field name="target_goal">5</field>
-        </record>
-
-
-
-
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_crm_sale">
             <field name="name">Salesperson</field>
@@ -173,7 +133,6 @@
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
             <field name="report_message_frequency">weekly</field>
             <field name="report_header">The following message contains the current progress of the sale team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
-            <field name="planline_ids" eval="[(4, ref('planline_crm_sale1')),(4, ref('planline_crm_sale2')),(4, ref('planline_crm_sale3')),(4, ref('planline_crm_sale4')),(4, ref('planline_crm_sale5'))]"/>
         </record>
 
         <record model="gamification.goal.plan" id="plan_crm_marketing">
@@ -183,34 +142,52 @@
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
             <field name="report_message_frequency">weekly</field>
             <field name="report_header">The following message contains the current progress of the marketing team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
-            <field name="planline_ids" eval="[(4, ref('planline_crm_marketing1')),(4, ref('planline_crm_marketing2')),(4, ref('planline_crm_marketing3'))]"/>
         </record>
 
-        <!-- link planline -> plan -->
+         <!-- planlines -->
         <record model="gamification.goal.planline" id="planline_crm_sale1">
+            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
+            <field name="target_goal">20000</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale2">
+            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
+            <field name="target_goal">20</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale3">
+            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
+            <field name="target_goal">5</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale4">
+            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
+            <field name="target_goal">5</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale5">
+            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
+            <field name="target_goal">4</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
 
+
+
         <record model="gamification.goal.planline" id="planline_crm_marketing1">
+            <field name="type_id" eval="ref('type_crm_lead_delay_open')" />
+            <field name="target_goal">15</field>
             <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing2">
+            <field name="type_id" eval="ref('type_crm_nbr_new_leads')" />
+            <field name="target_goal">7</field>
             <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing3">
+            <field name="type_id" eval="ref('type_crm_nbr_new_opportunities')" />
+            <field name="target_goal">5</field>
             <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 03d22a40fd0..7cdecab8e7f 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -23,7 +23,7 @@
             </field>
         </record>
 
-        <menuitem id="gamification_badge_menu_hr" parent="hr.menu_hr_main" action="gamification.badge_list_action" groups="gamification.group_goal_user" />
+        <menuitem id="gamification_badge_menu_hr" parent="hr.menu_hr_main" action="gamification.badge_list_action" />
 
 
         <record id="gamification.view_badge_wizard_reward" model="ir.ui.view">

From 750a3ae2b6543fad5ccb889ae30ee7a810a98d4b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 5 Apr 2013 09:32:05 +0200
Subject: [PATCH 246/547] [IMP] better security rules

bzr revid: mat@openerp.com-20130405073205-gfcolcdv3oomlo0z
---
 addons/gamification/plan.py                          |  2 +-
 addons/gamification/plan_view.xml                    |  2 +-
 .../gamification/security/gamification_security.xml  | 12 +++++++++---
 addons/gamification/security/ir.model.access.csv     |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 7819d38cb3b..ffd39b3c739 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -102,7 +102,7 @@ class gamification_goal_plan(osv.Model):
             string='Users',
             help="List of users to which the goal will be set"),
         'manager_id': fields.many2one('res.users', required=True,
-            string='Manager', help="The user responsible for the plan."),
+            string='Responsible', help="The user responsible for the plan."),
         'planline_ids': fields.one2many('gamification.goal.planline',
             'plan_id',
             string='Planline',
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 2c5828368ee..024d01c4c53 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -68,7 +68,7 @@
 
                         <group>
                             <group colspan="4">
-                                <field name="manager_id"/>
+                                <field name="manager_id" />
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="remind_update_delay"/>
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 23ec3679add..227d8e21584 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -13,16 +13,22 @@
         </record>
     </data>
 
-    <data noupdate="1">
+    <data noupdate="0">
         <record id="goal_user_visibility" model="ir.rule">
-            <field name="name">User can only see his/her goals</field>
+            <!-- TODO fix private for board -->
+            <field name="name">User can only see his/her goals or goal from the same plan in board visibility</field>
             <field name="model_id" ref="model_gamification_goal"/>
             <field name="groups" eval="[(4, ref('base.group_user'))]"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('user_id','=',user.id)]</field>
+            <field name="domain_force">[
+                '|',
+                    ('user_id','=',user.id),
+                    '&amp;',
+                        ('plan_id.user_ids','in',user.id),
+                        ('plan_id.visibility_mode','=','board')]</field>
         </record>
         <record id="goal_manager_visibility" model="ir.rule">
             <field name="name">Manager has all rights on user's goals</field>
diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 803294832b1..52ea42e09e3 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -5,9 +5,9 @@ goal_user,"Goal User",model_gamification_goal,base.group_user,1,1,0,0
 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
 goal_type_anybody,"Goal Type Anybody",model_gamification_goal_type,,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
-plan_user_anybody,"Goal Plan Anybody",model_gamification_goal_plan,,1,0,0,0
+plan_user,"Goal Plan Anybody",model_gamification_goal_plan,base.group_user,1,0,0,0
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
-planline_anybody,"Goal Planline Anybody",model_gamification_goal_planline,,1,0,0,0
+planline_user,"Goal Planline Anybody",model_gamification_goal_planline,base.group_user,1,0,0,0
 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
 badge_user,"Badge Manager",model_gamification_badge,base.group_user,1,0,0,0
 badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0

From 6b136880226f782bd0fd9769e9ecbff71638d870 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 5 Apr 2013 17:19:53 +0200
Subject: [PATCH 247/547] [IMP] change plan view

bzr revid: mat@openerp.com-20130405151953-mq453l24jpz4gwgo
---
 addons/gamification/badge_execute.py |   2 +-
 addons/gamification/plan.py          |  11 +--
 addons/gamification/plan_view.xml    | 106 +++++++++++++--------------
 3 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/addons/gamification/badge_execute.py b/addons/gamification/badge_execute.py
index 8f0ecf997f1..ba01fac02e0 100644
--- a/addons/gamification/badge_execute.py
+++ b/addons/gamification/badge_execute.py
@@ -3,7 +3,7 @@ from openerp.tools.translate import _
 from datetime import date
 
 
-class gamification_badge_execute(osv.Model):
+class gamification_badge_execute(osv.AbstractModel):
     """Class that contains the methods to execute for badge granting"""
 
     _name = 'gamification.badge.execute'
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index ffd39b3c739..b53bc6ae5db 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -109,7 +109,7 @@ class gamification_goal_plan(osv.Model):
             help="list of goals that will be set",
             required=True),
         'autojoin_group_id': fields.many2one('res.groups',
-            string='Auto-join Group',
+            string='Auto-subscription Group',
             help='Group of users whose members will automatically be added to the users'),
         'period': fields.selection([
                 ('once', 'No Periodicity'),
@@ -124,14 +124,14 @@ class gamification_goal_plan(osv.Model):
         'start_date': fields.date('Starting Date', help="The day a new plan will be automatically started. The start and end dates for goals are still defined by the periodicity (eg: weekly goals run from Monday to Sunday)."),
         'state': fields.selection([
                 ('draft', 'Draft'),
-                ('inprogress', 'In progress'),
+                ('inprogress', 'In Progress'),
                 ('done', 'Done'),
             ],
             string='State',
             required=True),
         'visibility_mode': fields.selection([
-                ('board', 'Leader board'),
-                ('progressbar', 'Personal progressbar')
+                ('board', 'Leader Board'),
+                ('progressbar', 'Personal Progressbar')
             ],
             string="Visibility",
             help='How are displayed the results, shared or in a single progressbar',
@@ -150,7 +150,7 @@ class gamification_goal_plan(osv.Model):
             string='Send a copy to',
             help='Group that will receive a copy of the report in addition to the user'),
         'report_header': fields.text('Report Header'),
-        'remind_update_delay': fields.integer('Remind delay',
+        'remind_update_delay': fields.integer('Remind delay for Manual Goals',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value or zero is specified."),
         'last_report_date': fields.date('Last Report Date'),
         'next_report_date': fields.function(_get_next_report_date,
@@ -247,6 +247,7 @@ class gamification_goal_plan(osv.Model):
             if fields.date.today() == plan.next_report_date:
                 self.report_progress(cr, uid, plan, context=context)
                 self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
+        return True
 
     def quick_update(self, cr, uid, plan_id, context=None):
         """Update all the goals of a plan, no generation of new goals"""
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 024d01c4c53..c638c19a29b 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -66,64 +66,20 @@
                             <button name="action_show_related_goals" type="object" string="Related Goals" help="show all the generated goals for this plan" context="{'search_default_group_by_user': True}" />
                         </div>
 
-                        <group>
-                            <group colspan="4">
-                                <field name="manager_id" />
-                                <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="remind_update_delay"/>
-                                
-                            </group>
-                            <group string="Notify" colspan="4">
-                                <label for="visibility_mode"/>
-                                <div>
-                                    <field name="visibility_mode" type="radio" colspan="2" />
-
-
-                                    <group name="visibility_mode_help" class="oe_grey oe_edit_only" colspan="1">
-                                        <p attrs="{'invisible': [('visibility_mode','!=','board')]}">
-                                           In Leaderboard mode, the reports will contain the progress of users of this plan.
-                                        </p>
-                                        <p attrs="{'invisible': [('visibility_mode','!=','progressbar')]}">
-                                           In Personal Progressbar mode, the progress of each user can only be seen by himself and the followers of this plan.
-                                        </p>
-                                    </group>
-                                </div>
-
-                                <field name="report_message_frequency" />
-                                <field name="report_header" />
-                                
-                                <label for="report_message_group_id"/>
-                                <div>
-                                    <field name="report_message_group_id" />
-                                    <group name="report_help" class="oe_grey oe_edit_only" col="2" colspan="2">
-                                       <p attrs="{'invisible': [('report_message_group_id','!=',False)]}">
-                                           Select a group that will receive a copy of the reports.
-                                       </p>
-                                       <p attrs="{'invisible': [('report_message_group_id','=',False)]}">
-                                           A copy of the report will be sent to this group.
-                                       </p>
-                                   </group>
-                               </div>
-                            </group>
+                        <group colspan="2">
+                            <field name="manager_id" />
                         </group>
-                        
-                        <group string="Planlines">
-                            <field name="planline_ids" nolabel="1">
-                                <tree string="Planline List" version="7.0" editable="bottom" >
-                                    <field name="type_id"/>
-                                    <field name="target_goal"/>
-                                </tree>
-                            </field>
+                        <group colspan="2">
+                            <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
                         </group>
-                        
-                        <group string="Subscription">
+                        <group string="Evaluated Users">
                             <group colspan="4">
                                 <field name="autojoin_group_id" />
                             </group>
                             <group colspan="4">
-                                <field name="user_ids" widget="many2many_tag" />
-<!--                                     <kanban quick_create="false" create="true">
+                                <field name="user_ids" widget="many2many_kanban">
+                                    <kanban quick_create="false" create="true">
                                         <field name="name"/>
                                         <templates>
                                             <t t-name="kanban-box">
@@ -138,9 +94,53 @@
                                             </t>
                                         </templates>
                                     </kanban>
-                                </field>  -->
+                                </field> 
                             </group>
                         </group>
+
+                        <group string="Goals">
+                            <field name="planline_ids" nolabel="1" colspan="4">
+                                <tree string="Planline List" version="7.0" editable="bottom" >
+                                    <field name="type_id"/>
+                                    <field name="target_goal"/>
+                                </tree>
+                            </field>
+                            <label for="visibility_mode" colspan="1"/>
+                            <div>
+                                <field name="visibility_mode" widget="radio" colspan="1" />
+
+                                <group name="visibility_mode_help" class="oe_grey oe_edit_only" colspan="2">
+                                    <p attrs="{'invisible': [('visibility_mode','!=','board')]}">
+                                       In Leaderboard mode, the reports will contain the progress of users of this plan.
+                                    </p>
+                                    <p attrs="{'invisible': [('visibility_mode','!=','progressbar')]}">
+                                       In Personal Progressbar mode, the progress of each user can only be seen by himself and the followers of this plan.
+                                    </p>
+                                </group>
+                            </div>
+                            <label for="remind_update_delay"/>
+                            <div>
+                                <field name="remind_update_delay" class="oe_inline"/> days
+                            </div>
+                        </group>
+
+                        <group string="Notification Message" colspan="4">
+                            <field name="report_message_frequency" />
+                            <field name="report_header" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
+                            
+                            <label for="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
+                            <div  attrs="{'invisible': [('report_message_frequency','=','never')]}" >
+                                <field name="report_message_group_id" />
+                                <group name="report_help" class="oe_grey oe_edit_only" col="2" colspan="2">
+                                   <p attrs="{'invisible': [('report_message_group_id','!=',False)]}">
+                                       Select a group that will receive a copy of the reports.
+                                   </p>
+                                   <p attrs="{'invisible': [('report_message_group_id','=',False)]}">
+                                       A copy of the report will be sent to this group.
+                                   </p>
+                               </group>
+                           </div>
+                        </group>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>

From 9ae0fc2f38ef8db812db45030c0872f98fc386d1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 5 Apr 2013 17:30:06 +0200
Subject: [PATCH 248/547] [FIX] correct reports

bzr revid: mat@openerp.com-20130405153006-b7v03x8s4lbucto3
---
 addons/gamification/templates/group_progress.mako | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index 3dc9c3177a1..f2c7c28e3fd 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -4,7 +4,7 @@
 	% for planline in planlines_boards: 
         <table width="100%" border="1">
         	<tr>
-        		<th colspan="4">${planline['goal_type']}</th>
+        		<th colspan="4">${planline.goal_type.name}</th>
         	</tr>
         	<tr>
 	            <th>#</th>
@@ -12,14 +12,14 @@
 	            <th>Completeness</th>
 	            <th>Current</th>
 	        </tr>
-	        % for idx, goal in planline['board_goals']:
+	        % for idx, goal in planline.board_goals:
 	            <tr
 	                % if goal.completeness >= 100:
 	                    style="font-weight:bold;"
 	                % endif
 	                >
 	                <td>${idx+1}</td>
-	                <td>${goal.user.name}</td>
+	                <td>${goal.user_id.name}</td>
 	                <td>${goal.completeness}%</td>
 	                <td>${goal.current}/${goal.target_goal}</td>
 	            </tr>

From b6437a010c574e861956f80f0b49315dff1b2199 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 5 Apr 2013 17:44:37 +0200
Subject: [PATCH 249/547] [IMP] better planline view

bzr revid: mat@openerp.com-20130405154437-y52cq4vqy7fxcgah
---
 addons/gamification/plan.py       | 3 +++
 addons/gamification/plan_view.xml | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index b53bc6ae5db..27fdd89546c 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -585,4 +585,7 @@ class gamification_goal_planline(osv.Model):
             store={
                 'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
                 }),
+        'type_condition': fields.related('type_id', 'condition', type="selection",
+            readonly=True, string="Condition", selection=[('lower', '<='), ('higher', '>=')]),
+        'type_unit': fields.related('type_id', 'unit', type="char", readonly=True, string="Unit"),
     }
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index c638c19a29b..c4c30f1af13 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -99,12 +99,7 @@
                         </group>
 
                         <group string="Goals">
-                            <field name="planline_ids" nolabel="1" colspan="4">
-                                <tree string="Planline List" version="7.0" editable="bottom" >
-                                    <field name="type_id"/>
-                                    <field name="target_goal"/>
-                                </tree>
-                            </field>
+                            <field name="planline_ids" nolabel="1" colspan="4" />
                             <label for="visibility_mode" colspan="1"/>
                             <div>
                                 <field name="visibility_mode" widget="radio" colspan="1" />
@@ -158,7 +153,9 @@
             <field name="arch" type="xml">
                 <tree string="planline list" >
                     <field name="type_id"/>
+                    <field name="type_condition"/>
                     <field name="target_goal"/>
+                    <field name="type_unit"/>
                 </tree>
             </field>
         </record>

From 8c07975c91906dc05864a9babbaba7b4f6a5ea1d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 8 Apr 2013 12:19:40 +0200
Subject: [PATCH 250/547] [IMP] security rules

bzr revid: mat@openerp.com-20130408101940-syg67y7nx3hw12gg
---
 addons/gamification/security/gamification_security.xml   | 2 +-
 addons/hr_evaluation/security/hr_evaluation_security.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 227d8e21584..91eae1a84d3 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <record model="ir.module.category" id="module_goal_category">
-            <field name="name">Goal</field>
+            <field name="name">Gamification</field>
             <field name="description"></field>
             <field name="sequence">17</field>
         </record>
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 7c7d6f43ee3..ea6f9a1c322 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -26,6 +26,11 @@
         <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
     </record>
 
+    <!-- makes HR managers Gamification managers -->
+    <record id="base.group_hr_manager" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('gamification.group_goal_manager'))]"/>
+    </record>    
+
 </data>
 <data noupdate="1">
 

From 32b523c1d6f52bfb13eff396cf329074ad6bb654 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 8 Apr 2013 15:17:29 +0200
Subject: [PATCH 251/547] [IMP] better UI

bzr revid: mat@openerp.com-20130408131729-lhlv0mhss502j9m1
---
 addons/gamification/goal.py                   |  85 ++++-----
 addons/gamification/goal_base_data.xml        |   8 +-
 addons/gamification/goal_view.xml             |  46 ++---
 addons/gamification/plan.py                   |  81 ++++-----
 addons/gamification/plan_view.xml             | 164 ++++++++++--------
 addons/gamification/res_users.py              |   7 +-
 addons/gamification/static/src/css/goal.css   |   8 +-
 .../static/src/js/gamification.js             |   8 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |   8 +-
 .../security/hr_evaluation_security.xml       |   9 +-
 10 files changed, 217 insertions(+), 207 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 6ee819a9610..9f9df9b9d41 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -41,49 +41,46 @@ class gamification_goal_type(osv.Model):
     _description = 'Gamification goal type'
 
     _columns = {
-        'name': fields.char('Type Name', required=True, translate=True),
-        'description': fields.text('Description'),
-        'monetary': fields.boolean('Use Currency', help="The target and current value used is monetary"),
-        'unit': fields.char('Unit',
+        'name': fields.char('Goal Type Name', required=True, translate=True),
+        'description': fields.text('Goal Description'),
+        'monetary': fields.boolean('Monetary Value', help="The target and current value are defined in the company currency."),
+        'unit': fields.char('Suffix',
             help="The unit of the target and current values", translate=True),
         'computation_mode': fields.selection([
-                ('sum', 'Sum'),
-                ('count', 'Count'),
-                ('manually', 'Manually')
+                ('manually', 'Recorded manually'),
+                ('count', 'Automatic: number of records'),
+                ('sum', 'Automatic: sum on a field'),
             ],
-            string="Mode of Computation",
-            help="""How is computed the goal value :\n
-- 'Sum' for the total of the values if the 'Evaluated field'\n
-- 'Count' for the number of entries\n
-- 'Manually' for user defined values""",
+            string="Computation Mode",
             required=True),
         'model_id': fields.many2one('ir.model',
             string='Model',
             help='The model object for the field to evaluate'),
         'field_id': fields.many2one('ir.model.fields',
-            string='Evaluated Field',
+            string='Field to Sum',
             help='The field containing the value to evaluate'),
         'field_date_id': fields.many2one('ir.model.fields',
-            string='Evaluated Date Field',
+            string='Date Field',
             help='The date to use for the time period evaluated'),
-        'domain': fields.char("Domain",
+        'domain': fields.char("Filter Domain",
             help="Technical filters rules to apply",
             required=True), # how to apply it ?
         'condition': fields.selection([
-                ('lower', '<='),
-                ('higher', '>=')
+                ('higher', 'The higher the better'),
+                ('lower', 'The lower the better')
             ],
-            string='Validation Condition',
+            string='Goal Performance',
             help='A goal is considered as completed when the current value is compared to the value to reach',
             required=True),
         'sequence': fields.integer('Sequence',
             help='Sequence number for ordering',
             required=True),
 
-        'action_id': fields.char("Action",
-            help="The action xml id that will be called to update the goal value."),
-        'res_id_field': fields.char("id field",
-            help="The field name on the user profile containing the value for res_id for action")
+        'action_id': fields.many2one('ir.actions.act_window',
+            string="Action",
+            help="The action that will be called to update the goal value."),
+        'res_id_field': fields.char("ID Field of user",
+            help="The field name on the user profile (res.users) containing the value for res_id for action.")
     }
 
     _order = 'sequence'
@@ -321,26 +318,34 @@ class gamification_goal(osv.Model):
         In case of a manual goal, should return a wizard to update the value
         :return: action description in a dictionnary
         """
+        print("get_action")
         goal = self.browse(cr, uid, goal_id, context=context)
         if goal.type_id.action_id:
-            try:
-                model, xml_id = goal.type_id.action_id.split('.', 1)
-                action = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, model, xml_id, context=context)
+            action_obj = goal.type_id.action_id
+            action = {
+                'name': action_obj.name,
+                'view_type': action_obj.view_type,
+                'view_mode': action_obj.view_mode,
+                'res_model': action_obj.res_model,
+                'domain': action_obj.domain,
+                'context': action_obj.context,
+                'type': 'ir.actions.act_window',
+                'search_view_id': action_obj.search_view_id.id,
+                'views': [(v.view_id.id, v.view_mode) for v in action_obj.view_ids]
+            }
 
-                if goal.type_id.res_id_field:
-                    current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
-                    # eg : company_id.id
-                    field_names = goal.type_id.res_id_field.split('.')
-                    res = current_user.__getitem__(field_names[0])
-                    for field_name in field_names[1:]:
-                        res = res.__getitem__(field_name)
-                    action['res_id'] = res
-                    action['view_mode'] = 'form'  # if one element to display, should see it in form mode
-                    action['target'] = 'new'
-                print(action)
-                return action
-            except ValueError:
-                _logger.warning("Invalid XML ID '%s' for goal action.", goal.type_id.action_id)
+            if goal.type_id.res_id_field:
+                current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
+                # eg : company_id.id
+                field_names = goal.type_id.res_id_field.split('.')
+                res = current_user.__getitem__(field_names[0])
+                for field_name in field_names[1:]:
+                    res = res.__getitem__(field_name)
+                action['res_id'] = res
+                action['view_mode'] = 'form'  # if one element to display, should see it in form mode
+                action['target'] = 'new'
+            print(action)
+            return action
 
         if goal.computation_mode == 'manually':
             action = {
@@ -352,9 +357,7 @@ class gamification_goal(osv.Model):
             }
             action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
             action['res_model'] = 'gamification.goal.wizard'
-            print(action)
             return action
-        print(False)
         return False
 
     def changed_users_avatar(self, cr, uid, ids, context):
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 656758b630d..de88331caec 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -9,7 +9,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
-            <field name="action_id">base.action_res_users_my</field>
+            <field name="action_id" eval="ref('base.action_res_users_my')" />
             <field name="res_id_field">id</field>
         </record>
 
@@ -18,7 +18,7 @@
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
             <!-- problem : default avatar != False -> manually + check in write function -->
-            <field name="action_id">base.action_res_users_my</field>
+            <field name="action_id" eval="ref('base.action_res_users_my')" />
             <field name="res_id_field">id</field>
         </record>
 
@@ -29,7 +29,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id), ('name', '!=', 'Your Company')]</field>
-            <field name="action_id">base.action_res_company_form_my</field>
+            <field name="action_id" eval="ref('base.action_res_company_form_my')" />
             <field name="res_id_field">company_id.id</field>
         </record>
 
@@ -38,7 +38,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id),('logo', '!=', False)]</field>
-            <field name="action_id">base.action_res_company_form</field>
+            <field name="action_id" eval="ref('base.action_res_company_form')" />
             <field name="res_id_field">company_id.id</field>
         </record>
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index c6ed02491df..12658b541c6 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -114,6 +114,7 @@
 
                     <field name="user_id"/>
                     <field name="type_id"/>
+                    <field name="plan_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_by_user" string="User" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter name="group_by_type" string="Goal Type" domain="[]" context="{'group_by':'type_id'}"/>
@@ -203,31 +204,36 @@
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                        <group>
-                            <group string="General">
-                                <field name="description" string="Tooltip"/>
-                                <field name="condition"/>
-                                <field name="monetary" />
-                                <field name="unit" attrs="{'invisible': [('monetary', '=', True)]}"/>
-                            </group>
-                            <group string="Computation">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                            </h1>
+                            <label for="description" class="oe_edit_only"/>
+                            <div>
+                                <field name="description" class="oe_inline"/>
+                            </div>
+                        
+                            <group string="How to compute the goal?">
+
                                 <field widget="radio" name="computation_mode"/>
 
                                 <!-- Hide the fields below if manually -->
-                                <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
-                                <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]" />
-                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]"/>
-                                <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}"/>
+                                <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" class="oe_inline"/>
+                                <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]"  class="oe_inline"/>
+                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]" class="oe_inline"/>
+                                <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" class="oe_inline"/>
+
+                                <field name="condition" widget="radio"/>
                             </group>
-                            <group string="User Action">
-                                <field name="action_id" />
-                                <field name="res_id_field" />
+                            <group string="Formating Options">
+                                <field name="unit" class="oe_inline"/>
+                                <field name="monetary"  class="oe_inline"/>
                             </group>
-                        </group>
+                            <group string="Clickable Goals">
+                                <field name="action_id"  class="oe_inline"/>
+                                <field name="res_id_field"  attrs="{'invisible': [('action_id', '=', False)]}" class="oe_inline"/>
+                            </group>
+
                     </sheet>
                 </form>
             </field>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 27fdd89546c..1ce9a5da61e 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -96,23 +96,41 @@ class gamification_goal_plan(osv.Model):
 
         return res
 
+    def _planline_count(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict.fromkeys(ids, 0)
+        for plan in self.browse(cr, uid, ids, context):
+            res[plan.id] = len(plan.planline_ids)
+        return res
+
     _columns = {
         'name': fields.char('Plan Name', required=True, translate=True),
+        'state': fields.selection([
+                ('draft', 'Draft'),
+                ('inprogress', 'In Progress'),
+                ('done', 'Done'),
+            ],
+            string='State',
+            required=True),
+        'manager_id': fields.many2one('res.users',
+            string='Responsible', help="The user responsible for the plan."),
+        'start_date': fields.date('Planned Start Date', help="The day a new plan will be automatically started. The start and end dates for goals are still defined by the periodicity (eg: weekly goals run from Monday to Sunday)."),
+
         'user_ids': fields.many2many('res.users',
             string='Users',
             help="List of users to which the goal will be set"),
-        'manager_id': fields.many2one('res.users', required=True,
-            string='Responsible', help="The user responsible for the plan."),
+        'autojoin_group_id': fields.many2one('res.groups',
+            string='Auto-subscription Group',
+            help='Group of users whose members will automatically be added to the users'),
+
         'planline_ids': fields.one2many('gamification.goal.planline',
             'plan_id',
             string='Planline',
             help="list of goals that will be set",
             required=True),
-        'autojoin_group_id': fields.many2one('res.groups',
-            string='Auto-subscription Group',
-            help='Group of users whose members will automatically be added to the users'),
+        'planline_count': fields.function(_planline_count, type='integer', string="Planlines"),
+
         'period': fields.selection([
-                ('once', 'No Periodicity'),
+                ('once', 'Non recurring'),
                 ('daily', 'Daily'),
                 ('weekly', 'Weekly'),
                 ('monthly', 'Monthly'),
@@ -121,20 +139,11 @@ class gamification_goal_plan(osv.Model):
             string='Periodicity',
             help='Period of automatic goal assigment. If none is selected, should be launched manually.',
             required=True),
-        'start_date': fields.date('Starting Date', help="The day a new plan will be automatically started. The start and end dates for goals are still defined by the periodicity (eg: weekly goals run from Monday to Sunday)."),
-        'state': fields.selection([
-                ('draft', 'Draft'),
-                ('inprogress', 'In Progress'),
-                ('done', 'Done'),
-            ],
-            string='State',
-            required=True),
         'visibility_mode': fields.selection([
-                ('board', 'Leader Board'),
-                ('progressbar', 'Personal Progressbar')
+                ('progressbar', 'Individual Goals'),
+                ('board', 'Leader Board (Group Ranking)'),
             ],
-            string="Visibility",
-            help='How are displayed the results, shared or in a single progressbar',
+            string="Display Mode",
             required=True),
         'report_message_frequency': fields.selection([
                 ('never','Never'),
@@ -150,8 +159,8 @@ class gamification_goal_plan(osv.Model):
             string='Send a copy to',
             help='Group that will receive a copy of the report in addition to the user'),
         'report_header': fields.text('Report Header'),
-        'remind_update_delay': fields.integer('Remind delay for Manual Goals',
-            help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value or zero is specified."),
+        'remind_update_delay': fields.integer('Non-updated manual goals will be reminded after',
+            help="Never reminded if no value or zero is specified."),
         'last_report_date': fields.date('Last Report Date'),
         'next_report_date': fields.function(_get_next_report_date,
             type='date',
@@ -163,9 +172,9 @@ class gamification_goal_plan(osv.Model):
         'state': 'draft',
         'visibility_mode' : 'progressbar',
         'report_message_frequency' : 'onchange',
-        'last_report_date' : fields.date.today,
-        'start_date' : fields.date.today,
-        'manager_id' : lambda s, cr, uid, c: uid,
+        'last_report_date': fields.date.today,
+        'start_date': fields.date.today,
+        'manager_id': lambda s, cr, uid, c: uid,
     }
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -228,7 +237,6 @@ class gamification_goal_plan(osv.Model):
 
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
-                print("subscribe from group", plan.autojoin_group_id, [user.id for user in plan.autojoin_group_id.users])
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
             self.generate_goals_from_plan(cr, uid, [plan.id], context=context)
 
@@ -305,30 +313,6 @@ class gamification_goal_plan(osv.Model):
 
         return True
 
-    def action_show_related_goals(self, cr, uid, ids, context=None):
-        """ This opens goal view with a restriction to the list of goals from this plan only
-            @return: the goal view
-        """
-        # get ids of related goals
-        goal_obj = self.pool.get('gamification.goal')
-        related_goal_ids = []
-        goal_ids = goal_obj.search(cr, uid, [('plan_id', 'in', ids)], context=context)
-        for plan in self.browse(cr, uid, ids, context=context):
-            for planline in plan.planline_ids:
-                goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)], context=context)
-                related_goal_ids.extend(goal_ids)
-
-        # process the new view
-        if context is None:
-            context = {}
-        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'gamification','goals_from_plan_act', context=context)
-        res['context'] = context
-        res['context'].update({
-            'default_id': related_goal_ids,
-        })
-        res['domain'] = [('id','in', related_goal_ids)]
-        return res
-
     def action_report_progress(self, cr, uid, ids, context=None):
         """Manual report of a goal, does not influence automatic report frequency"""
         for plan in self.browse(cr, uid, ids, context):
@@ -588,4 +572,5 @@ class gamification_goal_planline(osv.Model):
         'type_condition': fields.related('type_id', 'condition', type="selection",
             readonly=True, string="Condition", selection=[('lower', '<='), ('higher', '>=')]),
         'type_unit': fields.related('type_id', 'unit', type="char", readonly=True, string="Unit"),
+        'type_monetary': fields.related('type_id', 'monetary', type="boolean", readonly=True, string="Monetary"),
     }
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index c4c30f1af13..514bb1d85ae 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -5,7 +5,7 @@
         <record id="goal_plan_list_action" model="ir.actions.act_window">
             <field name="name">Goal Plans</field>
             <field name="res_model">gamification.goal.plan</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal plan. 
@@ -34,9 +34,15 @@
 
         <record id="goals_from_plan_act" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
-            <field name="view_type">form</field>
             <field name="name">Related Goals</field>
-            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_mode">kanban,tree</field>
+            <field name="context">{'search_default_group_by_type': True, 'search_default_inprogress': True, 'default_plan_id': active_id}</field>
+            <field name="help" type="html">
+              <p>
+                There is no goals associated to this plan matching your search.
+                Make sure that your plan is active and associated to at least one user.
+              </p>
+            </field>
         </record>
 
         <record id="goal_plan_form_view" model="ir.ui.view">
@@ -45,7 +51,7 @@
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <header>
-                        <button string="Manual Start" type="object" name="action_start" states="draft" class="oe_highlight"/>
+                        <button string="Start Now" type="object" name="action_start" states="draft" class="oe_highlight"/>
                         <button string="Check Plan" type="object" name="action_check" states="inprogress"/>
                         <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Reset to Draft" type="object" name="action_cancel" states="inprogress"/>
@@ -54,88 +60,62 @@
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
+
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>    
-                                <field name="name" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="name" placeholder="e.g. Monthly Sales Objectives"/>
                             </h1>
+                            <label for="user_ids" class="oe_edit_only" string="Apply Plan To"/>
+                            <div>
+                                <field name="user_ids" widget="many2many_tags" />
+                            </div>
                         </div>
 
                         <!-- action buttons -->
                         <div class="oe_right oe_button_box">
-                            <button name="action_show_related_goals" type="object" string="Related Goals" help="show all the generated goals for this plan" context="{'search_default_group_by_user': True}" />
+                            <button type="action" name="%(goals_from_plan_act)d" string="Related Goals" attrs="{'invisible': [('state','=','draft')]}" />
                         </div>
-
-                        <group colspan="2">
-                            <field name="manager_id" />
+                        <group>
+                            <group>
+                                <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="visibility_mode" widget="radio" colspan="1" />
+                            </group>
+                            <group>
+                                <field name="manager_id"/>
+                                <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            </group>
                         </group>
-                        <group colspan="2">
-                            <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="period" attrs="{'readonly':[('state','!=','draft')]}"/>
-                        </group>
-                        <group string="Evaluated Users">
-                            <group colspan="4">
+                        <notebook>
+                        <page string="Goals">
+                            <field name="planline_ids" nolabel="1" colspan="4">
+                                <tree string="Planline List" version="7.0" editable="bottom" >
+                                    <field name="type_id"/>
+                                    <field name="type_condition"/>
+                                    <field name="target_goal"/>
+                                    <field name="type_unit"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Advanced Options">
+                            <group string="Subscribe Users Automatically">
                                 <field name="autojoin_group_id" />
                             </group>
-                            <group colspan="4">
-                                <field name="user_ids" widget="many2many_kanban">
-                                    <kanban quick_create="false" create="true">
-                                        <field name="name"/>
-                                        <templates>
-                                            <t t-name="kanban-box">
-                                                <div style="position: relative">
-                                                    <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                    <div class="oe_module_vignette">
-                                                        <div class="oe_module_desc">
-                                                            <field name="name"/>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </t>
-                                        </templates>
-                                    </kanban>
-                                </field> 
+                            <group string="Notification Messages">
+                                <field name="report_message_frequency" />
+                                <field name="report_header" placeholder="e.g. The following message contains the current progress of the sale team..." attrs="{'invisible': [('report_message_frequency','=','never')]}" />
+                                <field name="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
                             </group>
-                        </group>
+                            <group string="Reminders for Manual Goals">
+                                <label for="remind_update_delay" />
+                                <div>
+                                    <field name="remind_update_delay" class="oe_inline"/> days
+                                </div>
+                            </group>
+                        </page>
+                        </notebook>
 
-                        <group string="Goals">
-                            <field name="planline_ids" nolabel="1" colspan="4" />
-                            <label for="visibility_mode" colspan="1"/>
-                            <div>
-                                <field name="visibility_mode" widget="radio" colspan="1" />
-
-                                <group name="visibility_mode_help" class="oe_grey oe_edit_only" colspan="2">
-                                    <p attrs="{'invisible': [('visibility_mode','!=','board')]}">
-                                       In Leaderboard mode, the reports will contain the progress of users of this plan.
-                                    </p>
-                                    <p attrs="{'invisible': [('visibility_mode','!=','progressbar')]}">
-                                       In Personal Progressbar mode, the progress of each user can only be seen by himself and the followers of this plan.
-                                    </p>
-                                </group>
-                            </div>
-                            <label for="remind_update_delay"/>
-                            <div>
-                                <field name="remind_update_delay" class="oe_inline"/> days
-                            </div>
-                        </group>
-
-                        <group string="Notification Message" colspan="4">
-                            <field name="report_message_frequency" />
-                            <field name="report_header" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
-                            
-                            <label for="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
-                            <div  attrs="{'invisible': [('report_message_frequency','=','never')]}" >
-                                <field name="report_message_group_id" />
-                                <group name="report_help" class="oe_grey oe_edit_only" col="2" colspan="2">
-                                   <p attrs="{'invisible': [('report_message_group_id','!=',False)]}">
-                                       Select a group that will receive a copy of the reports.
-                                   </p>
-                                   <p attrs="{'invisible': [('report_message_group_id','=',False)]}">
-                                       A copy of the report will be sent to this group.
-                                   </p>
-                               </group>
-                           </div>
-                        </group>
+                        
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
@@ -145,6 +125,44 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_goal_plan_kanban">
+            <field name="name">Goal Plan Kanban</field>
+            <field name="model">gamification.goal.plan</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_background_grey">
+                    <field name="planline_ids"/>
+                    <field name="planline_count"/>
+                    <field name="user_ids"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_goal oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><a type="edit">Configure Goal Plan</a></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+
+                                    <h4><field name="name"/></h4>
+                                    <div class="oe_kanban_project_list">
+                                        <a type="action" name="%(goals_from_plan_act)d" style="margin-right: 10px"> 
+                                            <span t-if="record.planline_count.raw_value gt 1"><field name="planline_count"/> Goals</span>
+                                            <span t-if="record.planline_count.raw_value lt 2"><field name="planline_count"/> Goal</span>
+                                        </a>
+                                    </div>
+                                    <div class="oe_kanban_badge_avatars">
+                                        <t t-foreach="record.user_ids.raw_value.slice(0,11)" t-as="member">
+                                            <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
+                                        </t>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
 
         <!-- Planline -->
         <record id="goal_planline_list_view" model="ir.ui.view">
@@ -153,9 +171,7 @@
             <field name="arch" type="xml">
                 <tree string="planline list" >
                     <field name="type_id"/>
-                    <field name="type_condition"/>
                     <field name="target_goal"/>
-                    <field name="type_unit"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index bde044c8fff..b773f189784 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -50,13 +50,14 @@ class res_users_gamification_group(osv.Model):
 
                 serialized_goals_info['planlines'] = []
                 for planline_board in goals_info:
+                    print("planline_board", planline_board.name)
                     vals = {'type_name': planline_board['goal_type'].name,
                             'type_description': planline_board['goal_type'].description,
                             'type_condition': planline_board['goal_type'].condition,
                             'type_computation_mode': planline_board['goal_type'].computation_mode,
                             'type_monetary': planline_board['goal_type'].monetary,
                             'type_unit': planline_board['goal_type'].unit,
-                            'type_action': planline_board['goal_type'].action_id,
+                            'type_action': True if planline_board['goal_type'].action_id else False,
                             'goals': []}
                     for goal in planline_board['board_goals']:
                         vals['goals'].append({
@@ -84,6 +85,7 @@ class res_users_gamification_group(osv.Model):
 
                 serialized_goals_info['goals'] = []
                 for goal in goals_info['goals']:
+                    print("goal", goal.type_id.name)
                     serialized_goals_info['goals'].append({
                         'id': goal.id,
                         'type_name': goal.type_id.name,
@@ -91,13 +93,14 @@ class res_users_gamification_group(osv.Model):
                         'type_condition': goal.type_id.condition,
                         'type_monetary': goal.type_id.monetary,
                         'type_unit': goal.type_id.unit,
-                        'type_action': goal.type_id.action_id,
+                        'type_action': True if goal.type_id.action_id else False,
                         'state': goal.state,
                         'completeness': goal.completeness,
                         'computation_mode': goal.computation_mode,
                         'current': goal.current,
                         'target_goal': goal.target_goal,
                     })
+                    print("goal", True if goal.type_id.action_id else False)
 
             all_goals_info.append(serialized_goals_info)
         return all_goals_info
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index f3134f704b8..41bc282df5b 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,7 +1,8 @@
 /* Kanban views */
-.openerp .oe_notebook_page .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
   width: 220px;
+  min-height: 160px;
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached {
   background-color: #A1FF81;
@@ -18,7 +19,9 @@
   font-size: 0.9em;
 }
 
-
+.oe_kanban_badge_avatars {
+    margin-top: 8px;
+}
 .oe_kanban_badge_avatars img {
     width: 30px;
     height: 30px;
@@ -29,6 +32,7 @@
 }
 
 
+
 /* Mail Sidebar */
 
 .openerp .oe_mail_wall .oe_mail_wall_aside {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index dcee68197ae..4aa456964c5 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -27,13 +27,10 @@ openerp.gamification = function(instance) {
                     self.get_goal_todo_info();
                 });
             },
-            // 'click a.oe_show_description': function(event) {
-            //     var goal_id = parseInt(event.currentTarget.id);
-            //     this.$el.find('.oe_type_description_'+goal_id).toggle(10);
-            // },
             'click a.oe_goal_action': function(event) {
                 var self = this;
                 var goal_id = parseInt(event.currentTarget.id, 10);
+                console.log("oe_goal_action");
                 var goal_action = new instance.web.Model('gamification.goal').call('get_action', [goal_id]).then(function(res) {
                     goal_action['action'] = res;
                 });
@@ -62,13 +59,13 @@ openerp.gamification = function(instance) {
         },
         get_goal_todo_info: function() {
             var self = this;
+            console.log("get_goal_todo_info");
             var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
                 self.goals_info['info'] = res;
             });
             $.when(goals_info).done(function() {
                 if(self.goals_info.info.length > 0){
                     self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
-                    self.$el.find('.oe_type_description').hide();
                     self.render_money_fields(self.goals_info.info[0].currency);
                     self.render_progress_bars();
                 }
@@ -116,6 +113,7 @@ openerp.gamification = function(instance) {
         start: function() {
             this._super();
             var self = this;
+            console.log("start");
             var sidebar = new instance.gamification.Sidebar(self);
             sidebar.appendTo($('.oe_mail_wall_aside'));
         }
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e3118ce791a..23618b5e9c5 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -416,15 +416,15 @@
         <record id="goals_menu_groupby_act" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
             <field name="view_type">form</field>
-            <field name="name">Related Goals</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="context">{'search_default_group_by_type': True}</field>
+            <field name="name">Goals</field>
+            <field name="view_mode">tree,kanban,form</field>
+            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
         </record>
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
         <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager" />
-        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="base.group_hr_manager"/>
+        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="gamification.group_goal_manager"/>
 
       <!-- Email Compose message Action-->
       <act_window
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index ea6f9a1c322..10299175276 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -2,9 +2,9 @@
 <openerp>
 <data noupdate="0">
 
-    <!-- make Employee users Survey users -->
+    <!-- make Employee users Survey users and Gamification manager -->
     <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_survey_user')), (4, ref('gamification.group_goal_manager'))]"/>
     </record>
 
     <record id="survey.menu_surveys" model="ir.ui.menu">
@@ -26,11 +26,6 @@
         <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
     </record>
 
-    <!-- makes HR managers Gamification managers -->
-    <record id="base.group_hr_manager" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('gamification.group_goal_manager'))]"/>
-    </record>    
-
 </data>
 <data noupdate="1">
 

From 1a5ae7f32e8c06c0d623439e0a0939d28dc960c6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 8 Apr 2013 16:11:32 +0200
Subject: [PATCH 252/547] [IMP] better UI

bzr revid: mat@openerp.com-20130408141132-or43mhdl8d5ds7xb
---
 addons/gamification/goal_base_data.xml                 | 2 +-
 addons/gamification/goal_view.xml                      | 8 ++++----
 addons/gamification/plan.py                            | 4 ++++
 addons/gamification/res_users.py                       | 9 ++-------
 addons/gamification/security/gamification_security.xml | 8 ++++++++
 addons/hr_evaluation/hr_evaluation_view.xml            | 4 ++--
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index de88331caec..ebb5e518aae 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -29,7 +29,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id), ('name', '!=', 'Your Company')]</field>
-            <field name="action_id" eval="ref('base.action_res_company_form_my')" />
+            <field name="action_id" eval="ref('base.action_res_company_form')" />
             <field name="res_id_field">company_id.id</field>
         </record>
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 12658b541c6..31c8b6ac4a2 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -23,12 +23,12 @@
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <tree string="Goal List" colors="red:state == 'failed';green:state == 'reached';grey:state == 'canceled'"> 
-                    <field name="type_id"/>
-                    <field name="user_id"/>
-                    <field name="current"/>
-                    <field name="target_goal"/>
+                    <field name="type_id" invisible="1" />
+                    <field name="user_id" invisible="1" />
                     <field name="start_date"/>
                     <field name="end_date"/>
+                    <field name="current"/>
+                    <field name="target_goal"/>
                     <field name="completeness" widget="progressbar"/>
                     <field name="state" invisible="1"/>
                     <field name="planline_id" invisible="1"/>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 1ce9a5da61e..a05870e02cd 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -414,6 +414,10 @@ class gamification_goal_plan(osv.Model):
 
             board_goals = [goal for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context)]
 
+            if len(board_goals) == 0:
+                # planline has no generated goals
+                continue
+
             # most complete first, current if same percentage (eg: if several 100%)
             sorted_board = enumerate(sorted(board_goals, key=lambda k: (k.completeness, k.current), reverse=True))
             planlines_boards.append({'goal_type': planline.type_id, 'board_goals': sorted_board})
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index b773f189784..0fd2e5ce2e1 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -45,12 +45,12 @@ class res_users_gamification_group(osv.Model):
                 # board report should be grouped by planline for all users
                 goals_info = plan_obj.get_board_goal_info(cr, uid, plan, subset_goal_ids=False, context=context)
 
-                if not goals_info:
+                if len(goals_info) == 0:
+                    # plan with no valid planlines
                     continue
 
                 serialized_goals_info['planlines'] = []
                 for planline_board in goals_info:
-                    print("planline_board", planline_board.name)
                     vals = {'type_name': planline_board['goal_type'].name,
                             'type_description': planline_board['goal_type'].description,
                             'type_condition': planline_board['goal_type'].condition,
@@ -73,9 +73,6 @@ class res_users_gamification_group(osv.Model):
                             vals['own_goal_id'] = goal[1].id
                     serialized_goals_info['planlines'].append(vals)
 
-                if len(serialized_goals_info['planlines']) == 0:
-                    # plan with no valid planlines
-                    continue
             else:
                 # individual report are simply a list of goal
                 goals_info = plan_obj.get_indivual_goal_info(cr, uid, uid, plan, subset_goal_ids=False, context=context)
@@ -85,7 +82,6 @@ class res_users_gamification_group(osv.Model):
 
                 serialized_goals_info['goals'] = []
                 for goal in goals_info['goals']:
-                    print("goal", goal.type_id.name)
                     serialized_goals_info['goals'].append({
                         'id': goal.id,
                         'type_name': goal.type_id.name,
@@ -100,7 +96,6 @@ class res_users_gamification_group(osv.Model):
                         'current': goal.current,
                         'target_goal': goal.target_goal,
                     })
-                    print("goal", True if goal.type_id.action_id else False)
 
             all_goals_info.append(serialized_goals_info)
         return all_goals_info
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 91eae1a84d3..a488d27e88b 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -34,11 +34,19 @@
             <field name="name">Manager has all rights on user's goals</field>
             <field name="model_id" ref="model_gamification_goal"/>
             <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
         </record>
         <record id="goal_plan_manager_visibility" model="ir.rule">
             <field name="name">Manager has all rights on goal plans</field>
             <field name="model_id" ref="model_gamification_goal_plan"/>
             <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
         </record>
 
     </data>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 23618b5e9c5..888c77eb808 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -416,8 +416,8 @@
         <record id="goals_menu_groupby_act" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
             <field name="view_type">form</field>
-            <field name="name">Goals</field>
-            <field name="view_mode">tree,kanban,form</field>
+            <field name="name">Goals History</field>
+            <field name="view_mode">tree,kanban</field>
             <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
         </record>
 

From 0f2dad413b0d0cd3325c7b880bce10a2f6e4a5c4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 9 Apr 2013 16:23:02 +0200
Subject: [PATCH 253/547] [ADD] use gauge for kanbans

bzr revid: mat@openerp.com-20130409142302-lsyye6g5cfl3wa90
---
 addons/gamification/__openerp__.py            |   5 +-
 addons/gamification/goal_view.xml             |  12 +-
 addons/gamification/plan_view.xml             |   2 +-
 addons/gamification/static/src/css/goal.css   |   6 +-
 .../static/src/js/gamification.js             |  36 +-
 addons/gamification/static/src/js/justgage.js | 885 ++++++++++++++++++
 6 files changed, 935 insertions(+), 11 deletions(-)
 create mode 100644 addons/gamification/static/src/js/justgage.js

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index c9ecdf0252b..fe180b20c2b 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -61,6 +61,9 @@ A **Badge** is a symbolic token granted to a user as a sign of reward. It can be
     'application': True,
     'auto_install': True,
     'css': ['static/src/css/goal.css'],
-    'js': ['static/src/js/gamification.js'],
+    'js': [
+        'static/src/js/gamification.js',
+        'static/src/js/justgage.js',
+    ],
     'qweb': ['static/src/xml/gamification.xml'],
 }
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 31c8b6ac4a2..c0953362112 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -144,20 +144,22 @@
                                     <div class="oe_kanban_left">
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
                                     </div>
-                                    <h4><field name="type_id"/></h4>
+                                    <h4 class="oe_goal_name"><field name="type_id"/></h4>
                                     <t t-if="record.type_description.value">
                                         <em><field name="type_description"/></em>
                                     </t>
-                                    <div class="oe_kanban_project_list">
-                                        <p>
-                                            <big><t t-esc="Math.round(record.current.raw_value)"/>/<t t-esc="Math.round(record.target_goal.raw_value)"/></big>
+                                    <div class="oe_goal_gauge">
+                                        <!-- <p>
+                                            <span class="oe_goal_current"><t t-esc="Math.round(record.current.raw_value)"/></span>/<span class="oe_goal_target"><t t-esc="Math.round(record.target_goal.raw_value)"/></span>
                                             <t t-if="record.type_unit.value"><field name="type_unit"/></t>
                                             <t t-if="record.type_condition.raw_value == 'higher'">
                                                 &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
                                             </t>
                                             <br/>
+                                            <span class="oe_goal_id"><t t-esc="record.id.raw_value"/></span>
+
                                             <small>End: <field name="end_date" /></small>
-                                        </p>
+                                        </p> -->
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 514bb1d85ae..f305eb13192 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -36,7 +36,7 @@
             <field name="res_model">gamification.goal</field>
             <field name="name">Related Goals</field>
             <field name="view_mode">kanban,tree</field>
-            <field name="context">{'search_default_group_by_type': True, 'search_default_inprogress': True, 'default_plan_id': active_id}</field>
+            <field name="context">{'search_default_group_by_type': True, 'search_default_inprogress': True, 'search_default_plan_id': active_id, 'default_plan_id': active_id}</field>
             <field name="help" type="html">
               <p>
                 There is no goals associated to this plan matching your search.
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 41bc282df5b..57b76dd70c3 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -3,6 +3,7 @@
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
   width: 220px;
   min-height: 160px;
+  /*height: 200px;*/
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached {
   background-color: #A1FF81;
@@ -30,7 +31,10 @@
     border-radius: 2px;
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
-
+.oe_goal_gauge {
+    width:200px;
+    height:150px;
+}
 
 
 /* Mail Sidebar */
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 4aa456964c5..34acb568026 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -30,7 +30,6 @@ openerp.gamification = function(instance) {
             'click a.oe_goal_action': function(event) {
                 var self = this;
                 var goal_id = parseInt(event.currentTarget.id, 10);
-                console.log("oe_goal_action");
                 var goal_action = new instance.web.Model('gamification.goal').call('get_action', [goal_id]).then(function(res) {
                     goal_action['action'] = res;
                 });
@@ -59,7 +58,6 @@ openerp.gamification = function(instance) {
         },
         get_goal_todo_info: function() {
             var self = this;
-            console.log("get_goal_todo_info");
             var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
                 self.goals_info['info'] = res;
             });
@@ -113,9 +111,41 @@ openerp.gamification = function(instance) {
         start: function() {
             this._super();
             var self = this;
-            console.log("start");
             var sidebar = new instance.gamification.Sidebar(self);
             sidebar.appendTo($('.oe_mail_wall_aside'));
         }
     });
+
+    instance.web_kanban.KanbanRecord.include({
+        start: function () {
+            var rendering = this._super();
+            var self = this;
+
+            $.when(rendering).done(function() {
+                if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
+                    var unique_id = _.uniqueId("goal_gauge_");
+                    self.$el.find('.oe_goal_gauge').attr('id', unique_id);
+                    console.log(self.$el.find('.oe_goal_gauge').empty().get(0));
+                    // debugger;
+                    var g = new JustGage({
+                        id: unique_id,
+                        node: self.$el.find('.oe_goal_gauge').empty().get(0),
+                        value: self.record.current.raw_value,
+                        min: 0,
+                        max: self.record.target_goal.raw_value,
+                        title: self.record.type_id.value,
+                        relativeGaugeSize: true
+                    });
+                    console.log(g);
+                }
+            });
+        },
+        on_card_clicked: function() {
+            if (this.view.dataset.model === 'gamification.goal.plan') {
+                this.$('.oe_kanban_project_list a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        }
+    });
 };
diff --git a/addons/gamification/static/src/js/justgage.js b/addons/gamification/static/src/js/justgage.js
new file mode 100644
index 00000000000..b83e5cbdb1e
--- /dev/null
+++ b/addons/gamification/static/src/js/justgage.js
@@ -0,0 +1,885 @@
+/**
+ * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
+ * Check http://www.justgage.com for official releases
+ * Licensed under MIT.
+ * @author Bojan Djuricic  (@Toorshia)
+ *
+ * LATEST UPDATES
+
+ * -----------------------------
+ * April 01, 2013.
+ * -----------------------------
+     * fix - https://github.com/toorshia/justgage/issues/46
+
+ * -----------------------------
+ * March 26, 2013.
+ * -----------------------------
+     * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
+
+ * -----------------------------
+ * March 23, 2013.
+ * -----------------------------
+     * counter - option to animate value  in counting fashion
+     * fix - https://github.com/toorshia/justgage/issues/45
+
+ * -----------------------------
+ * March 13, 2013.
+ * -----------------------------
+     * refresh method - added optional 'max' parameter to use when you need to update max value
+
+ * -----------------------------
+ * February 26, 2013.
+ * -----------------------------
+     * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
+     * fixed a missing parameters bug when calling generateShadow()  for IE < 9
+
+ * -----------------------------
+ * December 31, 2012.
+ * -----------------------------
+     * fixed text y-position for hidden divs - workaround for Raphael <tspan> 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
+     * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
+     * Min and Max labels are now auto-off when in donut mode
+     * Start angle in donut mode is now 90
+     * donutStartAngle - option to define start angle for donut
+
+ * -----------------------------
+ * November 25, 2012.
+ * -----------------------------
+     * Option to define custom rendering function for displayed value
+
+ * -----------------------------
+ * November 19, 2012.
+ * -----------------------------
+     * Config.value is now updated after gauge refresh
+
+ * -----------------------------
+ * November 13, 2012.
+ * -----------------------------
+     * Donut display mode added
+     * Option to hide value label
+     * Option to enable responsive gauge size
+     * Removed default title attribute
+     * Option to accept min and max defined as string values
+     * Option to configure value symbol
+     * Fixed bad aspect ratio calculations
+     * Option to configure minimum font size for all texts
+     * Option to show shorthand big numbers (human friendly)
+     */
+
+ JustGage = function(config) {
+
+  if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
+  if (!config.node) {
+    if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
+    config.node = document.getElementById(config.id);
+  }
+
+  var obj = this;
+
+  // configurable parameters
+  obj.config =
+  {
+    // id : string
+    // this is container element id
+    id : config.id,
+
+    // node : string
+    // the node to use instead of DOM
+    node : config.node,
+
+    // title : string
+    // gauge title
+    title : (config.title) ? config.title : "",
+
+    // titleFontColor : string
+    // color of gauge title
+    titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
+
+    // value : int
+    // value gauge is showing
+    value : (config.value) ? config.value : 0,
+
+
+    // valueFontColor : string
+    // color of label showing current value
+    valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
+
+    // symbol : string
+    // special symbol to show next to value
+    symbol : (config.symbol) ? config.symbol : "",
+
+    // min : int
+    // min value
+    min : (config.min) ? parseFloat(config.min) : 0,
+
+    // max : int
+    // max value
+    max : (config.max) ? parseFloat(config.max) : 100,
+
+    // humanFriendlyDecimal : int
+    // number of decimal places for our human friendly number to contain
+    humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
+
+    // textRenderer: func
+    // function applied before rendering text
+    textRenderer  : (config.textRenderer) ? config.textRenderer : null,
+
+    // gaugeWidthScale : float
+    // width of the gauge element
+    gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
+
+    // gaugeColor : string
+    // background color of gauge element
+    gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
+
+    // label : string
+    // text to show below value
+    label : (config.label) ? config.label : "",
+
+    // labelFontColor : string
+    // color of label showing label under value
+    labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
+
+    // shadowOpacity : int
+    // 0 ~ 1
+    shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
+
+    // shadowSize: int
+    // inner shadow size
+    shadowSize : (config.shadowSize) ? config.shadowSize : 5,
+
+    // shadowVerticalOffset : int
+    // how much shadow is offset from top
+    shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
+
+    // levelColors : string[]
+    // colors of indicator, from lower to upper, in RGB format
+    levelColors : (config.levelColors) ? config.levelColors : [
+    "#a9d70b",
+    "#f9c802",
+    "#ff0000"
+    ],
+
+    // startAnimationTime : int
+    // length of initial animation
+    startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
+
+    // startAnimationType : string
+    // type of initial animation (linear, >, <,  <>, bounce)
+    startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
+
+    // refreshAnimationTime : int
+    // length of refresh animation
+    refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
+
+    // refreshAnimationType : string
+    // type of refresh animation (linear, >, <,  <>, bounce)
+    refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
+
+    // donutStartAngle : int
+    // angle to start from when in donut mode
+    donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
+
+    // valueMinFontSize : int
+    // absolute minimum font size for the value
+    valueMinFontSize : config.valueMinFontSize || 16,
+
+    // titleMinFontSize
+    // absolute minimum font size for the title
+    titleMinFontSize : config.titleMinFontSize || 10,
+
+    // labelMinFontSize
+    // absolute minimum font size for the label
+    labelMinFontSize : config.labelMinFontSize || 10,
+
+    // minLabelMinFontSize
+    // absolute minimum font size for the minimum label
+    minLabelMinFontSize : config.minLabelMinFontSize || 10,
+
+    // maxLabelMinFontSize
+    // absolute minimum font size for the maximum label
+    maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
+
+    // hideValue : bool
+    // hide value text
+    hideValue : (config.hideValue) ? config.hideValue : false,
+
+    // hideMinMax : bool
+    // hide min and max values
+    hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
+
+    // hideInnerShadow : bool
+    // hide inner shadow
+    hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
+
+    // humanFriendly : bool
+    // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
+    humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
+
+    // noGradient : bool
+    // whether to use gradual color change for value, or sector-based
+    noGradient : (config.noGradient) ? config.noGradient : false,
+
+    // donut : bool
+    // show full donut gauge
+    donut : (config.donut) ? config.donut : false,
+
+    // relativeGaugeSize : bool
+    // whether gauge size should follow changes in container element size
+    relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
+
+    // counter : bool
+    // animate level number change
+    counter : (config.counter) ? config.counter : false,
+
+    // decimals : int
+    // number of digits after floating point
+    decimals : (config.decimals) ? config.decimals : 0,
+
+    // customSectors : [] of objects
+    // number of digits after floating point
+    customSectors : (config.customSectors) ? config.customSectors : []
+  };
+
+  // variables
+  var
+  canvasW,
+  canvasH,
+  widgetW,
+  widgetH,
+  aspect,
+  dx,
+  dy,
+  titleFontSize,
+  titleX,
+  titleY,
+  valueFontSize,
+  valueX,
+  valueY,
+  labelFontSize,
+  labelX,
+  labelY,
+  minFontSize,
+  minX,
+  minY,
+  maxFontSize,
+  maxX,
+  maxY;
+
+  // overflow values
+  if (this.config.value > this.config.max) this.config.value = this.config.max;
+  if (this.config.value < this.config.min) this.config.value = this.config.min;
+  this.originalValue = config.value;
+
+  // canvas
+  this.canvas = Raphael(this.config.node, "100%", "100%");
+  if (this.config.relativeGaugeSize === true) {
+    this.canvas.setViewBox(0, 0, 200, 150, true);
+  }
+
+  // canvas dimensions
+  if (this.config.relativeGaugeSize === true) {
+    canvasW = 200;
+    canvasH = 150;
+  } else {
+    canvasW = getStyle(this.config.node, "width").slice(0, -2) * 1;
+    canvasH = getStyle(this.config.node, "height").slice(0, -2) * 1;
+  }
+
+  // widget dimensions
+  if (this.config.donut === true) {
+
+    // DONUT *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH;
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 11;
+
+    // value
+    valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
+    valueX = dx + widgetW / 2;
+    if(this.config.label !== '') {
+      valueY = dy + widgetH / 1.85;
+    } else {
+      valueY = dy + widgetH / 1.7;
+    }
+
+    // label
+    labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + labelFontSize;
+
+    // min
+    minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+
+  } else {
+    // HALF *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH * 1.25;
+      //if width doesn't fit, rescale both
+      if(widgetW > canvasW) {
+        aspect = widgetW / canvasW;
+        widgetW = widgetW / aspect;
+        widgetH = widgetH / aspect;
+      }
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW / 1.25;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW * 0.75;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > this.config.titleMinFontSize) ? (widgetH / 10) : this.config.titleMinFontSize;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 6.4;
+
+    // value
+    valueFontSize = ((widgetH / 6.5) > this.config.valueMinFontSize) ? (widgetH / 6.5) : this.config.valueMinFontSize;
+    valueX = dx + widgetW / 2;
+    valueY = dy + widgetH / 1.275;
+
+    // label
+    labelFontSize = ((widgetH / 16) > this.config.labelMinFontSize) ? (widgetH / 16) : this.config.labelMinFontSize;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + valueFontSize / 2 + 5;
+
+    // min
+    minFontSize = ((widgetH / 16) > this.config.minLabelMinFontSize) ? (widgetH / 16) : this.config.minLabelMinFontSize;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > this.config.maxLabelMinFontSize) ? (widgetH / 16) : this.config.maxLabelMinFontSize;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+  }
+
+  // parameters
+  this.params  = {
+    canvasW : canvasW,
+    canvasH : canvasH,
+    widgetW : widgetW,
+    widgetH : widgetH,
+    dx : dx,
+    dy : dy,
+    titleFontSize : titleFontSize,
+    titleX : titleX,
+    titleY : titleY,
+    valueFontSize : valueFontSize,
+    valueX : valueX,
+    valueY : valueY,
+    labelFontSize : labelFontSize,
+    labelX : labelX,
+    labelY : labelY,
+    minFontSize : minFontSize,
+    minX : minX,
+    minY : minY,
+    maxFontSize : maxFontSize,
+    maxX : maxX,
+    maxY : maxY
+  };
+
+  // var clear
+  canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
+
+  // pki - custom attribute for generating gauge paths
+  this.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
+
+    var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
+
+    if (donut) {
+      alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 7;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.95 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
+      }
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
+      }
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+
+    } else {
+      alpha = (1 - (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 10;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.25 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+    }
+
+    // var clear
+    alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
+  };
+
+  // gauge
+  this.gauge = this.canvas.path().attr({
+    "stroke": "none",
+    "fill": this.config.gaugeColor,
+    pki: [this.config.max, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+  });
+  this.gauge.id = this.config.id+"-gauge";
+
+  // level
+  this.level = this.canvas.path().attr({
+    "stroke": "none",
+    "fill": getColor(this.config.value, (this.config.value - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors),
+    pki: [this.config.min, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+  });
+  if(this.config.donut) {
+    this.level.transform("r" + this.config.donutStartAngle + ", " + (this.params.widgetW/2 + this.params.dx) + ", " + (this.params.widgetH/1.95 + this.params.dy));
+  }
+  this.level.id = this.config.id+"-level";
+
+  // title
+  this.txtTitle = this.canvas.text(this.params.titleX, this.params.titleY, this.config.title);
+  this.txtTitle.attr({
+    "font-size":this.params.titleFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":this.config.titleFontColor,
+    "fill-opacity":"1"
+  });
+  setDy(this.txtTitle, this.params.titleFontSize, this.params.titleY);
+  this.txtTitle.id = this.config.id+"-txttitle";
+
+  // value
+  this.txtValue = this.canvas.text(this.params.valueX, this.params.valueY, 0);
+  this.txtValue.attr({
+    "font-size":this.params.valueFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":this.config.valueFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(this.txtValue, this.params.valueFontSize, this.params.valueY);
+  this.txtValue.id = this.config.id+"-txtvalue";
+
+  // label
+  this.txtLabel = this.canvas.text(this.params.labelX, this.params.labelY, this.config.label);
+  this.txtLabel.attr({
+    "font-size":this.params.labelFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(this.txtLabel, this.params.labelFontSize, this.params.labelY);
+  this.txtLabel.id = this.config.id+"-txtlabel";
+
+  // min
+  this.txtMinimum = this.config.min;
+  if( this.config.humanFriendly ) this.txtMinimum = humanFriendlyNumber( this.config.min, this.config.humanFriendlyDecimal );
+  this.txtMin = this.canvas.text(this.params.minX, this.params.minY, this.txtMinimum);
+  this.txtMin.attr({
+    "font-size":this.params.minFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+  });
+  setDy(this.txtMin, this.params.minFontSize, this.params.minY);
+  this.txtMin.id = this.config.id+"-txtmin";
+
+  // max
+  this.txtMaximum = this.config.max;
+  if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+  this.txtMax = this.canvas.text(this.params.maxX, this.params.maxY, this.txtMaximum);
+  this.txtMax.attr({
+    "font-size":this.params.maxFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+  });
+  setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+  this.txtMax.id = this.config.id+"-txtmax";
+
+  var defs = this.canvas.canvas.childNodes[1];
+  var svg = "http://www.w3.org/2000/svg";
+
+  if (ie < 9) {
+    onCreateElementNsReady(function() {
+      this.generateShadow(svg, defs);
+    });
+  } else {
+    this.generateShadow(svg, defs);
+  }
+
+  // var clear
+  defs, svg = null;
+
+  // execute on each animation frame
+  function onAnimate() {
+    if (obj.config.counter) {
+      var currentValue = obj.level.attr("pki");
+
+      if(obj.config.textRenderer) {
+        // this.originalValue = this.config.textRenderer(this.originalValue);
+        obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
+      } else if(obj.config.humanFriendly) {
+        // this.originalValue = humanFriendlyNumber( this.originalValue, this.config.humanFriendlyDecimal ) + this.config.symbol;
+        obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
+      } else {
+        // this.originalValue += this.config.symbol;
+        obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
+      }
+
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+      currentValue = null;
+    }
+  }
+
+  if(!obj.config.counter) {
+    if(obj.config.textRenderer) {
+      obj.originalValue = obj.config.textRenderer(obj.originalValue);
+    } else if(obj.config.humanFriendly) {
+      obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
+    } else {
+      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals);
+    }
+
+    obj.txtValue.attr("text", obj.originalValue + obj.config.symbol);
+    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+  }
+
+  //event fired on each animation frame
+  eve.on("raphael.anim.frame.*", onAnimate);
+
+  // animate gauge level
+  this.level.animate({pki: [this.config.value, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]},  this.config.startAnimationTime, this.config.startAnimationType);
+
+  // animate value
+  this.txtValue.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+
+  // animate label
+  this.txtLabel.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+};
+
+/** Refresh gauge level */
+JustGage.prototype.refresh = function(val, max) {
+
+  var originalVal, displayVal, color, max = max || null;
+
+  // set new max
+  if(max !== null) {
+    this.config.max = max;
+
+    this.txtMaximum = this.config.max;
+    if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+    this.txtMax.attr({"text" : this.config.max});
+    setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+  }
+
+  // overflow values
+  originalVal = val;
+  displayVal = val;
+  if ((val * 1) > (this.config.max * 1)) {val = (this.config.max * 1);}
+  if ((val * 1) < (this.config.min * 1)) {val = (this.config.min * 1);}
+
+  color = getColor(val, (val - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors);
+
+  if(this.config.textRenderer) {
+    displayVal = this.config.textRenderer(displayVal);
+  } else if( this.config.humanFriendly ) {
+    displayVal = humanFriendlyNumber( displayVal, this.config.humanFriendlyDecimal ) + this.config.symbol;
+  } else {
+    displayVal = (displayVal * 1).toFixed(this.config.decimals) + this.config.symbol;
+  }
+
+  if(!this.config.counter) {
+    this.canvas.getById(this.config.id+"-txtvalue").attr({"text":displayVal});
+    setDy(this.canvas.getById(this.config.id+"-txtvalue"), this.params.valueFontSize, this.params.valueY);
+  }
+
+  this.canvas.getById(this.config.id+"-level").animate({pki: [val, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut], "fill":color},  this.config.refreshAnimationTime, this.config.refreshAnimationType);
+  this.config.value = val * 1;
+
+  // var clear
+  originalVal, displayVal, color, max = null;
+};
+
+/** Generate shadow */
+JustGage.prototype.generateShadow = function(svg, defs) {
+
+  var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
+
+  // FILTER
+  gaussFilter=document.createElementNS(svg,"filter");
+  gaussFilter.setAttribute("id", this.config.id + "-inner-shadow");
+  defs.appendChild(gaussFilter);
+
+  // offset
+  feOffset = document.createElementNS(svg,"feOffset");
+  feOffset.setAttribute("dx", 0);
+  feOffset.setAttribute("dy", this.config.shadowVerticalOffset);
+  gaussFilter.appendChild(feOffset);
+
+  // blur
+  feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
+  feGaussianBlur.setAttribute("result","offset-blur");
+  feGaussianBlur.setAttribute("stdDeviation", this.config.shadowSize);
+  gaussFilter.appendChild(feGaussianBlur);
+
+  // composite 1
+  feComposite1 = document.createElementNS(svg,"feComposite");
+  feComposite1.setAttribute("operator","out");
+  feComposite1.setAttribute("in", "SourceGraphic");
+  feComposite1.setAttribute("in2","offset-blur");
+  feComposite1.setAttribute("result","inverse");
+  gaussFilter.appendChild(feComposite1);
+
+  // flood
+  feFlood = document.createElementNS(svg,"feFlood");
+  feFlood.setAttribute("flood-color","black");
+  feFlood.setAttribute("flood-opacity", this.config.shadowOpacity);
+  feFlood.setAttribute("result","color");
+  gaussFilter.appendChild(feFlood);
+
+  // composite 2
+  feComposite2 = document.createElementNS(svg,"feComposite");
+  feComposite2.setAttribute("operator","in");
+  feComposite2.setAttribute("in", "color");
+  feComposite2.setAttribute("in2","inverse");
+  feComposite2.setAttribute("result","shadow");
+  gaussFilter.appendChild(feComposite2);
+
+  // composite 3
+  feComposite3 = document.createElementNS(svg,"feComposite");
+  feComposite3.setAttribute("operator","over");
+  feComposite3.setAttribute("in", "shadow");
+  feComposite3.setAttribute("in2","SourceGraphic");
+  gaussFilter.appendChild(feComposite3);
+
+  // set shadow
+  if (!this.config.hideInnerShadow) {
+    this.canvas.canvas.childNodes[2].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+    this.canvas.canvas.childNodes[3].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+  }
+
+  // var clear
+  gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
+
+};
+
+/** Get color for value */
+function getColor(val, pct, col, noGradient, custSec) {
+
+  var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
+  var noGradient = noGradient || custSec.length > 0;
+
+  if(custSec.length > 0) {
+    for(var i = 0; i < custSec.length; i++) {
+      if(val > custSec[i].lo && val <= custSec[i].hi) {
+        return custSec[i].color;
+      }
+    }
+  }
+
+  no = col.length;
+  if (no === 1) return col[0];
+  inc = (noGradient) ? (1 / no) : (1 / (no - 1));
+  colors = [];
+  for (var i = 0; i < col.length; i++) {
+    percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
+    rval = parseInt((cutHex(col[i])).substring(0,2),16);
+    gval = parseInt((cutHex(col[i])).substring(2,4),16);
+    bval = parseInt((cutHex(col[i])).substring(4,6),16);
+    colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval  } };
+  }
+
+  if(pct === 0) {
+    return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
+  }
+
+  for (var j = 0; j < colors.length; j++) {
+    if (pct <= colors[j].pct) {
+      if (noGradient) {
+        return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
+      } else {
+        lower = colors[j - 1];
+        upper = colors[j];
+        range = upper.pct - lower.pct;
+        rangePct = (pct - lower.pct) / range;
+        pctLower = 1 - rangePct;
+        pctUpper = rangePct;
+        color = {
+          r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
+          g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
+          b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
+        };
+        return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
+      }
+    }
+  }
+
+}
+
+/** Fix Raphael display:none tspan dy attribute bug */
+function setDy(elem, fontSize, txtYpos) {
+  if ((!ie || ie > 9) && (elem.node.firstChild.attributes.dy)) {
+    elem.node.firstChild.attributes.dy.value = 0;
+  }
+}
+
+/** Random integer  */
+function getRandomInt (min, max) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+/**  Cut hex  */
+function cutHex(str) {
+  return (str.charAt(0)=="#") ? str.substring(1,7):str;
+}
+
+/**  Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
+function humanFriendlyNumber( n, d ) {
+  var p, d2, i, s;
+
+  p = Math.pow;
+  d2 = p(10, d);
+  i = 7;
+  while( i ) {
+    s = p(10,i--*3);
+    if( s <= n ) {
+     n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
+   }
+ }
+ return n;
+}
+
+/**  Get style  */
+function getStyle(oElm, strCssRule){
+  var strValue = "";
+  if(document.defaultView && document.defaultView.getComputedStyle){
+    console.log(oElm);
+    strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
+    console.log(strValue, strCssRule);
+  }
+  else if(oElm.currentStyle){
+    strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
+      return p1.toUpperCase();
+    });
+    strValue = oElm.currentStyle[strCssRule];
+  }
+  return strValue;
+}
+
+/**  Create Element NS Ready  */
+function onCreateElementNsReady(func) {
+  if (document.createElementNS !== undefined) {
+    func();
+  } else {
+    setTimeout(function() { onCreateElementNsReady(func); }, 100);
+  }
+}
+
+/**  Get IE version  */
+// ----------------------------------------------------------
+// A short snippet for detecting versions of IE in JavaScript
+// without resorting to user-agent sniffing
+// ----------------------------------------------------------
+// If you're not in IE (or IE version is less than 5) then:
+// ie === undefined
+// If you're in IE (>=5) then you can determine which version:
+// ie === 7; // IE7
+// Thus, to detect IE:
+// if (ie) {}
+// And to detect the version:
+// ie === 6 // IE6
+// ie > 7 // IE8, IE9 ...
+// ie < 9 // Anything less than IE9
+// ----------------------------------------------------------
+// UPDATE: Now using Live NodeList idea from @jdalton
+var ie = (function(){
+
+  var undef,
+  v = 3,
+  div = document.createElement('div'),
+  all = div.getElementsByTagName('i');
+
+  while (
+    div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+    all[0]
+    );
+    return v > 4 ? v : undef;
+}());
\ No newline at end of file

From 5fe85f22782127e2f090d350353624b5ce22d386 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 9 Apr 2013 16:40:30 +0200
Subject: [PATCH 254/547] [IMP] better UI

bzr revid: mat@openerp.com-20130409144030-rb609qteloq3vrgf
---
 addons/gamification/goal_view.xml                | 16 ++--------------
 addons/gamification/static/src/css/goal.css      | 15 ---------------
 .../gamification/static/src/js/gamification.js   | 11 +++++++----
 addons/gamification/static/src/js/justgage.js    |  2 --
 4 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index c0953362112..693512ca1d3 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -139,7 +139,7 @@
                     <field name="type_condition"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_#{record.state.raw_value}">
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_goal">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
@@ -148,19 +148,7 @@
                                     <t t-if="record.type_description.value">
                                         <em><field name="type_description"/></em>
                                     </t>
-                                    <div class="oe_goal_gauge">
-                                        <!-- <p>
-                                            <span class="oe_goal_current"><t t-esc="Math.round(record.current.raw_value)"/></span>/<span class="oe_goal_target"><t t-esc="Math.round(record.target_goal.raw_value)"/></span>
-                                            <t t-if="record.type_unit.value"><field name="type_unit"/></t>
-                                            <t t-if="record.type_condition.raw_value == 'higher'">
-                                                &#10216;<t t-esc="Math.round(record.completeness.raw_value)"/>%%&#10217;
-                                            </t>
-                                            <br/>
-                                            <span class="oe_goal_id"><t t-esc="record.id.raw_value"/></span>
-
-                                            <small>End: <field name="end_date" /></small>
-                                        </p> -->
-                                    </div>
+                                    <div class="oe_goal_gauge"></div>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 57b76dd70c3..0856bd60135 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -3,21 +3,6 @@
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
   width: 220px;
   min-height: 160px;
-  /*height: 200px;*/
-}
-.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_reached {
-  background-color: #A1FF81;
-  color: #0B1907;
-}
-.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_failed {
-  background-color: #ffc7c7;
-  color: #7a3737;
-}
-.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_draft,
-.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_color_canceled {
-  background-color: #E6E6E6;
-  color: #585858;
-  font-size: 0.9em;
 }
 
 .oe_kanban_badge_avatars {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 34acb568026..220f69cdfd2 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -125,8 +125,7 @@ openerp.gamification = function(instance) {
                 if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
                     var unique_id = _.uniqueId("goal_gauge_");
                     self.$el.find('.oe_goal_gauge').attr('id', unique_id);
-                    console.log(self.$el.find('.oe_goal_gauge').empty().get(0));
-                    // debugger;
+
                     var g = new JustGage({
                         id: unique_id,
                         node: self.$el.find('.oe_goal_gauge').empty().get(0),
@@ -134,9 +133,13 @@ openerp.gamification = function(instance) {
                         min: 0,
                         max: self.record.target_goal.raw_value,
                         title: self.record.type_id.value,
-                        relativeGaugeSize: true
+                        relativeGaugeSize: true,
+                        levelColors: [
+                            "#f9c802",
+                            "#ff0000",
+                            "#a9d70b"
+                        ]
                     });
-                    console.log(g);
                 }
             });
         },
diff --git a/addons/gamification/static/src/js/justgage.js b/addons/gamification/static/src/js/justgage.js
index b83e5cbdb1e..7464e4120e1 100644
--- a/addons/gamification/static/src/js/justgage.js
+++ b/addons/gamification/static/src/js/justgage.js
@@ -831,9 +831,7 @@ function humanFriendlyNumber( n, d ) {
 function getStyle(oElm, strCssRule){
   var strValue = "";
   if(document.defaultView && document.defaultView.getComputedStyle){
-    console.log(oElm);
     strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
-    console.log(strValue, strCssRule);
   }
   else if(oElm.currentStyle){
     strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){

From 47e0b51da8f08d8c7391bfa0198bdb9cde6afe2f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 10:49:40 +0200
Subject: [PATCH 255/547] [ADD] full suffix field

bzr revid: mat@openerp.com-20130410084940-rl1ykxdu3626rfc3
---
 addons/gamification/goal.py | 22 +++++++++++++++++++++-
 addons/gamification/plan.py |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 9f9df9b9d41..c5ef960d4b4 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -40,12 +40,32 @@ class gamification_goal_type(osv.Model):
     _name = 'gamification.goal.type'
     _description = 'Gamification goal type'
 
+    def _get_suffix(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict.fromkeys(ids, 0)
+        for goal in self.browse(cr, uid, ids, context):
+            if goal.unit and not goal.monetary:
+                res[goal.id] = goal.unit
+            elif goal.monetary:
+                # use the current user's company currency
+                user = self.pool.get('res.users').browse(cr, uid, uid, context)
+                if goal.unit:
+                    res[goal.id] = "%s %s" % (user.company_id.currency_id.symbol, goal.unit)
+                else:
+                    res[goal.id] = user.company_id.currency_id.symbol
+            else:
+                res[goal.id] = ""
+        return res
+
     _columns = {
         'name': fields.char('Goal Type Name', required=True, translate=True),
         'description': fields.text('Goal Description'),
+
         'monetary': fields.boolean('Monetary Value', help="The target and current value are defined in the company currency."),
         'unit': fields.char('Suffix',
             help="The unit of the target and current values", translate=True),
+        'full_suffix': fields.function(_get_suffix, type="char",
+            string="Full Suffix", help="The currency and suffix field"),
+
         'computation_mode': fields.selection([
                 ('manually', 'Recorded manually'),
                 ('count', 'Automatic: number of records'),
@@ -64,7 +84,7 @@ class gamification_goal_type(osv.Model):
             help='The date to use for the time period evaluated'),
         'domain': fields.char("Filter Domain",
             help="Technical filters rules to apply",
-            required=True), # how to apply it ?
+            required=True),
         'condition': fields.selection([
                 ('higher', 'The higher the better'),
                 ('lower', 'The lower the better')
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index a05870e02cd..56c41c63996 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -237,7 +237,7 @@ class gamification_goal_plan(osv.Model):
 
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
-                self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
+                self.plan_subscribe_users(cr, uid, [plan.id], [user.id for user in plan.autojoin_group_id.users], context=context)
             self.generate_goals_from_plan(cr, uid, [plan.id], context=context)
 
             # goals closed but still opened at the last report date
@@ -577,4 +577,5 @@ class gamification_goal_planline(osv.Model):
             readonly=True, string="Condition", selection=[('lower', '<='), ('higher', '>=')]),
         'type_unit': fields.related('type_id', 'unit', type="char", readonly=True, string="Unit"),
         'type_monetary': fields.related('type_id', 'monetary', type="boolean", readonly=True, string="Monetary"),
+        'type_full_suffix': fields.related('type_id', 'full_suffix', type="char", readonly=True, string="Suffix"),
     }

From 4baed41a125cb64a76b09f4f0bbc1a64443dea30 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 11:14:37 +0200
Subject: [PATCH 256/547] [IMP] better messages

bzr revid: mat@openerp.com-20130410091437-jq5eq9cecvng8kj2
---
 addons/gamification/badge.py          |  1 +
 addons/gamification/badge_view.xml    |  4 ++--
 addons/hr_gamification/badge_view.xml | 22 +++++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index f53683fbd91..35d6c0b4756 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -207,6 +207,7 @@ class gamification_badge(osv.Model):
         'rule_auth': 'everyone',
         'rule_automatic': 'manual',
         'compute_code': "self.nobody(cr, uid, context)",
+        'public': True
     }
 
     def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=None, context=None):
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 32107402990..c3ceaae4fae 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -24,11 +24,11 @@
             <field name="model">gamification.badge.user.wizard</field>
             <field name="arch" type="xml">
                 <form string="Grant Badge To" version="7.0">
-                    Select the user that will receive this badge
+                    Who would you like to reward?
                     <group>
                         <field name="user_id" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" />
+                        <field name="comment" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 7cdecab8e7f..a3b8771db5e 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -9,11 +9,11 @@
             <field name="model">gamification.badge.user.wizard</field>
             <field name="arch" type="xml">
                 <form string="Grant Badge To" version="7.0">
-                    Select the employee that will receive this badge
+                    Who would you like to reward?
                     <group>
                         <field name="employee_id" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" />
+                        <field name="comment" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -31,11 +31,11 @@
             <field name="model">gamification.badge.user.wizard</field>
             <field name="arch" type="xml">
                 <form string="Reward Employee with" version="7.0">
-                    Select the badge that the employee will receive
+                    What are you thank for?
                     <group>
                         <field name="employee_id" invisible="1" />
                         <field name="badge_id" />
-                        <field name="comment" />
+                        <field name="comment" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>
                         <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -62,11 +62,19 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
-                    <button string="Grant Badge" type="action" name="%(action_reward_wizard)d" />
-                </xpath>
+
                 <xpath expr="//page[@string='Public Information']" position="before">
                     <page string="Received Badges">
+
+                          <button string="Grant a Badge" type="action" name="%(action_reward_wizard)d"/> to reward this employee for a good action
+                          <div class="oe_view_nocontent" attrs="{'invisible': [('badge_ids', '!=', False)]}">
+                              <p class="oe_view_nocontent_create">
+                                Click to grant this employee his first badge
+                              </p><p class="oe_grey">
+                                Badges are rewards of good work. Give them to people you believe deserve it.
+                              </p>
+                          </div>
+
                         <field name="badge_ids" widget="many2many_kanban" />
                     </page>
                 </xpath>

From f70b0017f63fa9baef330e05e67517d2127e798e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 12:14:54 +0200
Subject: [PATCH 257/547] [IMP] fixing and UI

bzr revid: mat@openerp.com-20130410101454-nkt8mbt8qb13zrge
---
 addons/gamification/goal_base_data.xml              |  4 +++-
 addons/gamification/plan.py                         | 13 +++++++++----
 addons/gamification/plan_view.xml                   |  7 ++++++-
 .../gamification/security/gamification_security.xml |  4 +---
 addons/gamification/static/src/css/goal.css         |  2 +-
 addons/gamification/static/src/js/gamification.js   |  4 ++--
 addons/gamification/static/src/xml/gamification.xml |  5 +----
 addons/hr_evaluation/hr_evaluation.py               |  4 ++--
 addons/hr_evaluation/hr_evaluation_view.xml         |  8 +++++++-
 addons/hr_gamification/badge.py                     |  1 -
 addons/hr_gamification/badge_view.xml               |  3 +--
 11 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index ebb5e518aae..6b383a59291 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -60,6 +60,7 @@
             <field name="report_message_frequency">never</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
+            <field name="category">other</field>
         </record>
 
         <record model="gamification.goal.plan" id="plan_base_configure">
@@ -67,8 +68,9 @@
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
-            <field name="autojoin_group_id" eval="ref('base.group_erp_manager')" />
+            <field name="user_ids" eval="[(4, ref('base.user_root'))]" />
             <field name="state">inprogress</field>
+            <field name="category">other</field>
         </record>
 
         <!-- planlines -->
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 56c41c63996..e47c2b356a9 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -143,8 +143,7 @@ class gamification_goal_plan(osv.Model):
                 ('progressbar', 'Individual Goals'),
                 ('board', 'Leader Board (Group Ranking)'),
             ],
-            string="Display Mode",
-            required=True),
+            string="Display Mode", required=True),
         'report_message_frequency': fields.selection([
                 ('never','Never'),
                 ('onchange','On change'),
@@ -153,8 +152,7 @@ class gamification_goal_plan(osv.Model):
                 ('monthly','Monthly'),
                 ('yearly', 'Yearly')
             ],
-            string="Report Frequency",
-            required=True),
+            string="Report Frequency", required=True),
         'report_message_group_id': fields.many2one('mail.group',
             string='Send a copy to',
             help='Group that will receive a copy of the report in addition to the user'),
@@ -165,6 +163,12 @@ class gamification_goal_plan(osv.Model):
         'next_report_date': fields.function(_get_next_report_date,
             type='date',
             string='Next Report Date'),
+
+        'category': fields.selection([
+            ('hr', 'Human Ressources'),
+            ('other', 'Other'),
+            ],
+            string="Category", help="Only HR plans can be accessed by managers", required=True)
         }
 
     _defaults = {
@@ -175,6 +179,7 @@ class gamification_goal_plan(osv.Model):
         'last_report_date': fields.date.today,
         'start_date': fields.date.today,
         'manager_id': lambda s, cr, uid, c: uid,
+        'category': 'hr',
     }
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index f305eb13192..ca876e47236 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -93,7 +93,7 @@
                                     <field name="type_id"/>
                                     <field name="type_condition"/>
                                     <field name="target_goal"/>
-                                    <field name="type_unit"/>
+                                    <field name="type_full_suffix"/>
                                 </tree>
                             </field>
                         </page>
@@ -112,6 +112,9 @@
                                     <field name="remind_update_delay" class="oe_inline"/> days
                                 </div>
                             </group>
+                            <group string="Category" groups="base.group_no_one">
+                                <field name="category" />
+                            </group>
                         </page>
                         </notebook>
 
@@ -184,6 +187,8 @@
                 <search string="Search Goal Plans">
                     <filter name="draft_inprogress" string="Non-closed Plans"
                         domain="[('state', 'in', ('inprogress', 'draft'))]"/>
+                    <filter name="hr_plans" string="HR Plans"
+                        domain="[('category', '=', 'hr')]"/>
                     <field name="name"/>
                     <group expand="0" string="Group By...">
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index a488d27e88b..d68181c1e0c 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record model="ir.module.category" id="module_goal_category">
             <field name="name">Gamification</field>
             <field name="description"></field>
@@ -11,9 +11,7 @@
             <field name="category_id" ref="module_goal_category"/>
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
-    </data>
 
-    <data noupdate="0">
         <record id="goal_user_visibility" model="ir.rule">
             <!-- TODO fix private for board -->
             <field name="name">User can only see his/her goals or goal from the same plan in board visibility</field>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 0856bd60135..f6c38ea1ccb 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -2,7 +2,7 @@
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
   width: 220px;
-  min-height: 160px;
+  min-height: 150px;
 }
 
 .oe_kanban_badge_avatars {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 220f69cdfd2..87550914ecc 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -125,14 +125,14 @@ openerp.gamification = function(instance) {
                 if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
                     var unique_id = _.uniqueId("goal_gauge_");
                     self.$el.find('.oe_goal_gauge').attr('id', unique_id);
-
+                    console.log(self.record);
                     var g = new JustGage({
                         id: unique_id,
                         node: self.$el.find('.oe_goal_gauge').empty().get(0),
                         value: self.record.current.raw_value,
                         min: 0,
                         max: self.record.target_goal.raw_value,
-                        title: self.record.type_id.value,
+                        // title: self.record.type_id.value,
                         relativeGaugeSize: true,
                         levelColors: [
                             "#f9c802",
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 9dfebe14f62..3a068dab045 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,14 +10,11 @@
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
+                    <span class="oe_goal_sparkline_piechart"></span>
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                     </t>
-                    <!-- <t t-if="goal.type_description">
-                        <a class="oe_show_description" t-att-id="goal.id">?</a>
-                        <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p>
-                    </t> -->
                     <t t-if="goal.type_condition == 'higher'">
                         <p>
                             <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 83f5f4a515d..29669eec1d6 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -109,13 +109,13 @@ class hr_employee(osv.osv):
         """Return the list of goals assigned to the employee"""
         res = {}
         for employee in self.browse(cr, uid, ids, context=context):
-            res[employee.id] = self.pool.get('gamification.goal').search(cr,uid,[('user_id','=',employee.user_id.id)], context=context)
+            res[employee.id] = self.pool.get('gamification.goal').search(cr,uid,[('user_id', '=', employee.user_id.id), ('plan_id.category', '=', 'hr')], context=context)
         return res
 
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
         'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
-        'goal_ids': fields.function(_get_employee_goals, type="one2many", obj='gamification.goal', string="Employee Goals")
+        'goal_ids': fields.function(_get_employee_goals, type="one2many", obj='gamification.goal', string="Employee HR Goals")
     }
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
         now = parser.parse(datetime.now().strftime('%Y-%m-%d'))
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 888c77eb808..5f8f6e599c7 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -419,11 +419,17 @@
             <field name="name">Goals History</field>
             <field name="view_mode">tree,kanban</field>
             <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
+            <field name="domain">[('plan_id.category', '=', 'hr')]</field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="gamification.goal_plan_list_action">
+            <field name="domain">[('category', '=', 'hr')]</field>
         </record>
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager" />
+        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager"/>
         <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="gamification.group_goal_manager"/>
 
       <!-- Email Compose message Action-->
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 1e99ce39eb0..9f7fc2e4fd1 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -105,7 +105,6 @@ class hr_grant_badge_wizard(osv.TransientModel):
                 badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
 
         return {}
-hr_grant_badge_wizard()
 
 
 class hr_employee(osv.osv):
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index a3b8771db5e..98161d47f1c 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -67,14 +67,13 @@
                     <page string="Received Badges">
 
                           <button string="Grant a Badge" type="action" name="%(action_reward_wizard)d"/> to reward this employee for a good action
-                          <div class="oe_view_nocontent" attrs="{'invisible': [('badge_ids', '!=', False)]}">
+                          <div class="oe_view_nocontent" attrs="{'invisible': [('badge_ids','!=',[])]}">
                               <p class="oe_view_nocontent_create">
                                 Click to grant this employee his first badge
                               </p><p class="oe_grey">
                                 Badges are rewards of good work. Give them to people you believe deserve it.
                               </p>
                           </div>
-
                         <field name="badge_ids" widget="many2many_kanban" />
                     </page>
                 </xpath>

From da485c70c6c23e59f9553bd6d9856add2176b718 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 13:47:35 +0200
Subject: [PATCH 258/547] [IMP] remove one planline in demo

bzr revid: mat@openerp.com-20130410114735-u4vhkff2i5qwjolj
---
 addons/gamification_sale_crm/sale_crm_goals.xml      |  5 -----
 addons/gamification_sale_crm/sale_crm_goals_demo.xml | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index d24135c7cfc..d7f9934b722 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -150,11 +150,6 @@
             <field name="target_goal">20000</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale2">
-            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
-            <field name="target_goal">20</field>
-            <field name="plan_id" eval="ref('plan_crm_sale')" />
-        </record>
         <record model="gamification.goal.planline" id="planline_crm_sale3">
             <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
             <field name="target_goal">5</field>
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index d6382dac773..970450f5df6 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -19,16 +19,6 @@
             <field name="state">inprogress</field>
         </record>
 
-        <record model="gamification.goal" id="goal_crm_sale2">
-            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
-            <field name="user_id" eval="ref('base.user_demo')" />
-            <field name="planline_id" eval="ref('planline_crm_sale2')" />
-            <field name="start_date" eval="time.strftime('2013-03-01')" />
-            <field name="end_date" eval="time.strftime('2013-03-31')" />
-            <field name="target_goal">20</field>
-            <field name="state">inprogress</field>
-        </record>
-
         <record model="gamification.goal" id="goal_crm_sale3">
             <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
             <field name="user_id" eval="ref('base.user_demo')" />

From 0524ed98ed60835821b9af54bb162d70067399b7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 13:50:23 +0200
Subject: [PATCH 259/547] [IMP] message for badges

bzr revid: mat@openerp.com-20130410115023-yj9lzz9k4elp0h2g
---
 addons/gamification/badge_view.xml    |  1 +
 addons/gamification/plan_view.xml     |  5 ++---
 addons/hr_gamification/badge.py       | 14 +++++++++++++-
 addons/hr_gamification/badge_view.xml | 14 +++++++-------
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index c3ceaae4fae..f5e5d4497cb 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -14,6 +14,7 @@
                 <p>
                     A badge is a symbolic token granted to a user as a sign of reward.
                     It can be deserved automatically when some conditions are met or manually by users.
+                    Some badges are harder than others to get with specific conditions.
                 </p>
             </field>
         </record>
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index ca876e47236..ad11bae5d34 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -11,10 +11,9 @@
                     Click to create a goal plan. 
                 </p>
                 <p>
-                    Goal plans allow to create and assign to users easily a list of goals.
-                    A goal plan is a predifined list of goals types with a target value.
+                    Assign a list of goals to chosen users to evaluate them.
                     The plan can use a period (weekly, monthly...) for automatic creation of goals.
-                    The goals are created for the specified users or memeber of the group.
+                    The goals are created for the specified users or member of the group.
                 </p>
             </field>
         </record>
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 9f7fc2e4fd1..a46c8fd51f7 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -118,6 +118,18 @@ class hr_employee(osv.osv):
             res[employee.id] = self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)
         return res
 
+    def _has_badges(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the list of badge_users assigned to the employee"""
+        res = {}
+        for employee in self.browse(cr, uid, ids, context=context):
+            if len(self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)) > 0:
+                res[employee.id] = True
+            else:
+                res[employee.id] = False
+        return res
+
     _columns = {
-        'badge_ids': fields.function(_get_employee_badges, type="one2many", obj='gamification.badge.user', string="Employee Badges")
+        'badge_ids': fields.function(_get_employee_badges, type="one2many",
+            obj='gamification.badge.user', string="Employee Badges"),
+        'has_badges': fields.function(_has_badges, type="boolean", string="Has Badges"),
     }
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 98161d47f1c..0d97cacc48b 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -65,15 +65,15 @@
 
                 <xpath expr="//page[@string='Public Information']" position="before">
                     <page string="Received Badges">
-
-                          <button string="Grant a Badge" type="action" name="%(action_reward_wizard)d"/> to reward this employee for a good action
-                          <div class="oe_view_nocontent" attrs="{'invisible': [('badge_ids','!=',[])]}">
-                              <p class="oe_view_nocontent_create">
+                        <field name="has_badges" invisible="1"/>
+                        <button string="Grant a Badge" type="action" name="%(action_reward_wizard)d"/> to reward this employee for a good action
+                        <div class="oe_view_nocontent" attrs="{'invisible': [('has_badges', '=', True)]}">
+                            <p class="oe_view_nocontent_create">
                                 Click to grant this employee his first badge
-                              </p><p class="oe_grey">
+                            </p><p class="oe_grey">
                                 Badges are rewards of good work. Give them to people you believe deserve it.
-                              </p>
-                          </div>
+                            </p>
+                        </div>
                         <field name="badge_ids" widget="many2many_kanban" />
                     </page>
                 </xpath>

From ff12c44391021e0d9792d18b576fd0fe9fe90e0d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 16:57:09 +0200
Subject: [PATCH 260/547] [IMP] better text

bzr revid: mat@openerp.com-20130410145709-crvmss21ocw7e0m8
---
 addons/gamification/__openerp__.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index fe180b20c2b..5946e81224f 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -27,21 +27,14 @@
     'description': """
 Gamification process
 ====================
-The Gamification module provide ways to evaluate and motivate the users of OpenERP.
-The two main functions are goals and badges.
+The Gamification module provides ways to evaluate and motivate the users of OpenERP.
 
-Goals
------
-A **Goal** is an objective applied to an user with a numerical target to reach. It can have starting and end date. Users usually do not create goals but relies on goal plans.
+The users can be evaluated using goals and numerical objectives to reach.
+**Goals** are assigned through **plans** to evaluate and compare members of a team with each others and through time.
 
-A **Goal Type** is a generic objective that can be applied to any structure stored in the database and use numerical value. The creation of goal types is quite technical and should rarely be done. Once a generic goal is created, it can be associated to several goal plans with different numerical targets.
-
-A **Goal Plan** is a a set of goal types with a target value to reach applied to a group of users. It can be periodic to create and evaluate easily the performances of a team.
-
-Badges
-------
-A **Badge** is a symbolic token granted to a user as a sign of reward. It can be offered by a user to another or automatically offered when some conditions are met. The conditions can either be a list of goal types succeeded or a user definied python code executed.
+For non-numerical achievements, **badges** can be granted to users. From a simple "thank you" to an exceptional achievement, a badge is an easy way to exprimate gratitude to a user for their good work.
 
+Both goals and badges are flexibles and can be adapted to a large range of modules and actions. When installed, this module creates easy goals to help new users to discover OpenERP and configure their user profile.
 """,
 
     'data': [

From 1e9805fbfd0936cd228fb7177cc8519d2554432f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 17:30:31 +0200
Subject: [PATCH 261/547] [IMP] use suffix in kanban and better view

bzr revid: mat@openerp.com-20130410153031-s6op7d7wyfdzrcti
---
 addons/gamification/goal.py                   | 11 +++++------
 addons/gamification/goal_view.xml             | 19 ++++++++++++++++---
 addons/gamification/static/src/css/goal.css   | 12 ++++++++++--
 .../static/src/js/gamification.js             | 17 +++++++++++++----
 addons/gamification/static/src/js/justgage.js |  4 ++--
 5 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index c5ef960d4b4..806d5a766ec 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -187,14 +187,13 @@ class gamification_goal(osv.Model):
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
 
         'type_description': fields.related('type_id','description',
-            type='char',
-            string='Type Description'),
+            type='char', string='Type Description'),
         'type_unit': fields.related('type_id', 'unit',
-            type='char',
-            string='Type Description'),
+            type='char', string='Type Description'),
         'type_condition': fields.related('type_id', 'condition',
-            type='char',
-            string='Type Condition'),
+            type='char', string='Type Condition'),
+        'type_suffix': fields.related('type_id', 'full_suffix',
+            type="char", string="Suffix"),
     }
 
     _defaults = {
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 693512ca1d3..b8511dd96f4 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -137,6 +137,9 @@
                     <field name="state"/>
                     <field name="target_goal"/>
                     <field name="type_condition"/>
+                    <field name="type_suffix"/>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_goal">
@@ -145,10 +148,20 @@
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
                                     </div>
                                     <h4 class="oe_goal_name"><field name="type_id"/></h4>
-                                    <t t-if="record.type_description.value">
-                                        <em><field name="type_description"/></em>
-                                    </t>
                                     <div class="oe_goal_gauge"></div>
+                                    <p>
+                                        <t t-if="record.type_description.value">
+                                            <em><field name="type_description"/></em>
+                                        </t>
+                                    </p>
+                                    <p>
+                                        <t t-if="record.start_date.value">
+                                            From <t t-esc="record.start_date.value" />
+                                        </t>
+                                        <t t-if="record.end_date.value">
+                                            To <t t-esc="record.start_date.value" />
+                                        </t>
+                                    </p>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index f6c38ea1ccb..7481a853295 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -2,7 +2,10 @@
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
   width: 220px;
-  min-height: 150px;
+  min-height: 200px;
+}
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal p {
+    text-align: center;
 }
 
 .oe_kanban_badge_avatars {
@@ -18,7 +21,12 @@
 }
 .oe_goal_gauge {
     width:200px;
-    height:150px;
+    height:130px;
+    margin: auto;
+    margin-bottom: -30px;
+}
+.oe_goal_gauge svg {
+    margin-top: -30px;
 }
 
 
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 87550914ecc..c743d39282a 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -38,8 +38,6 @@ openerp.gamification = function(instance) {
                     action_manager.do_action(goal_action.action).done(function () {
                         self.get_goal_todo_info();
                     });
-
-                    //var form = action_manager.dialog_widget.views.form.controller;
                 });
             }
         },
@@ -132,13 +130,24 @@ openerp.gamification = function(instance) {
                         value: self.record.current.raw_value,
                         min: 0,
                         max: self.record.target_goal.raw_value,
-                        // title: self.record.type_id.value,
                         relativeGaugeSize: true,
+                        humanFriendly: true,
+                        // add space between value and symbol
+                        // textRenderer: function(value) {
+                        //     symbol = self.record.type_suffix.raw_value;
+                        //     humannbr = humanFriendlyNumber(value, 0)
+                        //     if ((humannbr + symbol).length > 6) {
+                        //         return humannbr;
+                        //     } else {
+                        //         return humannbr + " " + symbol;
+                        //     }
+                        // },
+                        label: self.record.type_suffix.raw_value,
                         levelColors: [
                             "#f9c802",
                             "#ff0000",
                             "#a9d70b"
-                        ]
+                        ],
                     });
                 }
             });
diff --git a/addons/gamification/static/src/js/justgage.js b/addons/gamification/static/src/js/justgage.js
index 7464e4120e1..52b5c6ea0c3 100644
--- a/addons/gamification/static/src/js/justgage.js
+++ b/addons/gamification/static/src/js/justgage.js
@@ -615,10 +615,10 @@
     } else if(obj.config.humanFriendly) {
       obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
     } else {
-      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals);
+      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
     }
 
-    obj.txtValue.attr("text", obj.originalValue + obj.config.symbol);
+    obj.txtValue.attr("text", obj.originalValue);
     setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
   }
 

From b1c23a5fcb9a3532b725bede3a5f4c68809c64b4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 17:38:31 +0200
Subject: [PATCH 262/547] [IMP] sort goals by date

bzr revid: mat@openerp.com-20130410153831-ixy5d3q131ldg6a8
---
 addons/gamification/goal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 806d5a766ec..64e41122288 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -201,7 +201,7 @@ class gamification_goal(osv.Model):
         'state': 'draft',
         'start_date': fields.date.today,
     }
-    _order = 'last_update desc, end_date, type_id'
+    _order = 'create_date, end_date desc, type_id'
 
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states

From 1787aa694ee44cd47ab29f049b81d958f6d3833b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 11 Apr 2013 09:22:11 +0200
Subject: [PATCH 263/547] [IMP] no badge page for employee not connected to
 users

bzr revid: mat@openerp.com-20130411072211-nw4bxkvncfdg8a0f
---
 addons/hr_gamification/badge_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 0d97cacc48b..9035058402a 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -64,7 +64,7 @@
             <field name="arch" type="xml">
 
                 <xpath expr="//page[@string='Public Information']" position="before">
-                    <page string="Received Badges">
+                    <page string="Received Badges" attrs="{'invisible': [('user_id', '=', False)]}">
                         <field name="has_badges" invisible="1"/>
                         <button string="Grant a Badge" type="action" name="%(action_reward_wizard)d"/> to reward this employee for a good action
                         <div class="oe_view_nocontent" attrs="{'invisible': [('has_badges', '=', True)]}">

From e68c4b5e235b34ceb42270007e5efe205416ebee Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 11 Apr 2013 11:21:03 +0200
Subject: [PATCH 264/547] [IMP] ponctual goal type

bzr revid: mat@openerp.com-20130411092103-5sowdvkm09wbvhtv
---
 addons/gamification/badge_view.xml          |  2 +-
 addons/gamification/goal.py                 |  5 ++++
 addons/gamification/goal_view.xml           | 29 ++++++++++++++++++---
 addons/gamification/plan.py                 |  4 +--
 addons/gamification/plan_view.xml           |  2 +-
 addons/gamification/static/src/css/goal.css | 24 ++++++++++-------
 6 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index f5e5d4497cb..15e9b0d6558 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -93,7 +93,7 @@
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
-                            <field name="rule_max_number" attrs="{'invisible': ['!',('rule_max','=',False),('rule_auth','=','nobody')]}"/>
+                            <field name="rule_max_number" attrs="{'invisible': ['|',('rule_max','=',False),('rule_auth','=','nobody')]}"/>
                         </group>
                         <group string="Automatic Rules">
                             <field name="rule_automatic"/>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 64e41122288..9acc4b9cb95 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -73,6 +73,8 @@ class gamification_goal_type(osv.Model):
             ],
             string="Computation Mode",
             required=True),
+        'ponctual': fields.boolean("Ponctual Goal",
+            help="A non-numerical goal is displayed with only two states: TODO or Done."),
         'model_id': fields.many2one('ir.model',
             string='Model',
             help='The model object for the field to evaluate'),
@@ -110,6 +112,7 @@ class gamification_goal_type(osv.Model):
         'computation_mode': 'manually',
         'domain': "[]",
         'monetary': False,
+        'ponctual': False,
     }
 
 
@@ -194,6 +197,8 @@ class gamification_goal(osv.Model):
             type='char', string='Type Condition'),
         'type_suffix': fields.related('type_id', 'full_suffix',
             type="char", string="Suffix"),
+        'type_ponctual': fields.related('type_id', 'ponctual',
+            type="boolean", string="Ponctual Goal"),
     }
 
     _defaults = {
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index b8511dd96f4..e8bd4c6b91e 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -47,7 +47,7 @@
                         <button string="Goal Reached" type="object" name="action_reach" states="inprogress,inprogress_update" />
                         <button string="Goal Failed" type="object" name="action_fail" states="inprogress,inprogress_update"/>
                         <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached" groups="base.group_no_one" />
-                        <field name="state" widget="statusbar" statusbar_visible="inprogress" />
+                        <field name="state" widget="statusbar" statusbar_visible="draft,inprogress,reached" />
                     </header>
                     <sheet>
                         <group>
@@ -138,17 +138,37 @@
                     <field name="target_goal"/>
                     <field name="type_condition"/>
                     <field name="type_suffix"/>
+                    <field name="type_ponctual"/>
                     <field name="start_date"/>
                     <field name="end_date"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_card oe_kanban_global_click oe_kanban_goal">
+                            <div t-attf-class="oe_kanban_card oe_gamification_goal oe_kanban_goal">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
                                     </div>
-                                    <h4 class="oe_goal_name"><field name="type_id"/></h4>
-                                    <div class="oe_goal_gauge"></div>
+                                    <div>
+                                        <h4 class="oe_goal_name"><field name="type_id"/></h4>
+                                    </div>
+                                    <div class="oe_goal_state_block">
+                                        <t t-if="!record.type_ponctual.value">
+                                            <div class="oe_goal_gauge"></div>
+                                        </t>
+                                        <t t-if="record.type_ponctual.value">
+                                            <p class="oe_e">
+                                                <t t-if="record.state.raw_value=='reached'">
+                                                    W
+                                                </t>
+                                                <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">
+                                                    N
+                                                </t>
+                                                <t t-if="record.state.raw_value=='failed'">
+                                                    X
+                                                </t>
+                                            </p>
+                                        </t>
+                                    </div>
                                     <p>
                                         <t t-if="record.type_description.value">
                                             <em><field name="type_description"/></em>
@@ -227,6 +247,7 @@
                                 <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" class="oe_inline"/>
 
                                 <field name="condition" widget="radio"/>
+                                <field name="ponctual" />
                             </group>
                             <group string="Formating Options">
                                 <field name="unit" class="oe_inline"/>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index e47c2b356a9..dc46b02afda 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -165,10 +165,10 @@ class gamification_goal_plan(osv.Model):
             string='Next Report Date'),
 
         'category': fields.selection([
-            ('hr', 'Human Ressources'),
+            ('hr', 'Human Ressources / Appraisals'),
             ('other', 'Other'),
             ],
-            string="Category", help="Only HR plans can be accessed by managers", required=True)
+            string="Appears in", help="Only HR plans can be accessed by managers", required=True)
         }
 
     _defaults = {
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index ad11bae5d34..910e837c346 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -112,7 +112,7 @@
                                 </div>
                             </group>
                             <group string="Category" groups="base.group_no_one">
-                                <field name="category" />
+                                <field name="category" widget="radio" />
                             </group>
                         </page>
                         </notebook>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 7481a853295..3738d0bc51f 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -19,14 +19,21 @@
     border-radius: 2px;
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
-.oe_goal_gauge {
+.oe_kanban_goal .oe_goal_state_block {
     width:200px;
     height:130px;
     margin: auto;
-    margin-bottom: -30px;
+    margin-bottom: -20px;
 }
-.oe_goal_gauge svg {
-    margin-top: -30px;
+.oe_kanban_goal .oe_goal_state_block p {
+    line-height: 70px;
+    font-size: 3em;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child {
+    margin: auto; /* avoid margin-right: 16px; */
+}
+.oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg {
+    margin-top: -20px;
 }
 
 
@@ -47,18 +54,17 @@
     border: solid 1px rgba(0,0,0,0.03);
 }
 
-.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached:before {
+.openerp .oe_gamification_goal .oe_goal_reached:before {
     content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=);
-    margin-left:-40px;
+    margin-left:-20px;
 }
-.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed:before {
+.openerp .oe_gamification_goal .oe_goal_failed:before {
     content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC);
-    margin-left:-40px;
+    margin-left:-20px;
 }
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached,
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed {
     text-decoration: line-through;
-    padding-left: 20px;
 }
 
 .openerp .oe_mail_wall .oe_mail_wall_aside ul {

From cff925cf3e6120e293528b1729cbfa95c71bb222 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 11 Apr 2013 12:15:43 +0200
Subject: [PATCH 265/547] [IMP] display goals lower than

bzr revid: mat@openerp.com-20130411101543-wal4yed64rynchfn
---
 addons/gamification/badge_view.xml          |  2 +-
 addons/gamification/goal_view.xml           | 43 ++++++++++-----------
 addons/gamification/static/src/css/goal.css | 19 +++++----
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 15e9b0d6558..41d5a82fa4b 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -177,7 +177,7 @@
                                     <t t-if="record.comment.raw_value">
                                         <p><em><field name="comment"/></em></p>
                                     </t>
-                                    <p>Sent by <a type="open"><field name="create_uid" /></a> the <t t-esc="record.create_date.raw_value.toString(Date.CultureInfo.formatPatterns.shortDate)" /></p>
+                                    <p>Granted by <a type="open"><field name="create_uid" /></a> the <t t-esc="record.create_date.raw_value.toString(Date.CultureInfo.formatPatterns.shortDate)" /></p>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index e8bd4c6b91e..b892a8d9f03 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -142,38 +142,37 @@
                     <field name="start_date"/>
                     <field name="end_date"/>
                     <templates>
+                        <t t-name="kanban-tooltip">
+                           <field name="type_description"/>
+                        </t>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_card oe_gamification_goal oe_kanban_goal">
                                 <div class="oe_kanban_content">
+                                    <p><h4 class="oe_goal_name" tooltip="kanban-tooltip"><field name="type_id" /></h4></p>
                                     <div class="oe_kanban_left">
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
                                     </div>
-                                    <div>
-                                        <h4 class="oe_goal_name"><field name="type_id"/></h4>
-                                    </div>
+                                    <field name="user_id" />
                                     <div class="oe_goal_state_block">
-                                        <t t-if="!record.type_ponctual.value">
-                                            <div class="oe_goal_gauge"></div>
-                                        </t>
                                         <t t-if="record.type_ponctual.value">
-                                            <p class="oe_e">
-                                                <t t-if="record.state.raw_value=='reached'">
-                                                    W
-                                                </t>
-                                                <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">
-                                                    N
-                                                </t>
-                                                <t t-if="record.state.raw_value=='failed'">
-                                                    X
-                                                </t>
-                                            </p>
+                                            <div class="oe_goal_state oe_e"><t t-if="record.state.raw_value=='reached'">W</t>
+                                                <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">N</t>
+                                                <t t-if="record.state.raw_value=='failed'">X</t>
+                                            </div>
                                         </t>
+                                        <t t-if="!record.type_ponctual.value">
+                                            <t t-if="record.type_condition.raw_value =='higher'">
+                                                <div class="oe_goal_gauge"></div>
+                                            </t>
+                                            <t t-if="record.type_condition.raw_value != 'higher'">
+                                                <div class="oe_goal_state">
+                                                    <t t-esc="record.current.raw_value" /> → <t t-esc="record.target_goal.raw_value" />
+                                                </div>
+                                                <em>reached when lower than</em>
+                                            </t>
+                                        </t>
+                                        
                                     </div>
-                                    <p>
-                                        <t t-if="record.type_description.value">
-                                            <em><field name="type_description"/></em>
-                                        </t>
-                                    </p>
                                     <p>
                                         <t t-if="record.start_date.value">
                                             From <t t-esc="record.start_date.value" />
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 3738d0bc51f..32d2eb2c7d0 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,13 +1,9 @@
 /* Kanban views */
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
-  width: 220px;
+  width: 200px;
   min-height: 200px;
 }
-.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal p {
-    text-align: center;
-}
-
 .oe_kanban_badge_avatars {
     margin-top: 8px;
 }
@@ -25,9 +21,16 @@
     margin: auto;
     margin-bottom: -20px;
 }
-.oe_kanban_goal .oe_goal_state_block p {
-    line-height: 70px;
-    font-size: 3em;
+.oe_kanban_goal .oe_goal_state_block,p {
+    text-align: center;
+}
+.oe_kanban_goal .oe_goal_state_block .oe_goal_state {
+    font-size: 2.5em;
+    font-weight: bold;
+    padding-top: 30px;
+}
+.oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e{
+    font-size: 7em;
 }
 .openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child {
     margin: auto; /* avoid margin-right: 16px; */

From d20cbcf9f40fa4f854ec6312c6335f734300be09 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 11 Apr 2013 12:24:18 +0200
Subject: [PATCH 266/547] [REF] remove public attributes for badges

bzr revid: mat@openerp.com-20130411102418-vp9wng9ryzzggcgo
---
 addons/gamification/badge.py       | 5 +----
 addons/gamification/badge_view.xml | 1 -
 addons/hr_gamification/badge.py    | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 35d6c0b4756..00eb11fb38e 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -176,8 +176,6 @@ class gamification_badge(osv.Model):
             string='Goals Linked',
             help="The users that have succeeded theses goals will receive automatically the badge."),
 
-        'public': fields.boolean('Public',
-            help="A message will be posted on the user profile or just sent to him"),
         'owner_ids': fields.one2many('gamification.badge.user', 'badge_id',
             string='Owners', help='The list of instances of this badge granted to users'),
         'unique_owner_ids': fields.function(_get_unique_global_list,
@@ -206,8 +204,7 @@ class gamification_badge(osv.Model):
         'stat_this_month': 0,
         'rule_auth': 'everyone',
         'rule_automatic': 'manual',
-        'compute_code': "self.nobody(cr, uid, context)",
-        'public': True
+        'compute_code': "self.nobody(cr, uid, context)"
     }
 
     def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=None, context=None):
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 41d5a82fa4b..651905253d6 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -86,7 +86,6 @@
                         </div>
                         <group>
                             <field name="description" />
-                            <field name="public" />
                         </group>
                         <group string="User Rules">
                             <field name="rule_auth" string="Allowed to Grant" />
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index a46c8fd51f7..0c0ee260c47 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -55,7 +55,7 @@ class hr_gamification_badge(osv.Model):
         if 'badge_user' in context and 'badge_id' in context:
             badge = self.browse(cr, uid, context['badge_id'], context=context)
             badge_user = context['badge_user']
-            if badge.public and badge_user.employee_id:
+            if badge_user.employee_id:
                 return self.pool.get('hr.employee').message_post(cr, uid,
                     badge_user.employee_id.id, context=context, **kwargs)
         return super(hr_gamification_badge, self).message_post(cr, uid, thread_id, context=context, **kwargs)

From 4bcea683e204ee627813d1826c12530de22b4e23 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 11 Apr 2013 15:24:03 +0200
Subject: [PATCH 267/547] [FIX] send badge linked to employee

bzr revid: mat@openerp.com-20130411132403-vdhfk79aahfj6p1l
---
 addons/gamification/badge.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 00eb11fb38e..cd009c189f2 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -229,9 +229,10 @@ class gamification_badge(osv.Model):
             else:
                 values['user_from'] = False
             body_html = template_env.get_template('badge_received.mako').render(values)
-            res = self.message_post(cr, uid, 0,
+            context['badge_user'] = badge_user
+
+            res = self.message_post(cr, uid, badge.id,
                                     body=body_html,
-                                    partner_ids=[(4, badge_user.user_id.partner_id.id)],
                                     type='comment',
                                     subtype='mt_comment',
                                     context=context)
@@ -282,7 +283,6 @@ class gamification_badge(osv.Model):
                 # code_globals = {}
                 # code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
                 # exec code_obj in code_globals, code_locals
-                print(result)
                 if type(result) == list:
                     user_badge_ids = [
                         badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
@@ -410,4 +410,3 @@ class grant_badge_wizard(osv.TransientModel):
                 badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
 
         return {}
-grant_badge_wizard()

From d4ccdb46de1f9f5c3daf3a89b751a7dbf6a9ceed Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 11 Apr 2013 15:24:38 +0200
Subject: [PATCH 268/547] [IMP] better views

bzr revid: mat@openerp.com-20130411132438-x38ngml9sdi0uwb2
---
 addons/gamification/badge_view.xml    | 4 ++--
 addons/hr_gamification/badge.py       | 6 +++---
 addons/hr_gamification/badge_view.xml | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 651905253d6..d3e206b795f 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -27,9 +27,9 @@
                 <form string="Grant Badge To" version="7.0">
                     Who would you like to reward?
                     <group>
-                        <field name="user_id" />
+                        <field name="user_id" nolabel="1" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" placeholder="Describe what they did and why it matters" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 0c0ee260c47..7b85305289a 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -45,9 +45,9 @@ class hr_gamification_badge_user(osv.Model):
     ]
 
 
-class hr_gamification_badge(osv.Model):
+class gamification_badge(osv.Model):
     _name = 'gamification.badge'
-    _inherit = ['gamification.badge', 'mail.thread']
+    _inherit = ['gamification.badge']
 
     def message_post(self, cr, uid, thread_id, context=None, **kwargs):
         """Overwrite the message_post method to send the badge to the employee"""
@@ -58,7 +58,7 @@ class hr_gamification_badge(osv.Model):
             if badge_user.employee_id:
                 return self.pool.get('hr.employee').message_post(cr, uid,
                     badge_user.employee_id.id, context=context, **kwargs)
-        return super(hr_gamification_badge, self).message_post(cr, uid, thread_id, context=context, **kwargs)
+        return super(gamification_badge, self).message_post(cr, uid, thread_id, context=context, **kwargs)
 
 
 class hr_grant_badge_wizard(osv.TransientModel):
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 9035058402a..98be93e0279 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -11,9 +11,9 @@
                 <form string="Grant Badge To" version="7.0">
                     Who would you like to reward?
                     <group>
-                        <field name="employee_id" />
+                        <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False)]" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" placeholder="Describe what they did and why it matters" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -34,8 +34,8 @@
                     What are you thank for?
                     <group>
                         <field name="employee_id" invisible="1" />
-                        <field name="badge_id" />
-                        <field name="comment" placeholder="Describe what they did and why it matters" />
+                        <field name="badge_id" nolabel="1" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>
                         <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or

From 28761467fc3c13f45f655b39b58cb233a7a1c1ea Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 11 Apr 2013 17:11:32 +0200
Subject: [PATCH 269/547] [IMP] better UI

bzr revid: mat@openerp.com-20130411151132-vsk2cnff5uhqmzas
---
 addons/gamification/badge.py                  | 20 +++++++++-----
 addons/gamification/badge_view.xml            | 26 ++++++++++++-------
 addons/gamification/goal_view.xml             | 11 +++++---
 addons/gamification/static/src/css/goal.css   |  2 +-
 .../static/src/js/gamification.js             |  1 -
 addons/hr_evaluation/hr_evaluation_view.xml   |  7 +++--
 addons/hr_gamification/badge_view.xml         |  2 +-
 7 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index cd009c189f2..a681caa6ecf 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -140,7 +140,7 @@ class gamification_badge(osv.Model):
                 ('everyone', 'Everyone'),
                 ('users', 'A selected list of users'),
                 ('having', 'People having some badges'),
-                ('nobody', 'Nobody'),
+                ('nobody', 'No one'),
             ],
             string="User Authorization Rule",
             help="Who can grant this badge",
@@ -153,18 +153,19 @@ class gamification_badge(osv.Model):
             string='Required Badges',
             help="Only the people having these badges can give this badge"),
 
-        'rule_max': fields.boolean('Limited Sending',
+        'rule_max': fields.boolean('Monthly Limited Sending',
             help="Check to set a monthly limit per person of sending this badge"),
         'rule_max_number': fields.integer('Limitation Number',
             help="The maximum number of time this badge can be sent per month per person."),
         'stat_my_monthly_sending': fields.function(_get_month_my_sent,
+            type="integer",
             string='My Monthly Sending Total',
             help="The number of time the current user has sent this badge this month."),
 
         'rule_automatic': fields.selection([
-                ('manual', 'Given by Users Only'),
-                ('goals', 'List of Goals'),
-                ('python', 'Python Code'),
+                ('goals', 'List of goals to reach'),
+                ('python', 'Custom python code executed'),
+                ('manual', 'Not automatic'),
             ],
             string="Automatic Rule",
             help="Can this badge be automatically rewarded",
@@ -184,16 +185,21 @@ class gamification_badge(osv.Model):
             type="many2many", relation="res.users"),
 
         'stat_count': fields.function(_get_global_count, string='Total',
+            type="integer",
             help="The number of time this badge has been received."),
         'stat_count_distinct': fields.function(_get_unique_global_count,
-            string='Unique Count',
+            type="integer",
+            string='Number of users',
             help="The number of time this badge has been received by individual users."),
         'stat_this_month': fields.function(_get_month_count,
-            string='Monthly Count',
+            type="integer",
+            string='Monthly total',
             help="The number of time this badge has been received this month."),
         'stat_my': fields.function(_get_global_my_count, string='My Total',
+            type="integer",
             help="The number of time the current user has received this badge."),
         'stat_my_this_month': fields.function(_get_month_my_count,
+            type="integer",
             string='My Monthly Total',
             help="The number of time the current user has received this badge this month."),
     }
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index d3e206b795f..a590308cc5f 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -85,27 +85,33 @@
                             </h1>
                         </div>
                         <group>
-                            <field name="description" />
+                            <field name="description" nolabel="1" placeholder="Badge Description" />
                         </group>
                         <group string="User Rules">
-                            <field name="rule_auth" string="Allowed to Grant" />
+                            <field name="rule_auth" string="Allowed to Grant" widget="radio" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
                             <field name="rule_max_number" attrs="{'invisible': ['|',('rule_max','=',False),('rule_auth','=','nobody')]}"/>
+                                                        <field name="stat_my_monthly_sending" attrs="{'invisible': [('rule_auth','=','nobody')]}"/>
+
                         </group>
                         <group string="Automatic Rules">
-                            <field name="rule_automatic"/>
+                            <field name="rule_automatic" widget="radio"/>
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
                             <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
                         </group>
-                        <group string="Stats">
-                            <field name="stat_count"/>
-                            <field name="stat_count_distinct"/>
-                            <field name="stat_this_month"/>
-                            <field name="stat_my"/>
-                            <field name="stat_my_this_month"/>
-                            <field name="stat_my_monthly_sending"/>
+                        <group string="Statistics">
+                            <group>
+                                <field name="stat_count"/>
+                                <field name="stat_this_month"/>
+                                <field name="stat_count_distinct"/>
+                            </group>
+                            <group>
+                                <field name="stat_my"/>
+                                <field name="stat_my_this_month"/>
+
+                            </group>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index b892a8d9f03..20846802726 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -54,7 +54,7 @@
                             <group string="Reference">
                                 <field name="type_id" on_change="on_change_type_id(type_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="planline_id" groups="base.group_no_one"  attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="plan_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group string="Schedule">
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -69,13 +69,16 @@
                                 <field name="last_update" groups="base.group_no_one"/>
                             </group>
                             <group string="Data" colspan="4">
-                                <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}" class="oe_inline"/>
                                 <label for="current" />
                                 <div>
                                     <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}" class="oe_inline"/>
                                     <button string="Refresh state" type="object" name="update" class="oe_highlight oe_inline" attrs="{'invisible':['|',('computation_mode', '=', 'manually'),('state', '=', 'draft')]}"/>
                                     <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders" attrs="{'invisible':['|',('computation_mode','!=', 'manually'),('state','=','draft')]}"/>
                                 </div>
+                                <field name="type_condition"/>
+                                <field name="type_suffix"/>
+                                <field name="type_ponctual"/>
                             </group>
                         </group>
                     </sheet>
@@ -166,9 +169,9 @@
                                             </t>
                                             <t t-if="record.type_condition.raw_value != 'higher'">
                                                 <div class="oe_goal_state">
-                                                    <t t-esc="record.current.raw_value" /> → <t t-esc="record.target_goal.raw_value" />
+                                                    <t t-esc="record.current.raw_value" />
                                                 </div>
-                                                <em>reached when lower than</em>
+                                                <em>reached when lower than <t t-esc="record.target_goal.raw_value" /></em>
                                             </t>
                                         </t>
                                         
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 32d2eb2c7d0..82a0d60b903 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,7 +1,7 @@
 /* Kanban views */
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
-  width: 200px;
+  width: 220px;
   min-height: 200px;
 }
 .oe_kanban_badge_avatars {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index c743d39282a..44af26550a0 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -123,7 +123,6 @@ openerp.gamification = function(instance) {
                 if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
                     var unique_id = _.uniqueId("goal_gauge_");
                     self.$el.find('.oe_goal_gauge').attr('id', unique_id);
-                    console.log(self.record);
                     var g = new JustGage({
                         id: unique_id,
                         node: self.$el.find('.oe_goal_gauge').empty().get(0),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5f8f6e599c7..1adff3ccc22 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -423,13 +423,16 @@
         </record>
 
 
-        <record model="ir.actions.act_window" id="gamification.goal_plan_list_action">
+        <record id="goal_plan_list_action2" model="ir.actions.act_window">
+            <field name="name">Goal Plans</field>
             <field name="domain">[('category', '=', 'hr')]</field>
+            <field name="res_model">gamification.goal.plan</field>
+            <field name="view_mode">kanban,form</field>
         </record>
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="gamification.goal_plan_list_action" groups="gamification.group_goal_manager"/>
+        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="goal_plan_list_action2" groups="gamification.group_goal_manager"/>
         <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="gamification.group_goal_manager"/>
 
       <!-- Email Compose message Action-->
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 98be93e0279..1f47bd74d6f 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -34,7 +34,7 @@
                     What are you thank for?
                     <group>
                         <field name="employee_id" invisible="1" />
-                        <field name="badge_id" nolabel="1" />
+                        <field name="badge_id" nolabel="1" colspan="4" />
                         <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
                     </group>
                     <footer>

From 252365095a18b71ac0912ca2bc3f5262ffdd87b8 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 10:54:52 +0200
Subject: [PATCH 270/547] [IMP] better badge views and checks

bzr revid: mat@openerp.com-20130412085452-mnecqo80cgmo2ecs
---
 addons/gamification/badge.py                  | 68 ++++++++++++++++---
 addons/gamification/badge_view.xml            | 57 ++++++++++++----
 addons/gamification/goal.py                   |  3 -
 addons/gamification/static/src/css/goal.css   | 10 ++-
 .../static/src/js/gamification.js             |  2 +-
 addons/hr_gamification/badge.py               |  3 +-
 6 files changed, 110 insertions(+), 33 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index a681caa6ecf..3872c4362a2 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -26,6 +26,9 @@ from openerp.tools.safe_eval import safe_eval
 
 from templates import TemplateHelper
 from datetime import date
+import logging
+
+_logger = logging.getLogger(__name__)
 
 
 class gamification_badge_user(osv.Model):
@@ -130,6 +133,24 @@ class gamification_badge(osv.Model):
                           ('create_date', '>=', first_month_day)], context=context))
         return result
 
+    def _remaining_sending_calc(self, cr, uid, ids, name, args, context=None):
+        """Computes the number of badges remaining the user can send
+
+        0 if not allowed or no remaining
+        integer if limited sending
+        -1 if infinite (should not be displayed)
+        """
+        result = dict.fromkeys(ids, False)
+        for badge in self.browse(cr, uid, ids, context=context):
+            if self.can_grant_badge(cr, uid, uid, badge.id, context) != 1:
+                result[badge.id] = 0
+            elif not badge.rule_max:
+                result[badge.id] = -1
+            else:
+                result[badge.id] = badge.rule_max_number - badge.stat_my_monthly_sending
+
+        return result
+
     _columns = {
         'name': fields.char('Badge', required=True, translate=True),
         'description': fields.text('Description'),
@@ -161,6 +182,8 @@ class gamification_badge(osv.Model):
             type="integer",
             string='My Monthly Sending Total',
             help="The number of time the current user has sent this badge this month."),
+        'remaining_sending': fields.function(_remaining_sending_calc, type='integer',
+            string='Remaining Sending Allowed', help="If a maxium is set"),
 
         'rule_automatic': fields.selection([
                 ('goals', 'List of goals to reach'),
@@ -338,22 +361,46 @@ class gamification_badge(osv.Model):
 
         return True
 
+    def check_granting(self, cr, uid, user_from_id, badge_id, context=None):
+        """Check the user can grant a badge and raise the appropriate exception
+        if not"""
+        context = context or {}
+        status_code = self.can_grant_badge(cr, uid, user_from_id, badge_id, context)
+        if status_code == 1:
+            return True
+        elif status_code == 2:
+            raise osv.except_osv(_('Warning!'), _('This badge can not be sent by users.'))
+        elif status_code == 3:
+            raise osv.except_osv(_('Warning!'), _('You are not in the user allowed list.'))
+        elif status_code == 4:
+            raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
+        elif status_code == 5:
+            raise osv.except_osv(_('Warning!'), _('You have already sent this badge too many time this month.'))
+        else:
+            _logger.exception("Unknown badge status code: %d" % int(status_code))
+        return False
+
     def can_grant_badge(self, cr, uid, user_from_id, badge_id, context=None):
         """Check if a user can grant a badge to another user
 
         :param user_from_id: the id of the res.users trying to send the badge
         :param badge_id: the granted badge id
-        :return: boolean, True if succeeded to send, False otherwise
+        :return: integer representing the permission.
+            1: can grant
+            2: nobody can send
+            3: user not in the allowed list
+            4: don't have the required badges
+            5: user's monthly limit reached
         """
         context = context or {}
         badge = self.browse(cr, uid, badge_id, context=context)
 
         if badge.rule_auth == 'nobody':
-            raise osv.except_osv(_('Warning!'), _('This badge can not be sent by users.'))
+            return 2
 
-        elif badge.rule_auth == 'list':
+        elif badge.rule_auth == 'users':
             if user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
-                raise osv.except_osv(_('Warning!'), _('You are not in the user allowed list.'))
+                return 3
 
         elif badge.rule_auth == 'having':
             badge_users = self.pool.get('gamification.badge.user').search(
@@ -361,23 +408,24 @@ class gamification_badge(osv.Model):
 
             if len(badge_users) == 0:
                 # the user_from has no badges
-                raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
+                return 4
 
             owners = [owner.id for owner in badge.owner_ids]
             granted = False
             for badge_user in badge_users:
-                if badge_user.id in owners:
+                if badge_user in owners:
                     granted = True
+                    break
             if not granted:
-                raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
+                return 4
 
         # else badge.rule_auth == 'everyone' -> no check
 
         if badge.rule_max and badge.stat_my_monthly_sending >= badge.rule_max_number:
             # sent the maximum number of time this month
-            raise osv.except_osv(_('Warning!'), _('You have already sent this badge too many time this month.'))
+            return 5
 
-        return True
+        return 1
 
 
 class grant_badge_wizard(osv.TransientModel):
@@ -400,7 +448,7 @@ class grant_badge_wizard(osv.TransientModel):
             if uid == wiz.user_id.id:
                 raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
 
-            if badge_obj.can_grant_badge(cr, uid,
+            if badge_obj.check_granting(cr, uid,
                                          user_from_id=uid,
                                          badge_id=wiz.badge_id.id,
                                          context=context):
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index a590308cc5f..84fbbd14c68 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -93,8 +93,16 @@
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
                             <field name="rule_max_number" attrs="{'invisible': ['|',('rule_max','=',False),('rule_auth','=','nobody')]}"/>
-                                                        <field name="stat_my_monthly_sending" attrs="{'invisible': [('rule_auth','=','nobody')]}"/>
-
+                            <label for="stat_my_monthly_sending"/>
+                            <div>
+                                <field name="stat_my_monthly_sending" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
+                                <div attrs="{'invisible': [('remaining_sending','=',-1)]}" class="oe_grey">
+                                    You can still send <field name="remaining_sending" class="oe_inline"/> badges this month
+                                </div>
+                                <div attrs="{'invisible': [('remaining_sending','!=',-1)]}" class="oe_grey">
+                                    No monthly sending limit
+                                </div>
+                            </div>
                         </group>
                         <group string="Automatic Rules">
                             <field name="rule_automatic" widget="radio"/>
@@ -110,7 +118,6 @@
                             <group>
                                 <field name="stat_my"/>
                                 <field name="stat_my_this_month"/>
-
                             </group>
                         </group>
                     </sheet>
@@ -129,25 +136,45 @@
                     <field name="image"/>
                     <field name="stat_my"/>
                     <field name="stat_count"/>
-                    <field name="stat_count_distinct"/>
+                    <field name="stat_this_month"/>
                     <field name="unique_owner_ids"/>
+                    <field name="remaining_sending" />
+                    <field name="rule_max_number" />
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="#{record.stat_my.raw_value ? 'oe_kanban_color_5' : 'oe_kanban_color_white'} oe_kanban_card oe_kanban_global_click oe_kanban_badge">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
-                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="24" height="24" /></a>
+                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="100" height="100" /></a>
+                                        <div class="oe_kanban_badge_avatars">
+                                            <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
+                                                <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
+                                            </t>
+                                        </div>
                                     </div>
-                                    <h4><a type="open"><field name="name"/></a></h4>
-                                    <t t-if="record.description.value">
-                                        <em><field name="description"/></em>
-                                    </t>
-                                    <p>Granted <t t-esc="record.stat_count.raw_value" />x (<t t-esc="record.stat_count_distinct.raw_value"/> pers.)</p>
-                                    <div class="oe_kanban_badge_avatars">
-                                        <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
-                                            <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
+                                    <div>
+                                        <h4><a type="open"><field name="name"/></a></h4>
+                                        <t t-if="record.description.value">
+                                            <em><field name="description"/></em>
                                         </t>
-                                    </div>
+                                        <p>
+                                            Total: <t t-esc="record.stat_count.raw_value"/> (<t t-esc="record.stat_this_month.raw_value"/> this month)
+                                        </p>
+                                        <t t-if="record.remaining_sending.value != 0">
+                                            <button type="action" name="%(action_grant_wizard)d" class="oe_highlight">Grant</button>
+                                            <p class="oe_grey">
+                                                <t t-if="record.remaining_sending.value != -1">
+                                                    <t t-esc="record.remaining_sending.value"/>/<t t-esc="record.rule_max_number.value"/> remaining
+                                                </t>
+                                                <t t-if="record.remaining_sending.value == -1">
+                                                    ∞
+                                                </t>
+                                            </p>
+                                        </t>
+                                        <t t-if="record.remaining_sending.value == 0">
+                                            <div class="oe_grey">You can not send this badge</div>
+                                        </t>
+                                    </div>                
                                 </div>
                             </div>
                         </t>
@@ -171,7 +198,7 @@
                     <field name="create_date"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div class="oe_kanban_card oe_kanban_global_click oe_kanban_goal oe_kanban_color_white">
+                            <div class="oe_kanban_card oe_kanban_global_click oe_kanban_badge oe_kanban_color_white">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.badge_id.raw_value)" t-att-title="record.badge_name.value" width="24" height="24" /></a>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 9acc4b9cb95..b3ebced9ed1 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -25,9 +25,6 @@ from openerp.tools.safe_eval import safe_eval
 from templates import TemplateHelper
 
 from datetime import date, datetime, timedelta
-import logging
-
-_logger = logging.getLogger(__name__)
 
 
 class gamification_goal_type(osv.Model):
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 82a0d60b903..cb8054f33b4 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,9 +1,12 @@
 /* Kanban views */
-.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
-.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
   width: 220px;
   min-height: 200px;
 }
+.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
+    width: 250px;
+    min-height: 150px;
+}
 .oe_kanban_badge_avatars {
     margin-top: 8px;
 }
@@ -21,7 +24,8 @@
     margin: auto;
     margin-bottom: -20px;
 }
-.oe_kanban_goal .oe_goal_state_block,p {
+.oe_kanban_goal .oe_goal_state_block,
+.oe_kanban_goal p {
     text-align: center;
 }
 .oe_kanban_goal .oe_goal_state_block .oe_goal_state {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 44af26550a0..a856d057172 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -125,7 +125,7 @@ openerp.gamification = function(instance) {
                     self.$el.find('.oe_goal_gauge').attr('id', unique_id);
                     var g = new JustGage({
                         id: unique_id,
-                        node: self.$el.find('.oe_goal_gauge').empty().get(0),
+                        node: self.$('.oe_goal_gauge').empty().get(0),
                         value: self.record.current.raw_value,
                         min: 0,
                         max: self.record.target_goal.raw_value,
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 7b85305289a..28734699307 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
 
 
 class hr_gamification_badge_user(osv.Model):
@@ -56,7 +57,7 @@ class gamification_badge(osv.Model):
             badge = self.browse(cr, uid, context['badge_id'], context=context)
             badge_user = context['badge_user']
             if badge_user.employee_id:
-                return self.pool.get('hr.employee').message_post(cr, uid,
+                return self.pool.get('hr.employee').message_post(cr, SUPERUSER_ID,
                     badge_user.employee_id.id, context=context, **kwargs)
         return super(gamification_badge, self).message_post(cr, uid, thread_id, context=context, **kwargs)
 

From c7edf723508465eca3e1a9c685725ba89b9d1071 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 11:26:03 +0200
Subject: [PATCH 271/547] [IMP] gamification officer rules

bzr revid: mat@openerp.com-20130412092603-aotk0y53snjz9c9i
---
 addons/gamification/badge_view.xml                |  6 ++++++
 addons/gamification/security/ir.model.access.csv  | 15 ++++++++++-----
 addons/hr_evaluation/hr_evaluation_view.xml       |  4 ++--
 .../security/hr_evaluation_security.xml           |  2 +-
 addons/hr_evaluation/security/ir.model.access.csv |  5 +++++
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 84fbbd14c68..55c8ffb6dfa 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -144,6 +144,12 @@
                         <t t-name="kanban-box">
                             <div t-attf-class="#{record.stat_my.raw_value ? 'oe_kanban_color_5' : 'oe_kanban_color_white'} oe_kanban_card oe_kanban_global_click oe_kanban_badge">
                                 <div class="oe_kanban_content">
+                                    <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                        <span class="oe_e">í</span>
+                                        <ul class="oe_dropdown_menu">
+                                            <li><a type="open">Badge Details</a></li>
+                                        </ul>
+                                    </div>
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="100" height="100" /></a>
                                         <div class="oe_kanban_badge_avatars">
diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 52ea42e09e3..3b1024015c8 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -1,16 +1,21 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-goal_anybody,"Goal Anybody",model_gamification_goal,,1,0,0,0
-goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
+
 goal_user,"Goal User",model_gamification_goal,base.group_user,1,1,0,0
+goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
+
+goal_type_user,"Goal Type User",model_gamification_goal_type,base.group_user,1,0,0,0
 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
-goal_type_anybody,"Goal Type Anybody",model_gamification_goal_type,,1,0,0,0
+
+plan_user,"Goal Plan User",model_gamification_goal_plan,base.group_user,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
-plan_user,"Goal Plan Anybody",model_gamification_goal_plan,base.group_user,1,0,0,0
+
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
 planline_user,"Goal Planline Anybody",model_gamification_goal_planline,base.group_user,1,0,0,0
+
 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
-badge_user,"Badge Manager",model_gamification_badge,base.group_user,1,0,0,0
+badge_user,"Badge User",model_gamification_badge,base.group_user,1,0,0,0
 badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0
+
 badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1
 badge_user_user,"Badge-user User",model_gamification_badge_user,base.group_user,1,1,1,0
 badge_user_anybody,"Badge-user Anybody",model_gamification_badge_user,,1,0,0,0
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 1adff3ccc22..0c0ccbcc232 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -432,8 +432,8 @@
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="goal_plan_list_action2" groups="gamification.group_goal_manager"/>
-        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="gamification.group_goal_manager"/>
+        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="goal_plan_list_action2" groups="base.group_hr_user"/>
+        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="base.group_hr_user"/>
 
       <!-- Email Compose message Action-->
       <act_window
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 10299175276..1305c81934b 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -4,7 +4,7 @@
 
     <!-- make Employee users Survey users and Gamification manager -->
     <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('base.group_survey_user')), (4, ref('gamification.group_goal_manager'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
     </record>
 
     <record id="survey.menu_surveys" model="ir.ui.menu">
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index a304ee84c10..ffeacde94ca 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -40,3 +40,8 @@ access_survey_question_column_heading_hr_employee,survey.question.column.heading
 access_survey_response_line_hr_employee,survey.response.line.employee,survey.model_survey_response_line,base.group_user,1,1,1,0
 access_survey_response_answer_hr_employee,survey.response.answer.hr.employee,survey.model_survey_response_answer,base.group_user,1,1,1,0
 access_survey_tbl_column_heading_hr_employee,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_user,1,1,1,0
+
+plan_officer,"Goal Plan Officer",gamification.model_gamification_goal_plan,base.group_hr_user,1,1,1,1
+planline_officer,"Goal Planline Officer",gamification.model_gamification_goal_planline,base.group_hr_user,1,1,1,1
+badge_officer,"Badge Officer",gamification.model_gamification_badge,base.group_hr_user,1,1,1,1
+badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,base.group_hr_user,1,1,1,1
\ No newline at end of file

From 2cb06d79a63a7abdd288d0087c3b0febb5df60b1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 11:43:13 +0200
Subject: [PATCH 272/547] [IMP] better badge views

bzr revid: mat@openerp.com-20130412094313-x530vhkzrwvt0tei
---
 addons/gamification/badge.py                |  2 +-
 addons/gamification/badge_view.xml          | 36 +++++++++------------
 addons/gamification/static/src/css/goal.css |  2 +-
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 3872c4362a2..7f7ddea7ce6 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -163,7 +163,7 @@ class gamification_badge(osv.Model):
                 ('having', 'People having some badges'),
                 ('nobody', 'No one'),
             ],
-            string="User Authorization Rule",
+            string="Allowed to Grant",
             help="Who can grant this badge",
             required=True),
         'rule_auth_user_ids': fields.many2many('res.users', 'rel_badge_auth_users',
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 55c8ffb6dfa..3d89bc752c2 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -67,13 +67,7 @@
             <field name="arch" type="xml">
                 <form string="Badge" version="7.0">
                     <header>
-                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
-                            '|',
-                                ('rule_auth', '=', 'nobody'),
-                                '&amp;',
-                                    ('rule_max', '=', True),
-                                    ('stat_this_month', '&gt;=', 'rule_max_number')
-                            ]}" />
+                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [('remaining_sending','!=',0)]}" />
                         <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
                     </header>
                     <sheet>
@@ -87,8 +81,8 @@
                         <group>
                             <field name="description" nolabel="1" placeholder="Badge Description" />
                         </group>
-                        <group string="User Rules">
-                            <field name="rule_auth" string="Allowed to Grant" widget="radio" />
+                        <group string="Rules for User Granting">
+                            <field name="rule_auth" widget="radio" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
@@ -104,7 +98,7 @@
                                 </div>
                             </div>
                         </group>
-                        <group string="Automatic Rules">
+                        <group string="Rules for Automatic Granting">
                             <field name="rule_automatic" widget="radio"/>
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
                             <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
@@ -151,12 +145,7 @@
                                         </ul>
                                     </div>
                                     <div class="oe_kanban_left">
-                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="100" height="100" /></a>
-                                        <div class="oe_kanban_badge_avatars">
-                                            <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
-                                                <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
-                                            </t>
-                                        </div>
+                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="110" height="110" /></a>
                                     </div>
                                     <div>
                                         <h4><a type="open"><field name="name"/></a></h4>
@@ -168,19 +157,24 @@
                                         </p>
                                         <t t-if="record.remaining_sending.value != 0">
                                             <button type="action" name="%(action_grant_wizard)d" class="oe_highlight">Grant</button>
-                                            <p class="oe_grey">
+                                            <span class="oe_grey">
                                                 <t t-if="record.remaining_sending.value != -1">
-                                                    <t t-esc="record.remaining_sending.value"/>/<t t-esc="record.rule_max_number.value"/> remaining
+                                                    <t t-esc="record.remaining_sending.value"/>/<t t-esc="record.rule_max_number.value"/>
                                                 </t>
                                                 <t t-if="record.remaining_sending.value == -1">
                                                     ∞
                                                 </t>
-                                            </p>
+                                            </span>
                                         </t>
                                         <t t-if="record.remaining_sending.value == 0">
-                                            <div class="oe_grey">You can not send this badge</div>
+                                            <div class="oe_grey">Can not send</div>
                                         </t>
-                                    </div>                
+                                    </div>
+                                    <div class="oe_kanban_badge_avatars">
+                                        <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
+                                            <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
+                                        </t>
+                                    </div>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index cb8054f33b4..d5792d7864b 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,6 +1,6 @@
 /* Kanban views */
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
-  width: 220px;
+  width: 230px;
   min-height: 200px;
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {

From d52cb29c5fcda99b0301feda9cdc8ab5206a981a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 12:09:33 +0200
Subject: [PATCH 273/547] [IMP] color for goal kanban

bzr revid: mat@openerp.com-20130412100933-pmh9cl2tejthzi9x
---
 addons/gamification/goal.py                 | 12 +++++------
 addons/gamification/goal_view.xml           | 23 ++++++++++++---------
 addons/gamification/static/src/css/goal.css |  9 ++++++++
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index b3ebced9ed1..2f64ae16dc5 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -186,16 +186,16 @@ class gamification_goal(osv.Model):
         'last_update' : fields.date('Last Update',
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
 
-        'type_description': fields.related('type_id','description',
-            type='char', string='Type Description'),
+        'type_description': fields.related('type_id', 'description',
+            type='char', string='Type Description', readonly=True),
         'type_unit': fields.related('type_id', 'unit',
-            type='char', string='Type Description'),
+            type='char', string='Type Description', readonly=True),
         'type_condition': fields.related('type_id', 'condition',
-            type='char', string='Type Condition'),
+            type='char', string='Type Condition', readonly=True),
         'type_suffix': fields.related('type_id', 'full_suffix',
-            type="char", string="Suffix"),
+            type="char", string="Suffix", readonly=True),
         'type_ponctual': fields.related('type_id', 'ponctual',
-            type="boolean", string="Ponctual Goal"),
+            type="boolean", string="Ponctual Goal", readonly=True),
     }
 
     _defaults = {
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 20846802726..a4c7b28e5a0 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -69,16 +69,19 @@
                                 <field name="last_update" groups="base.group_no_one"/>
                             </group>
                             <group string="Data" colspan="4">
-                                <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}" class="oe_inline"/>
+                                <label for="target_goal" />
+                                <div>
+                                    <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}" class="oe_inline"/>
+                                    <field name="type_suffix" class="oe_inline"/>
+                                </div>
                                 <label for="current" />
                                 <div>
-                                    <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}" class="oe_inline"/>
-                                    <button string="Refresh state" type="object" name="update" class="oe_highlight oe_inline" attrs="{'invisible':['|',('computation_mode', '=', 'manually'),('state', '=', 'draft')]}"/>
-                                    <button name="write" type="object" string="The current value is up to date" help="Indicate that the current value of the manual goal is still correct and avoid reminders" attrs="{'invisible':['|',('computation_mode','!=', 'manually'),('state','=','draft')]}"/>
+                                    <field name="current" class="oe_inline"/>
+                                    <button string="refresh" type="object" name="update" class="oe_link" attrs="{'invisible':['|',('computation_mode', '=', 'manually'),('state', '=', 'draft')]}" />
+                                    <div class="oe_grey">
+                                        Reached when current value is <strong><field name="type_condition" class="oe_inline"/></strong> than the target.
+                                    </div>
                                 </div>
-                                <field name="type_condition"/>
-                                <field name="type_suffix"/>
-                                <field name="type_ponctual"/>
                             </group>
                         </group>
                     </sheet>
@@ -158,9 +161,9 @@
                                     <field name="user_id" />
                                     <div class="oe_goal_state_block">
                                         <t t-if="record.type_ponctual.value">
-                                            <div class="oe_goal_state oe_e"><t t-if="record.state.raw_value=='reached'">W</t>
+                                            <div class="oe_goal_state oe_e"><t t-if="record.state.raw_value=='reached'"><span class="oe_green">W</span></t>
                                                 <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">N</t>
-                                                <t t-if="record.state.raw_value=='failed'">X</t>
+                                                <t t-if="record.state.raw_value=='failed'"><span class="oe_red">X</span></t>
                                             </div>
                                         </t>
                                         <t t-if="!record.type_ponctual.value">
@@ -168,7 +171,7 @@
                                                 <div class="oe_goal_gauge"></div>
                                             </t>
                                             <t t-if="record.type_condition.raw_value != 'higher'">
-                                                <div class="oe_goal_state">
+                                                <div t-attf-class="oe_goal_state #{record.current.raw_value == record.target_goal.raw_value+1 ? 'oe_orange' : record.current.raw_value &gt; record.target_goal.raw_value ? 'oe_red' : 'oe_green'}">
                                                     <t t-esc="record.current.raw_value" />
                                                 </div>
                                                 <em>reached when lower than <t t-esc="record.target_goal.raw_value" /></em>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index d5792d7864b..dc8273e6f69 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -43,6 +43,15 @@
     margin-top: -20px;
 }
 
+.openerp .oe_red {
+    color: red;
+}
+.openerp .oe_green {
+    color: green;
+}
+.openerp .oe_orange {
+    color: orange;
+}
 
 /* Mail Sidebar */
 

From 6f7a0852ac56a1553213820e2beb00eecae658b4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 14:19:13 +0200
Subject: [PATCH 274/547] [IMP] better handling of past goals

bzr revid: mat@openerp.com-20130412121913-zp30gchk5tfbsuzy
---
 addons/gamification/goal.py                 | 12 +++------
 addons/gamification/goal_view.xml           | 27 +++++++------------
 addons/gamification/plan.py                 | 29 ++++++++++++---------
 addons/gamification/static/src/css/goal.css |  1 +
 4 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 2f64ae16dc5..0f62fa09c15 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -156,13 +156,13 @@ class gamification_goal(osv.Model):
             relation='gamification.goal.plan',
             store=True),
         'start_date': fields.date('Start Date'),
-        'end_date': fields.date('End Date'), # no start and end = always active
+        'end_date': fields.date('End Date'),  # no start and end = always active
         'target_goal': fields.float('To Reach',
             required=True,
-            track_visibility = 'always'), # no goal = global index
+            track_visibility='always'),  # no goal = global index
         'current': fields.float('Current',
             required=True,
-            track_visibility = 'always'),
+            track_visibility='always'),
         'completeness': fields.function(_get_completeness,
             type='float',
             string='Completeness'),
@@ -183,7 +183,7 @@ class gamification_goal(osv.Model):
             string="Type computation mode"),
         'remind_update_delay': fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
-        'last_update' : fields.date('Last Update',
+        'last_update': fields.date('Last Update',
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
 
         'type_description': fields.related('type_id', 'description',
@@ -219,9 +219,6 @@ class gamification_goal(osv.Model):
             if goal.state in ('draft', 'canceled'):
                 # skip if goal draft or canceled
                 continue
-            if goal.last_update and goal.end_date and goal.last_update > goal.end_date:
-                # skip if a goal is finished (updated after the goal end date)
-                continue
 
             if goal.type_id.computation_mode == 'manually':
                 towrite = {'current': goal.current}
@@ -276,7 +273,6 @@ class gamification_goal(osv.Model):
             # check goal failure
             elif goal.end_date and fields.date.today() > goal.end_date:
                 towrite['state'] = 'failed'
-
             self.write(cr, uid, [goal.id], towrite, context=context)
         return True
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index a4c7b28e5a0..8e1602b327a 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -6,7 +6,7 @@
         <record id="goal_list_action" model="ir.actions.act_window">
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
-            <field name="view_mode">tree,form,calendar,kanban</field>
+            <field name="view_mode">tree,form,kanban</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal. 
@@ -93,19 +93,6 @@
             </field>
         </record>
 
-        <record id="goal_calendar_view" model="ir.ui.view">
-            <field name="name">Goal Calendar</field>
-            <field name="model">gamification.goal</field>
-            <field name="arch" type="xml">
-                <calendar string="Goal"
-                        date_start="start_date"
-                        date_stop="end_date"
-                        color="type_id">
-                    <field name="type_id"/>
-                </calendar>
-            </field>
-        </record>
-
         <record id="goal_search_view" model="ir.ui.view">
             <field name="name">Goal Search</field>
             <field name="model">gamification.goal</field>
@@ -114,7 +101,12 @@
                     <filter name="my" string="My Goals" domain="[('user_id', '=', uid)]"/>
                     <separator/>
                     <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
-                    <filter name="inprogress" string="In Progress" domain="[('state', 'in', ('inprogress', 'inprogress_update'))]"/>
+                    <filter name="inprogress" string="Opened"
+                        domain="[
+                            '|',
+                            ('state', 'in', ('inprogress', 'inprogress_update')),
+                            ('end_date', '>=', context_today().strftime('%%Y-%%m-%%d'))
+                            ]"/>
                     <filter name="closed" string="Closed" domain="[('state', 'in', ('reached', 'failed'))]"/>
                     <separator/>
 
@@ -147,12 +139,13 @@
                     <field name="type_ponctual"/>
                     <field name="start_date"/>
                     <field name="end_date"/>
+                    <field name="last_update"/>
                     <templates>
                         <t t-name="kanban-tooltip">
                            <field name="type_description"/>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_card oe_gamification_goal oe_kanban_goal">
+                            <div t-attf-class="oe_kanban_card oe_gamification_goal oe_kanban_goal #{record.end_date.raw_value &lt; record.last_update.raw_value &amp; record.state.raw_value == 'failed' ? 'oe_kanban_color_2' : ''} #{record.end_date.raw_value &lt; record.last_update.raw_value &amp; record.state.raw_value == 'reached' ? 'oe_kanban_color_5' : ''}">
                                 <div class="oe_kanban_content">
                                     <p><h4 class="oe_goal_name" tooltip="kanban-tooltip"><field name="type_id" /></h4></p>
                                     <div class="oe_kanban_left">
@@ -184,7 +177,7 @@
                                             From <t t-esc="record.start_date.value" />
                                         </t>
                                         <t t-if="record.end_date.value">
-                                            To <t t-esc="record.start_date.value" />
+                                            To <t t-esc="record.end_date.value" />
                                         </t>
                                     </p>
                                 </div>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index dc46b02afda..862573f6c5a 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -205,7 +205,7 @@ class gamification_goal_plan(osv.Model):
         Start planned plans (in draft and with start_date = today)
         Create the goals for planlines not linked to goals (eg: modified the
             plan to add planlines)
-        Update every goal running
+        Update every plan running
         """
         if not context: context = {}
 
@@ -218,18 +218,6 @@ class gamification_goal_plan(osv.Model):
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')])
 
-        goal_obj = self.pool.get('gamification.goal')
-        # we use yesterday to update the goals that just ended
-        yesterday = date.today() - timedelta(days=1)
-        goal_ids = goal_obj.search(cr, uid, [
-            '&',
-                ('state', 'not in', ('draft', 'canceled')),
-                '|',
-                    ('end_date', '>=', yesterday.isoformat()),
-                    ('end_date', '=', False)
-        ], context=context)
-        goal_obj.update(cr, uid, goal_ids, context=context)
-
         return self._update_all(cr, uid, ids, context=context)
 
     def _update_all(self, cr, uid, ids, context=None):
@@ -240,6 +228,21 @@ class gamification_goal_plan(osv.Model):
         if not context: context = {}
         goal_obj = self.pool.get('gamification.goal')
 
+        # we use yesterday to update the goals that just ended
+        yesterday = date.today() - timedelta(days=1)
+        goal_ids = goal_obj.search(cr, uid, [
+            ('plan_id', 'in', ids),
+            '|',
+                ('state', 'in', ('inprogress', 'inprogress_update')),
+                '&',
+                    ('state', 'in', ('reached', 'failed')),
+                    '|',
+                        ('end_date', '>=', yesterday.isoformat()),
+                        ('end_date', '=', False)
+        ], context=context)
+        # update every running goal already generated linked to selected plans
+        goal_obj.update(cr, uid, goal_ids, context=context)
+
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
                 self.plan_subscribe_users(cr, uid, [plan.id], [user.id for user in plan.autojoin_group_id.users], context=context)
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index dc8273e6f69..90baa758808 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -53,6 +53,7 @@
     color: orange;
 }
 
+
 /* Mail Sidebar */
 
 .openerp .oe_mail_wall .oe_mail_wall_aside {

From d5c4f14a1a5baf6edd794d1fcba57b258f525935 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 15:36:06 +0200
Subject: [PATCH 275/547] [IMP] badge to employee actions

bzr revid: mat@openerp.com-20130412133606-60kb4s026vfsrija
---
 addons/gamification/badge_view.xml    | 14 +++++++++-----
 addons/hr_gamification/__openerp__.py |  1 +
 addons/hr_gamification/badge.py       | 18 ++++++++++++++++++
 addons/hr_gamification/badge_view.xml | 11 ++++++++++-
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 3d89bc752c2..9f3c113f53f 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -67,10 +67,12 @@
             <field name="arch" type="xml">
                 <form string="Badge" version="7.0">
                     <header>
-                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [('remaining_sending','!=',0)]}" />
+                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [('remaining_sending','=',0)]}" />
                         <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
                     </header>
                     <sheet>
+                        <div class="oe_right oe_button_box">
+                        </div>
                         <field name="image" widget='image' class="oe_left oe_avatar"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
@@ -148,7 +150,7 @@
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="110" height="110" /></a>
                                     </div>
                                     <div>
-                                        <h4><a type="open"><field name="name"/></a></h4>
+                                        <h4><field name="name"/></h4>
                                         <t t-if="record.description.value">
                                             <em><field name="description"/></em>
                                         </t>
@@ -171,9 +173,11 @@
                                         </t>
                                     </div>
                                     <div class="oe_kanban_badge_avatars">
-                                        <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
-                                            <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
-                                        </t>
+                                        <a type="object" name="get_granted_employees">
+                                            <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
+                                                <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
+                                            </t>
+                                        </a>
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index 7453d1e2d51..c28a43fd32a 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -30,4 +30,5 @@ This allow the user to send badges to employees instead of simple users.
 Badge received are displayed on the user profile.""",
     'data': ['badge_view.xml'],
     'auto_install': True,
+    'js': ['static/src/js/badges.js'],
 }
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/badge.py
index 28734699307..e4ccac1cb75 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/badge.py
@@ -61,6 +61,24 @@ class gamification_badge(osv.Model):
                     badge_user.employee_id.id, context=context, **kwargs)
         return super(gamification_badge, self).message_post(cr, uid, thread_id, context=context, **kwargs)
 
+    def get_granted_employees(self, cr, uid, badge_ids, context=None):
+        if context is None:
+            context = {}
+
+        employee_ids = []
+        badge_user_ids = self.pool.get('gamification.badge.user').search(cr, uid, [('badge_id', 'in', badge_ids), ('employee_id', '!=', False)], context=context)
+        for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context):
+            employee_ids.append(badge_user.employee_id.id)
+        # remove duplicates
+        employee_ids = list(set(employee_ids))
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Granted Employees',
+            'view_mode': 'kanban,tree,form',
+            'view_type': 'form',
+            'res_model': 'hr.employee',
+            'domain': [('id', 'in', employee_ids)]
+        }
 
 class hr_grant_badge_wizard(osv.TransientModel):
     _name = 'gamification.badge.user.wizard'
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index 1f47bd74d6f..f8e9e550883 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -53,7 +53,16 @@
             view_type="form" view_mode="form"
             view_id="gamification.view_badge_wizard_reward"/>
 
-
+        <record id="hr_badge_form_view" model="ir.ui.view">
+            <field name="name">Badge Form</field>
+            <field name="model">gamification.badge</field>
+            <field name="inherit_id" ref="gamification.badge_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@class='oe_right oe_button_box']" position="inside">
+                    <button string="Granted Employees" type="object" name="get_granted_employees" attrs="{'invisible': [('stat_count','=',0)]}" />
+                </xpath>
+            </field>
+        </record>
 
         <!-- HR Employee -->
 

From ef8ab87cff223bd09fd476fdb3ef9469a3fee986 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 15:52:33 +0200
Subject: [PATCH 276/547] [IMP] better UI

bzr revid: mat@openerp.com-20130412135233-wek9hcbnufost0tf
---
 addons/gamification/badge_view.xml    | 2 +-
 addons/gamification/goal_view.xml     | 8 ++++----
 addons/hr_gamification/badge_view.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 9f3c113f53f..9b615963bb9 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -29,7 +29,7 @@
                     <group>
                         <field name="user_id" nolabel="1" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 8e1602b327a..b79dae4a41b 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -101,13 +101,13 @@
                     <filter name="my" string="My Goals" domain="[('user_id', '=', uid)]"/>
                     <separator/>
                     <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
-                    <filter name="inprogress" string="Opened"
+                    <filter name="inprogress" string="Current"
                         domain="[
                             '|',
-                            ('state', 'in', ('inprogress', 'inprogress_update')),
-                            ('end_date', '>=', context_today().strftime('%%Y-%%m-%%d'))
+                                ('state', 'in', ('inprogress', 'inprogress_update')),
+                                ('end_date', '>=', context_today().strftime('%%Y-%%m-%%d'))
                             ]"/>
-                    <filter name="closed" string="Closed" domain="[('state', 'in', ('reached', 'failed'))]"/>
+                    <filter name="closed" string="Passed" domain="[('state', 'in', ('reached', 'failed'))]"/>
                     <separator/>
 
                     <field name="user_id"/>
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index f8e9e550883..df1d03b5fca 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -13,7 +13,7 @@
                     <group>
                         <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False)]" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -35,7 +35,7 @@
                     <group>
                         <field name="employee_id" invisible="1" />
                         <field name="badge_id" nolabel="1" colspan="4" />
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
                     </group>
                     <footer>
                         <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or

From 8f05129bcda7de790b33b561330dcd881f5c8da2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 16:09:58 +0200
Subject: [PATCH 277/547] [IMP] display sent count instead of remaining

bzr revid: mat@openerp.com-20130412140958-nnsc7io1cs57qdq6
---
 addons/gamification/badge_view.xml          | 7 ++++---
 addons/gamification/static/src/css/goal.css | 5 ++++-
 addons/hr_gamification/badge_view.xml       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 9b615963bb9..ef0cb37c71d 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -29,7 +29,7 @@
                     <group>
                         <field name="user_id" nolabel="1" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -134,6 +134,7 @@
                     <field name="stat_count"/>
                     <field name="stat_this_month"/>
                     <field name="unique_owner_ids"/>
+                    <field name="stat_my_monthly_sending"/>
                     <field name="remaining_sending" />
                     <field name="rule_max_number" />
                     <templates>
@@ -161,10 +162,10 @@
                                             <button type="action" name="%(action_grant_wizard)d" class="oe_highlight">Grant</button>
                                             <span class="oe_grey">
                                                 <t t-if="record.remaining_sending.value != -1">
-                                                    <t t-esc="record.remaining_sending.value"/>/<t t-esc="record.rule_max_number.value"/>
+                                                    <t t-esc="record.stat_my_monthly_sending.value"/>/<t t-esc="record.rule_max_number.value"/>
                                                 </t>
                                                 <t t-if="record.remaining_sending.value == -1">
-                                                    ∞
+                                                    <t t-esc="record.stat_my_monthly_sending.value"/>/∞
                                                 </t>
                                             </span>
                                         </t>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 90baa758808..c231f9447c1 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -52,7 +52,10 @@
 .openerp .oe_orange {
     color: orange;
 }
-
+/* compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell */
+.openerp .oe_form td .oe_no_padding {
+    margin-left: -6px;
+}
 
 /* Mail Sidebar */
 
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index df1d03b5fca..fac64711591 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -13,7 +13,7 @@
                     <group>
                         <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False)]" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding"/>
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or

From b18bc579197837ddcc97d9f7292d8cec3bc05d49 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 17:21:50 +0200
Subject: [PATCH 278/547] [ADD] use sparklines

bzr revid: mat@openerp.com-20130412152150-8679huigt6cfmool
---
 addons/gamification/__openerp__.py            |  1 +
 addons/gamification/plan.py                   |  2 +-
 addons/gamification/res_users.py              |  3 ++
 addons/gamification/static/src/css/goal.css   |  9 ++--
 .../static/src/js/gamification.js             | 15 +++++--
 .../src/js/jquery.sparkline.2.1.1.min.js      |  5 +++
 .../static/src/xml/gamification.xml           | 45 ++++++++++---------
 .../hr_gamification/static/src/js/badges.js   | 25 +++++++++++
 8 files changed, 75 insertions(+), 30 deletions(-)
 create mode 100644 addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js
 create mode 100644 addons/hr_gamification/static/src/js/badges.js

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 5946e81224f..e966d9f3bad 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -57,6 +57,7 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
     'js': [
         'static/src/js/gamification.js',
         'static/src/js/justgage.js',
+        'static/src/js/jquery.sparkline.2.1.1.min.js',
     ],
     'qweb': ['static/src/xml/gamification.xml'],
 }
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 862573f6c5a..684e005599f 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -428,7 +428,7 @@ class gamification_goal_plan(osv.Model):
 
             # most complete first, current if same percentage (eg: if several 100%)
             sorted_board = enumerate(sorted(board_goals, key=lambda k: (k.completeness, k.current), reverse=True))
-            planlines_boards.append({'goal_type': planline.type_id, 'board_goals': sorted_board})
+            planlines_boards.append({'goal_type': planline.type_id, 'board_goals': sorted_board, 'target_goal': planline.target_goal})
         return planlines_boards
 
     def get_indivual_goal_info(self, cr, uid, user_id, plan, subset_goal_ids=False, context=None):
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 0fd2e5ce2e1..ace2a5bd451 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -58,6 +58,8 @@ class res_users_gamification_group(osv.Model):
                             'type_monetary': planline_board['goal_type'].monetary,
                             'type_unit': planline_board['goal_type'].unit,
                             'type_action': True if planline_board['goal_type'].action_id else False,
+                            'type_ponctual': planline_board['goal_type'].ponctual,
+                            'target_goal': planline_board['target_goal'],
                             'goals': []}
                     for goal in planline_board['board_goals']:
                         vals['goals'].append({
@@ -90,6 +92,7 @@ class res_users_gamification_group(osv.Model):
                         'type_monetary': goal.type_id.monetary,
                         'type_unit': goal.type_id.unit,
                         'type_action': True if goal.type_id.action_id else False,
+                        'type_ponctual': goal.type_id.ponctual,
                         'state': goal.state,
                         'completeness': goal.completeness,
                         'computation_mode': goal.computation_mode,
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index c231f9447c1..e081b666bc3 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -74,14 +74,14 @@
     border: solid 1px rgba(0,0,0,0.03);
 }
 
-.openerp .oe_gamification_goal .oe_goal_reached:before {
+/*.openerp .oe_gamification_goal .oe_goal_reached:before {
     content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=);
     margin-left:-20px;
 }
 .openerp .oe_gamification_goal .oe_goal_failed:before {
     content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC);
     margin-left:-20px;
-}
+}*/
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached,
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed {
     text-decoration: line-through;
@@ -105,9 +105,8 @@
     vertical-align: center;
     border: none;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 25%; }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 20%; }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td.col3 { width: 45%; }
+.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 40%; }
+.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 50%; }
 /* ... and 10% left for ranking */
 
 .openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index a856d057172..aafdcbf8659 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -64,6 +64,7 @@ openerp.gamification = function(instance) {
                     self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
                     self.render_money_fields(self.goals_info.info[0].currency);
                     self.render_progress_bars();
+                    self.render_piechars();
                 }
             });
         },
@@ -72,7 +73,7 @@ openerp.gamification = function(instance) {
 
             self.dfm = new instance.web.form.DefaultFieldManager(self);
             // Generate a FieldMonetary for each .oe_goal_field_monetary
-            self.$el.find(".oe_goal_field_monetary").each(function() {
+            self.$(".oe_goal_field_monetary").each(function() {
                 money_field = new instance.web.form.FieldMonetary(self.dfm, {
                     attrs: {
                         modifiers: '{"readonly": true}'
@@ -89,7 +90,7 @@ openerp.gamification = function(instance) {
 
             dfm = new instance.web.form.DefaultFieldManager(self);
             // Generate a FieldMonetary for each .oe_goal_field_monetary
-            self.$el.find(".oe_goal_progress").each(function() {
+            self.$(".oe_goal_progress").each(function() {
                 progress_field = new instance.web.form.FieldProgressBar(dfm, {
                     attrs: {
                         modifiers: '{"readonly": true}'
@@ -98,6 +99,14 @@ openerp.gamification = function(instance) {
                 progress_field.set('value', $(this).attr('value'));
                 progress_field.replace($(this));
             });
+        },
+        render_piechars: function() {
+            var self = this;
+            self.$(".oe_goal_sparkline_piechart").each(function() {
+                var completeness = parseInt( $(this).attr('data-completeness'), 10);
+                var values = [completeness, 100-completeness];
+                $(this).sparkline(values, {type: 'pie', offset: 180, sliceColors: ['#01922D','#ff0000']});
+            });
         }
     });
 
@@ -143,8 +152,8 @@ openerp.gamification = function(instance) {
                         // },
                         label: self.record.type_suffix.raw_value,
                         levelColors: [
-                            "#f9c802",
                             "#ff0000",
+                            "#f9c802",
                             "#a9d70b"
                         ],
                     });
diff --git a/addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js b/addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js
new file mode 100644
index 00000000000..74187063f45
--- /dev/null
+++ b/addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js
@@ -0,0 +1,5 @@
+/* jquery.sparkline 2.1.1 - http://omnipotent.net/jquery.sparkline/ 
+** Licensed under the New BSD License - see above site for details */
+
+(function(a){typeof define=="function"&&define.amd?define(["jquery"],a):a(jQuery)})(function(a){"use strict";var b={},c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I=0;c=function(){return{common:{type:"line",lineColor:"#00f",fillColor:"#cdf",defaultPixelsPerValue:3,width:"auto",height:"auto",composite:!1,tagValuesAttribute:"values",tagOptionsPrefix:"spark",enableTagOptions:!1,enableHighlight:!0,highlightLighten:1.4,tooltipSkipNull:!0,tooltipPrefix:"",tooltipSuffix:"",disableHiddenCheck:!1,numberFormatter:!1,numberDigitGroupCount:3,numberDigitGroupSep:",",numberDecimalMark:".",disableTooltips:!1,disableInteraction:!1},line:{spotColor:"#f80",highlightSpotColor:"#5f5",highlightLineColor:"#f22",spotRadius:1.5,minSpotColor:"#f80",maxSpotColor:"#f80",lineWidth:1,normalRangeMin:undefined,normalRangeMax:undefined,normalRangeColor:"#ccc",drawNormalOnTop:!1,chartRangeMin:undefined,chartRangeMax:undefined,chartRangeMinX:undefined,chartRangeMaxX:undefined,tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')},bar:{barColor:"#3366cc",negBarColor:"#f44",stackedBarColor:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],zeroColor:undefined,nullColor:undefined,zeroAxis:!0,barWidth:4,barSpacing:1,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:!1,colorMap:undefined,tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')},tristate:{barWidth:4,barSpacing:1,posBarColor:"#6f6",negBarColor:"#f44",zeroBarColor:"#999",colorMap:{},tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),tooltipValueLookups:{map:{"-1":"Loss",0:"Draw",1:"Win"}}},discrete:{lineHeight:"auto",thresholdColor:undefined,thresholdValue:0,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:!1,tooltipFormat:new e("{{prefix}}{{value}}{{suffix}}")},bullet:{targetColor:"#f33",targetWidth:3,performanceColor:"#33f",rangeColors:["#d3dafe","#a8b6ff","#7f94ff"],base:undefined,tooltipFormat:new e("{{fieldkey:fields}} - {{value}}"),tooltipValueLookups:{fields:{r:"Range",p:"Performance",t:"Target"}}},pie:{offset:0,sliceColors:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],borderWidth:0,borderColor:"#000",tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')},box:{raw:!1,boxLineColor:"#000",boxFillColor:"#cdf",whiskerColor:"#000",outlierLineColor:"#333",outlierFillColor:"#fff",medianColor:"#f00",showOutliers:!0,outlierIQR:1.5,spotRadius:1.5,target:undefined,targetColor:"#4a2",chartRangeMax:undefined,chartRangeMin:undefined,tooltipFormat:new e("{{field:fields}}: {{value}}"),tooltipFormatFieldlistKey:"field",tooltipValueLookups:{fields:{lq:"Lower Quartile",med:"Median",uq:"Upper Quartile",lo:"Left Outlier",ro:"Right Outlier",lw:"Left Whisker",rw:"Right Whisker"}}}}},B='.jqstooltip { position: absolute;left: 0px;top: 0px;visibility: hidden;background: rgb(0, 0, 0) transparent;background-color: rgba(0,0,0,0.6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";color: white;font: 10px arial, san serif;text-align: left;white-space: nowrap;padding: 5px;border: 1px solid white;z-index: 10000;}.jqsfield { color: white;font: 10px arial, san serif;text-align: left;}',d=function(){var b,c;return b=function(){this.init.apply(this,arguments)},arguments.length>1?(arguments[0]?(b.prototype=a.extend(new arguments[0],arguments[arguments.length-1]),b._super=arguments[0].prototype):b.prototype=arguments[arguments.length-1],arguments.length>2&&(c=Array.prototype.slice.call(arguments,1,-1),c.unshift(b.prototype),a.extend.apply(a,c))):b.prototype=arguments[0],b.prototype.cls=b,b},a.SPFormatClass=e=d({fre:/\{\{([\w.]+?)(:(.+?))?\}\}/g,precre:/(\w+)\.(\d+)/,init:function(a,b){this.format=a,this.fclass=b},render:function(a,b,c){var d=this,e=a,f,g,h,i,j;return this.format.replace(this.fre,function(){var a;return g=arguments[1],h=arguments[3],f=d.precre.exec(g),f?(j=f[2],g=f[1]):j=!1,i=e[g],i===undefined?"":h&&b&&b[h]?(a=b[h],a.get?b[h].get(i)||i:b[h][i]||i):(k(i)&&(c.get("numberFormatter")?i=c.get("numberFormatter")(i):i=p(i,j,c.get("numberDigitGroupCount"),c.get("numberDigitGroupSep"),c.get("numberDecimalMark"))),i)})}}),a.spformat=function(a,b){return new e(a,b)},f=function(a,b,c){return a<b?b:a>c?c:a},g=function(a,b){var c;return b===2?(c=Math.floor(a.length/2),a.length%2?a[c]:(a[c-1]+a[c])/2):a.length%2?(c=(a.length*b+b)/4,c%1?(a[Math.floor(c)]+a[Math.floor(c)-1])/2:a[c-1]):(c=(a.length*b+2)/4,c%1?(a[Math.floor(c)]+a[Math.floor(c)-1])/2:a[c-1])},h=function(a){var b;switch(a){case"undefined":a=undefined;break;case"null":a=null;break;case"true":a=!0;break;case"false":a=!1;break;default:b=parseFloat(a),a==b&&(a=b)}return a},i=function(a){var b,c=[];for(b=a.length;b--;)c[b]=h(a[b]);return c},j=function(a,b){var c,d,e=[];for(c=0,d=a.length;c<d;c++)a[c]!==b&&e.push(a[c]);return e},k=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},p=function(b,c,d,e,f){var g,h;b=(c===!1?parseFloat(b).toString():b.toFixed(c)).split(""),g=(g=a.inArray(".",b))<0?b.length:g,g<b.length&&(b[g]=f);for(h=g-d;h>0;h-=d)b.splice(h,0,e);return b.join("")},l=function(a,b,c){var d;for(d=b.length;d--;){if(c&&b[d]===null)continue;if(b[d]!==a)return!1}return!0},m=function(a){var b=0,c;for(c=a.length;c--;)b+=typeof a[c]=="number"?a[c]:0;return b},o=function(b){return a.isArray(b)?b:[b]},n=function(a){var b;document.createStyleSheet?document.createStyleSheet().cssText=a:(b=document.createElement("style"),b.type="text/css",document.getElementsByTagName("head")[0].appendChild(b),b[typeof document.body.style.WebkitAppearance=="string"?"innerText":"innerHTML"]=a)},a.fn.simpledraw=function(b,c,d,e){var f,g;if(d&&(f=this.data("_jqs_vcanvas")))return f;b===undefined&&(b=a(this).innerWidth()),c===undefined&&(c=a(this).innerHeight());if(a.fn.sparkline.hasCanvas)f=new F(b,c,this,e);else{if(!a.fn.sparkline.hasVML)return!1;f=new G(b,c,this)}return g=a(this).data("_jqs_mhandler"),g&&g.registerCanvas(f),f},a.fn.cleardraw=function(){var a=this.data("_jqs_vcanvas");a&&a.reset()},a.RangeMapClass=q=d({init:function(a){var b,c,d=[];for(b in a)a.hasOwnProperty(b)&&typeof b=="string"&&b.indexOf(":")>-1&&(c=b.split(":"),c[0]=c[0].length===0?-Infinity:parseFloat(c[0]),c[1]=c[1].length===0?Infinity:parseFloat(c[1]),c[2]=a[b],d.push(c));this.map=a,this.rangelist=d||!1},get:function(a){var b=this.rangelist,c,d,e;if((e=this.map[a])!==undefined)return e;if(b)for(c=b.length;c--;){d=b[c];if(d[0]<=a&&d[1]>=a)return d[2]}return undefined}}),a.range_map=function(a){return new q(a)},r=d({init:function(b,c){var d=a(b);this.$el=d,this.options=c,this.currentPageX=0,this.currentPageY=0,this.el=b,this.splist=[],this.tooltip=null,this.over=!1,this.displayTooltips=!c.get("disableTooltips"),this.highlightEnabled=!c.get("disableHighlight")},registerSparkline:function(a){this.splist.push(a),this.over&&this.updateDisplay()},registerCanvas:function(b){var c=a(b.canvas);this.canvas=b,this.$canvas=c,c.mouseenter(a.proxy(this.mouseenter,this)),c.mouseleave(a.proxy(this.mouseleave,this)),c.click(a.proxy(this.mouseclick,this))},reset:function(a){this.splist=[],this.tooltip&&a&&(this.tooltip.remove(),this.tooltip=undefined)},mouseclick:function(b){var c=a.Event("sparklineClick");c.originalEvent=b,c.sparklines=this.splist,this.$el.trigger(c)},mouseenter:function(b){a(document.body).unbind("mousemove.jqs"),a(document.body).bind("mousemove.jqs",a.proxy(this.mousemove,this)),this.over=!0,this.currentPageX=b.pageX,this.currentPageY=b.pageY,this.currentEl=b.target,!this.tooltip&&this.displayTooltips&&(this.tooltip=new s(this.options),this.tooltip.updatePosition(b.pageX,b.pageY)),this.updateDisplay()},mouseleave:function(){a(document.body).unbind("mousemove.jqs");var b=this.splist,c=b.length,d=!1,e,f;this.over=!1,this.currentEl=null,this.tooltip&&(this.tooltip.remove(),this.tooltip=null);for(f=0;f<c;f++)e=b[f],e.clearRegionHighlight()&&(d=!0);d&&this.canvas.render()},mousemove:function(a){this.currentPageX=a.pageX,this.currentPageY=a.pageY,this.currentEl=a.target,this.tooltip&&this.tooltip.updatePosition(a.pageX,a.pageY),this.updateDisplay()},updateDisplay:function(){var b=this.splist,c=b.length,d=!1,e=this.$canvas.offset(),f=this.currentPageX-e.left,g=this.currentPageY-e.top,h,i,j,k,l;if(!this.over)return;for(j=0;j<c;j++)i=b[j],k=i.setRegionHighlight(this.currentEl,f,g),k&&(d=!0);if(d){l=a.Event("sparklineRegionChange"),l.sparklines=this.splist,this.$el.trigger(l);if(this.tooltip){h="";for(j=0;j<c;j++)i=b[j],h+=i.getCurrentRegionTooltip();this.tooltip.setContent(h)}this.disableHighlight||this.canvas.render()}k===null&&this.mouseleave()}}),s=d({sizeStyle:"position: static !important;display: block !important;visibility: hidden !important;float: left !important;",init:function(b){var c=b.get("tooltipClassname","jqstooltip"),d=this.sizeStyle,e;this.container=b.get("tooltipContainer")||document.body,this.tooltipOffsetX=b.get("tooltipOffsetX",10),this.tooltipOffsetY=b.get("tooltipOffsetY",12),a("#jqssizetip").remove(),a("#jqstooltip").remove(),this.sizetip=a("<div/>",{id:"jqssizetip",style:d,"class":c}),this.tooltip=a("<div/>",{id:"jqstooltip","class":c}).appendTo(this.container),e=this.tooltip.offset(),this.offsetLeft=e.left,this.offsetTop=e.top,this.hidden=!0,a(window).unbind("resize.jqs scroll.jqs"),a(window).bind("resize.jqs scroll.jqs",a.proxy(this.updateWindowDims,this)),this.updateWindowDims()},updateWindowDims:function(){this.scrollTop=a(window).scrollTop(),this.scrollLeft=a(window).scrollLeft(),this.scrollRight=this.scrollLeft+a(window).width(),this.updatePosition()},getSize:function(a){this.sizetip.html(a).appendTo(this.container),this.width=this.sizetip.width()+1,this.height=this.sizetip.height(),this.sizetip.remove()},setContent:function(a){if(!a){this.tooltip.css("visibility","hidden"),this.hidden=!0;return}this.getSize(a),this.tooltip.html(a).css({width:this.width,height:this.height,visibility:"visible"}),this.hidden&&(this.hidden=!1,this.updatePosition())},updatePosition:function(a,b){if(a===undefined){if(this.mousex===undefined)return;a=this.mousex-this.offsetLeft,b=this.mousey-this.offsetTop}else this.mousex=a-=this.offsetLeft,this.mousey=b-=this.offsetTop;if(!this.height||!this.width||this.hidden)return;b-=this.height+this.tooltipOffsetY,a+=this.tooltipOffsetX,b<this.scrollTop&&(b=this.scrollTop),a<this.scrollLeft?a=this.scrollLeft:a+this.width>this.scrollRight&&(a=this.scrollRight-this.width),this.tooltip.css({left:a,top:b})},remove:function(){this.tooltip.remove(),this.sizetip.remove(),this.sizetip=this.tooltip=undefined,a(window).unbind("resize.jqs scroll.jqs")}}),C=function(){n(B)},a(C),H=[],a.fn.sparkline=function(b,c){return this.each(function(){var d=new a.fn.sparkline.options(this,c),e=a(this),f,g;f=function(){var c,f,g,h,i,j,k;if(b==="html"||b===undefined){k=this.getAttribute(d.get("tagValuesAttribute"));if(k===undefined||k===null)k=e.html();c=k.replace(/(^\s*<!--)|(-->\s*$)|\s+/g,"").split(",")}else c=b;f=d.get("width")==="auto"?c.length*d.get("defaultPixelsPerValue"):d.get("width");if(d.get("height")==="auto"){if(!d.get("composite")||!a.data(this,"_jqs_vcanvas"))h=document.createElement("span"),h.innerHTML="a",e.html(h),g=a(h).innerHeight()||a(h).height(),a(h).remove(),h=null}else g=d.get("height");d.get("disableInteraction")?i=!1:(i=a.data(this,"_jqs_mhandler"),i?d.get("composite")||i.reset():(i=new r(this,d),a.data(this,"_jqs_mhandler",i)));if(d.get("composite")&&!a.data(this,"_jqs_vcanvas")){a.data(this,"_jqs_errnotify")||(alert("Attempted to attach a composite sparkline to an element with no existing sparkline"),a.data(this,"_jqs_errnotify",!0));return}j=new(a.fn.sparkline[d.get("type")])(this,c,d,f,g),j.render(),i&&i.registerSparkline(j)};if(a(this).html()&&!d.get("disableHiddenCheck")&&a(this).is(":hidden")||a.fn.jquery<"1.3.0"&&a(this).parents().is(":hidden")||!a(this).parents("body").length){if(!d.get("composite")&&a.data(this,"_jqs_pending"))for(g=H.length;g;g--)H[g-1][0]==this&&H.splice(g-1,1);H.push([this,f]),a.data(this,"_jqs_pending",!0)}else f.call(this)})},a.fn.sparkline.defaults=c(),a.sparkline_display_visible=function(){var b,c,d,e=[];for(c=0,d=H.length;c<d;c++)b=H[c][0],a(b).is(":visible")&&!a(b).parents().is(":hidden")?(H[c][1].call(b),a.data(H[c][0],"_jqs_pending",!1),e.push(c)):!a(b).closest("html").length&&!a.data(b,"_jqs_pending")&&(a.data(H[c][0],"_jqs_pending",!1),e.push(c));for(c=e.length;c;c--)H.splice(e[c-1],1)},a.fn.sparkline.options=d({init:function(c,d){var e,f,g,h;this.userOptions=d=d||{},this.tag=c,this.tagValCache={},f=a.fn.sparkline.defaults,g=f.common,this.tagOptionsPrefix=d.enableTagOptions&&(d.tagOptionsPrefix||g.tagOptionsPrefix),h=this.getTagSetting("type"),h===b?e=f[d.type||g.type]:e=f[h],this.mergedOptions=a.extend({},g,e,d)},getTagSetting:function(a){var c=this.tagOptionsPrefix,d,e,f,g;if(c===!1||c===undefined)return b;if(this.tagValCache.hasOwnProperty(a))d=this.tagValCache.key;else{d=this.tag.getAttribute(c+a);if(d===undefined||d===null)d=b;else if(d.substr(0,1)==="["){d=d.substr(1,d.length-2).split(",");for(e=d.length;e--;)d[e]=h(d[e].replace(/(^\s*)|(\s*$)/g,""))}else if(d.substr(0,1)==="{"){f=d.substr(1,d.length-2).split(","),d={};for(e=f.length;e--;)g=f[e].split(":",2),d[g[0].replace(/(^\s*)|(\s*$)/g,"")]=h(g[1].replace(/(^\s*)|(\s*$)/g,""))}else d=h(d);this.tagValCache.key=d}return d},get:function(a,c){var d=this.getTagSetting(a),e;return d!==b?d:(e=this.mergedOptions[a])===undefined?c:e}}),a.fn.sparkline._base=d({disabled:!1,init:function(b,c,d,e,f){this.el=b,this.$el=a(b),this.values=c,this.options=d,this.width=e,this.height=f,this.currentRegion=undefined},initTarget:function(){var a=!this.options.get("disableInteraction");(this.target=this.$el.simpledraw(this.width,this.height,this.options.get("composite"),a))?(this.canvasWidth=this.target.pixelWidth,this.canvasHeight=this.target.pixelHeight):this.disabled=!0},render:function(){return this.disabled?(this.el.innerHTML="",!1):!0},getRegion:function(a,b){},setRegionHighlight:function(a,b,c){var d=this.currentRegion,e=!this.options.get("disableHighlight"),f;return b>this.canvasWidth||c>this.canvasHeight||b<0||c<0?null:(f=this.getRegion(a,b,c),d!==f?(d!==undefined&&e&&this.removeHighlight(),this.currentRegion=f,f!==undefined&&e&&this.renderHighlight(),!0):!1)},clearRegionHighlight:function(){return this.currentRegion!==undefined?(this.removeHighlight(),this.currentRegion=undefined,!0):!1},renderHighlight:function(){this.changeHighlight(!0)},removeHighlight:function(){this.changeHighlight(!1)},changeHighlight:function(a){},getCurrentRegionTooltip:function(){var b=this.options,c="",d=[],f,g,h,i,j,k,l,m,n,o,p,q,r,s;if(this.currentRegion===undefined)return"";f=this.getCurrentRegionFields(),p=b.get("tooltipFormatter");if(p)return p(this,b,f);b.get("tooltipChartTitle")&&(c+='<div class="jqs jqstitle">'+b.get("tooltipChartTitle")+"</div>\n"),g=this.options.get("tooltipFormat");if(!g)return"";a.isArray(g)||(g=[g]),a.isArray(f)||(f=[f]),l=this.options.get("tooltipFormatFieldlist"),m=this.options.get("tooltipFormatFieldlistKey");if(l&&m){n=[];for(k=f.length;k--;)o=f[k][m],(s=a.inArray(o,l))!=-1&&(n[s]=f[k]);f=n}h=g.length,r=f.length;for(k=0;k<h;k++){q=g[k],typeof q=="string"&&(q=new e(q)),i=q.fclass||"jqsfield";for(s=0;s<r;s++)if(!f[s].isNull||!b.get("tooltipSkipNull"))a.extend(f[s],{prefix:b.get("tooltipPrefix"),suffix:b.get("tooltipSuffix")}),j=q.render(f[s],b.get("tooltipValueLookups"),b),d.push('<div class="'+i+'">'+j+"</div>")}return d.length?c+d.join("\n"):""},getCurrentRegionFields:function(){},calcHighlightColor:function(a,b){var c=b.get("highlightColor"),d=b.get("highlightLighten"),e,g,h,i;if(c)return c;if(d){e=/^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(a)||/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(a);if(e){h=[],g=a.length===4?16:1;for(i=0;i<3;i++)h[i]=f(Math.round(parseInt(e[i+1],16)*g*d),0,255);return"rgb("+h.join(",")+")"}}return a}}),t={changeHighlight:function(b){var c=this.currentRegion,d=this.target,e=this.regionShapes[c],f;e&&(f=this.renderRegion(c,b),a.isArray(f)||a.isArray(e)?(d.replaceWithShapes(e,f),this.regionShapes[c]=a.map(f,function(a){return a.id})):(d.replaceWithShape(e,f),this.regionShapes[c]=f.id))},render:function(){var b=this.values,c=this.target,d=this.regionShapes,e,f,g,h;if(!this.cls._super.render.call(this))return;for(g=b.length;g--;){e=this.renderRegion(g);if(e)if(a.isArray(e)){f=[];for(h=e.length;h--;)e[h].append(),f.push(e[h].id);d[g]=f}else e.append(),d[g]=e.id;else d[g]=null}c.render()}},a.fn.sparkline.line=u=d(a.fn.sparkline._base,{type:"line",init:function(a,b,c,d,e){u._super.init.call(this,a,b,c,d,e),this.vertices=[],this.regionMap=[],this.xvalues=[],this.yvalues=[],this.yminmax=[],this.hightlightSpotId=null,this.lastShapeId=null,this.initTarget()},getRegion:function(a,b,c){var d,e=this.regionMap;for(d=e.length;d--;)if(e[d]!==null&&b>=e[d][0]&&b<=e[d][1])return e[d][2];return undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.yvalues[a]===null,x:this.xvalues[a],y:this.yvalues[a],color:this.options.get("lineColor"),fillColor:this.options.get("fillColor"),offset:a}},renderHighlight:function(){var a=this.currentRegion,b=this.target,c=this.vertices[a],d=this.options,e=d.get("spotRadius"),f=d.get("highlightSpotColor"),g=d.get("highlightLineColor"),h,i;if(!c)return;e&&f&&(h=b.drawCircle(c[0],c[1],e,undefined,f),this.highlightSpotId=h.id,b.insertAfterShape(this.lastShapeId,h)),g&&(i=b.drawLine(c[0],this.canvasTop,c[0],this.canvasTop+this.canvasHeight,g),this.highlightLineId=i.id,b.insertAfterShape(this.lastShapeId,i))},removeHighlight:function(){var a=this.target;this.highlightSpotId&&(a.removeShapeId(this.highlightSpotId),this.highlightSpotId=null),this.highlightLineId&&(a.removeShapeId(this.highlightLineId),this.highlightLineId=null)},scanValues:function(){var a=this.values,b=a.length,c=this.xvalues,d=this.yvalues,e=this.yminmax,f,g,h,i,j;for(f=0;f<b;f++)g=a[f],h=typeof a[f]=="string",i=typeof a[f]=="object"&&a[f]instanceof Array,j=h&&a[f].split(":"),h&&j.length===2?(c.push(Number(j[0])),d.push(Number(j[1])),e.push(Number(j[1]))):i?(c.push(g[0]),d.push(g[1]),e.push(g[1])):(c.push(f),a[f]===null||a[f]==="null"?d.push(null):(d.push(Number(g)),e.push(Number(g))));this.options.get("xvalues")&&(c=this.options.get("xvalues")),this.maxy=this.maxyorg=Math.max.apply(Math,e),this.miny=this.minyorg=Math.min.apply(Math,e),this.maxx=Math.max.apply(Math,c),this.minx=Math.min.apply(Math,c),this.xvalues=c,this.yvalues=d,this.yminmax=e},processRangeOptions:function(){var a=this.options,b=a.get("normalRangeMin"),c=a.get("normalRangeMax");b!==undefined&&(b<this.miny&&(this.miny=b),c>this.maxy&&(this.maxy=c)),a.get("chartRangeMin")!==undefined&&(a.get("chartRangeClip")||a.get("chartRangeMin")<this.miny)&&(this.miny=a.get("chartRangeMin")),a.get("chartRangeMax")!==undefined&&(a.get("chartRangeClip")||a.get("chartRangeMax")>this.maxy)&&(this.maxy=a.get("chartRangeMax")),a.get("chartRangeMinX")!==undefined&&(a.get("chartRangeClipX")||a.get("chartRangeMinX")<this.minx)&&(this.minx=a.get("chartRangeMinX")),a.get("chartRangeMaxX")!==undefined&&(a.get("chartRangeClipX")||a.get("chartRangeMaxX")>this.maxx)&&(this.maxx=a.get("chartRangeMaxX"))},drawNormalRange:function(a,b,c,d,e){var f=this.options.get("normalRangeMin"),g=this.options.get("normalRangeMax"),h=b+Math.round(c-c*((g-this.miny)/e)),i=Math.round(c*(g-f)/e);this.target.drawRect(a,h,d,i,undefined,this.options.get("normalRangeColor")).append()},render:function(){var b=this.options,c=this.target,d=this.canvasWidth,e=this.canvasHeight,f=this.vertices,g=b.get("spotRadius"),h=this.regionMap,i,j,k,l,m,n,o,p,r,s,t,v,w,x,y,z,A,B,C,D,E,F,G,H,I;if(!u._super.render.call(this))return;this.scanValues(),this.processRangeOptions(),G=this.xvalues,H=this.yvalues;if(!this.yminmax.length||this.yvalues.length<2)return;l=m=0,i=this.maxx-this.minx===0?1:this.maxx-this.minx,j=this.maxy-this.miny===0?1:this.maxy-this.miny,k=this.yvalues.length-1,g&&(d<g*4||e<g*4)&&(g=0);if(g){E=b.get("highlightSpotColor")&&!b.get("disableInteraction");if(E||b.get("minSpotColor")||b.get("spotColor")&&H[k]===this.miny)e-=Math.ceil(g);if(E||b.get("maxSpotColor")||b.get("spotColor")&&H[k]===this.maxy)e-=Math.ceil(g),l+=Math.ceil(g);if(E||(b.get("minSpotColor")||b.get("maxSpotColor"))&&(H[0]===this.miny||H[0]===this.maxy))m+=Math.ceil(g),d-=Math.ceil(g);if(E||b.get("spotColor")||b.get("minSpotColor")||b.get("maxSpotColor")&&(H[k]===this.miny||H[k]===this.maxy))d-=Math.ceil(g)}e--,b.get("normalRangeMin")!==undefined&&!b.get("drawNormalOnTop")&&this.drawNormalRange(m,l,e,d,j),o=[],p=[o],x=y=null,z=H.length;for(I=0;I<z;I++)r=G[I],t=G[I+1],s=H[I],v=m+Math.round((r-this.minx)*(d/i)),w=I<z-1?m+Math.round((t-this.minx)*(d/i)):d,y=v+(w-v)/2,h[I]=[x||0,y,I],x=y,s===null?I&&(H[I-1]!==null&&(o=[],p.push(o)),f.push(null)):(s<this.miny&&(s=this.miny),s>this.maxy&&(s=this.maxy),o.length||o.push([v,l+e]),n=[v,l+Math.round(e-e*((s-this.miny)/j))],o.push(n),f.push(n));A=[],B=[],C=p.length;for(I=0;I<C;I++)o=p[I],o.length&&(b.get("fillColor")&&(o.push([o[o.length-1][0],l+e]),B.push(o.slice(0)),o.pop()),o.length>2&&(o[0]=[o[0][0],o[1][1]]),A.push(o));C=B.length;for(I=0;I<C;I++)c.drawShape(B[I],b.get("fillColor"),b.get("fillColor")).append();b.get("normalRangeMin")!==undefined&&b.get("drawNormalOnTop")&&this.drawNormalRange(m,l,e,d,j),C=A.length;for(I=0;I<C;I++)c.drawShape(A[I],b.get("lineColor"),undefined,b.get("lineWidth")).append();if(g&&b.get("valueSpots")){D=b.get("valueSpots"),D.get===undefined&&(D=new q(D));for(I=0;I<z;I++)F=D.get(H[I]),F&&c.drawCircle(m+Math.round((G[I]-this.minx)*(d/i)),l+Math.round(e-e*((H[I]-this.miny)/j)),g,undefined,F).append()}g&&b.get("spotColor")&&H[k]!==null&&c.drawCircle(m+Math.round((G[G.length-1]-this.minx)*(d/i)),l+Math.round(e-e*((H[k]-this.miny)/j)),g,undefined,b.get("spotColor")).append(),this.maxy!==this.minyorg&&(g&&b.get("minSpotColor")&&(r=G[a.inArray(this.minyorg,H)],c.drawCircle(m+Math.round((r-this.minx)*(d/i)),l+Math.round(e-e*((this.minyorg-this.miny)/j)),g,undefined,b.get("minSpotColor")).append()),g&&b.get("maxSpotColor")&&(r=G[a.inArray(this.maxyorg,H)],c.drawCircle(m+Math.round((r-this.minx)*(d/i)),l+Math.round(e-e*((this.maxyorg-this.miny)/j)),g,undefined,b.get("maxSpotColor")).append())),this.lastShapeId=c.getLastShapeId(),this.canvasTop=l,c.render()}}),a.fn.sparkline.bar=v=d(a.fn.sparkline._base,t,{type:"bar",init:function(b,c,d,e,g){var k=parseInt(d.get("barWidth"),10),l=parseInt(d.get("barSpacing"),10),m=d.get("chartRangeMin"),n=d.get("chartRangeMax"),o=d.get("chartRangeClip"),p=Infinity,r=-Infinity,s,t,u,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P;v._super.init.call(this,b,c,d,e,g);for(y=0,z=c.length;y<z;y++){M=c[y],s=typeof M=="string"&&M.indexOf(":")>-1;if(s||a.isArray(M))H=!0,s&&(M=c[y]=i(M.split(":"))),M=j(M,null),t=Math.min.apply(Math,M),u=Math.max.apply(Math,M),t<p&&(p=t),u>r&&(r=u)}this.stacked=H,this.regionShapes={},this.barWidth=k,this.barSpacing=l,this.totalBarWidth=k+l,this.width=e=c.length*k+(c.length-1)*l,this.initTarget(),o&&(F=m===undefined?-Infinity:m,G=n===undefined?Infinity:n),x=[],w=H?[]:x;var Q=[],R=[];for(y=0,z=c.length;y<z;y++)if(H){I=c[y],c[y]=L=[],Q[y]=0,w[y]=R[y]=0;for(J=0,K=I.length;J<K;J++)M=L[J]=o?f(I[J],F,G):I[J],M!==null&&(M>0&&(Q[y]+=M),p<0&&r>0?M<0?R[y]+=Math.abs(M):w[y]+=M:w[y]+=Math.abs(M-(M<0?r:p)),x.push(M))}else M=o?f(c[y],F,G):c[y],M=c[y]=h(M),M!==null&&x.push(M);this.max=E=Math.max.apply(Math,x),this.min=D=Math.min.apply(Math,x),this.stackMax=r=H?Math.max.apply(Math,Q):E,this.stackMin=p=H?Math.min.apply(Math,x):D,d.get("chartRangeMin")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMin")<D)&&(D=d.get("chartRangeMin")),d.get("chartRangeMax")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMax")>E)&&(E=d.get("chartRangeMax")),this.zeroAxis=B=d.get("zeroAxis",!0),D<=0&&E>=0&&B?C=0:B==0?C=D:D>0?C=D:C=E,this.xaxisOffset=C,A=H?Math.max.apply(Math,w)+Math.max.apply(Math,R):E-D,this.canvasHeightEf=B&&D<0?this.canvasHeight-2:this.canvasHeight-1,D<C?(O=H&&E>=0?r:E,N=(O-C)/A*this.canvasHeight,N!==Math.ceil(N)&&(this.canvasHeightEf-=2,N=Math.ceil(N))):N=this.canvasHeight,this.yoffset=N,a.isArray(d.get("colorMap"))?(this.colorMapByIndex=d.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=d.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===undefined&&(this.colorMapByValue=new q(this.colorMapByValue))),this.range=A},getRegion:function(a,b,c){var d=Math.floor(b/this.totalBarWidth);return d<0||d>=this.values.length?undefined:d},getCurrentRegionFields:function(){var a=this.currentRegion,b=o(this.values[a]),c=[],d,e;for(e=b.length;e--;)d=b[e],c.push({isNull:d===null,value:d,color:this.calcColor(e,d,a),offset:a});return c},calcColor:function(b,c,d){var e=this.colorMapByIndex,f=this.colorMapByValue,g=this.options,h,i;return this.stacked?h=g.get("stackedBarColor"):h=c<0?g.get("negBarColor"):g.get("barColor"),c===0&&g.get("zeroColor")!==undefined&&(h=g.get("zeroColor")),f&&(i=f.get(c))?h=i:e&&e.length>d&&(h=e[d]),a.isArray(h)?h[b%h.length]:h},renderRegion:function(b,c){var d=this.values[b],e=this.options,f=this.xaxisOffset,g=[],h=this.range,i=this.stacked,j=this.target,k=b*this.totalBarWidth,m=this.canvasHeightEf,n=this.yoffset,o,p,q,r,s,t,u,v,w,x;d=a.isArray(d)?d:[d],u=d.length,v=d[0],r=l(null,d),x=l(f,d,!0);if(r)return e.get("nullColor")?(q=c?e.get("nullColor"):this.calcHighlightColor(e.get("nullColor"),e),o=n>0?n-1:n,j.drawRect(k,o,this.barWidth-1,0,q,q)):undefined;s=n;for(t=0;t<u;t++){v=d[t];if(i&&v===f){if(!x||w)continue;w=!0}h>0?p=Math.floor(m*(Math.abs(v-f)/h))+1:p=1,v<f||v===f&&n===0?(o=s,s+=p):(o=n-p,n-=p),q=this.calcColor(t,v,b),c&&(q=this.calcHighlightColor(q,e)),g.push(j.drawRect(k,o,this.barWidth-1,p-1,q,q))}return g.length===1?g[0]:g}}),a.fn.sparkline.tristate=w=d(a.fn.sparkline._base,t,{type:"tristate",init:function(b,c,d,e,f){var g=parseInt(d.get("barWidth"),10),h=parseInt(d.get("barSpacing"),10);w._super.init.call(this,b,c,d,e,f),this.regionShapes={},this.barWidth=g,this.barSpacing=h,this.totalBarWidth=g+h,this.values=a.map(c,Number),this.width=e=c.length*g+(c.length-1)*h,a.isArray(d.get("colorMap"))?(this.colorMapByIndex=d.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=d.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===undefined&&(this.colorMapByValue=new q(this.colorMapByValue))),this.initTarget()},getRegion:function(a,b,c){return Math.floor(b/this.totalBarWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],color:this.calcColor(this.values[a],a),offset:a}},calcColor:function(a,b){var c=this.values,d=this.options,e=this.colorMapByIndex,f=this.colorMapByValue,g,h;return f&&(h=f.get(a))?g=h:e&&e.length>b?g=e[b]:c[b]<0?g=d.get("negBarColor"):c[b]>0?g=d.get("posBarColor"):g=d.get("zeroBarColor"),g},renderRegion:function(a,b){var c=this.values,d=this.options,e=this.target,f,g,h,i,j,k;f=e.pixelHeight,h=Math.round(f/2),i=a*this.totalBarWidth,c[a]<0?(j=h,g=h-1):c[a]>0?(j=0,g=h-1):(j=h-1,g=2),k=this.calcColor(c[a],a);if(k===null)return;return b&&(k=this.calcHighlightColor(k,d)),e.drawRect(i,j,this.barWidth-1,g-1,k,k)}}),a.fn.sparkline.discrete=x=d(a.fn.sparkline._base,t,{type:"discrete",init:function(b,c,d,e,f){x._super.init.call(this,b,c,d,e,f),this.regionShapes={},this.values=c=a.map(c,Number),this.min=Math.min.apply(Math,c),this.max=Math.max.apply(Math,c),this.range=this.max-this.min,this.width=e=d.get("width")==="auto"?c.length*2:this.width,this.interval=Math.floor(e/c.length),this.itemWidth=e/c.length,d.get("chartRangeMin")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMin")<this.min)&&(this.min=d.get("chartRangeMin")),d.get("chartRangeMax")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMax")>this.max)&&(this.max=d.get("chartRangeMax")),this.initTarget(),this.target&&(this.lineHeight=d.get("lineHeight")==="auto"?Math.round(this.canvasHeight*.3):d.get("lineHeight"))},getRegion:function(a,b,c){return Math.floor(b/this.itemWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],offset:a}},renderRegion:function(a,b){var c=this.values,d=this.options,e=this.min,g=this.max,h=this.range,i=this.interval,j=this.target,k=this.canvasHeight,l=this.lineHeight,m=k-l,n,o,p,q;return o=f(c[a],e,g),q=a*i,n=Math.round(m-m*((o-e)/h)),p=d.get("thresholdColor")&&o<d.get("thresholdValue")?d.get("thresholdColor"):d.get("lineColor"),b&&(p=this.calcHighlightColor(p,d)),j.drawLine(q,n,q,n+l,p)}}),a.fn.sparkline.bullet=y=d(a.fn.sparkline._base,{type:"bullet",init:function(a,b,c,d,e){var f,g,h;y._super.init.call(this,a,b,c,d,e),this.values=b=i(b),h=b.slice(),h[0]=h[0]===null?h[2]:h[0],h[1]=b[1]===null?h[2]:h[1],f=Math.min.apply(Math,b),g=Math.max.apply(Math,b),c.get("base")===undefined?f=f<0?f:0:f=c.get("base"),this.min=f,this.max=g,this.range=g-f,this.shapes={},this.valueShapes={},this.regiondata={},this.width=d=c.get("width")==="auto"?"4.0em":d,this.target=this.$el.simpledraw(d,e,c.get("composite")),b.length||(this.disabled=!0),this.initTarget()},getRegion:function(a,b,c){var d=this.target.getShapeAt(a,b,c);return d!==undefined&&this.shapes[d]!==undefined?this.shapes[d]:undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{fieldkey:a.substr(0,1),value:this.values[a.substr(1)],region:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.valueShapes[b],d;delete this.shapes[c];switch(b.substr(0,1)){case"r":d=this.renderRange(b.substr(1),a);break;case"p":d=this.renderPerformance(a);break;case"t":d=this.renderTarget(a)}this.valueShapes[b]=d.id,this.shapes[d.id]=b,this.target.replaceWithShape(c,d)},renderRange:function(a,b){var c=this.values[a],d=Math.round(this.canvasWidth*((c-this.min)/this.range)),e=this.options.get("rangeColors")[a-2];return b&&(e=this.calcHighlightColor(e,this.options)),this.target.drawRect(0,0,d-1,this.canvasHeight-1,e,e)},renderPerformance:function(a){var b=this.values[1],c=Math.round(this.canvasWidth*((b-this.min)/this.range)),d=this.options.get("performanceColor");return a&&(d=this.calcHighlightColor(d,this.options)),this.target.drawRect(0,Math.round(this.canvasHeight*.3),c-1,Math.round(this.canvasHeight*.4)-1,d,d)},renderTarget:function(a){var b=this.values[0],c=Math.round(this.canvasWidth*((b-this.min)/this.range)-this.options.get("targetWidth")/2),d=Math.round(this.canvasHeight*.1),e=this.canvasHeight-d*2,f=this.options.get("targetColor");return a&&(f=this.calcHighlightColor(f,this.options)),this.target.drawRect(c,d,this.options.get("targetWidth")-1,e-1,f,f)},render:function(){var a=this.values.length,b=this.target,c,d;if(!y._super.render.call(this))return;for(c=2;c<a;c++)d=this.renderRange(c).append(),this.shapes[d.id]="r"+c,this.valueShapes["r"+c]=d.id;this.values[1]!==null&&(d=this.renderPerformance().append(),this.shapes[d.id]="p1",this.valueShapes.p1=d.id),this.values[0]!==null&&(d=this.renderTarget().append(),this.shapes[d.id]="t0",this.valueShapes.t0=d.id),b.render()}}),a.fn.sparkline.pie=z=d(a.fn.sparkline._base,{type:"pie",init:function(b,c,d,e,f){var g=0,h;z._super.init.call(this,b,c,d,e,f),this.shapes={},this.valueShapes={},this.values=c=a.map(c,Number),d.get("width")==="auto"&&(this.width=this.height);if(c.length>0)for(h=c.length;h--;)g+=c[h];this.total=g,this.initTarget(),this.radius=Math.floor(Math.min(this.canvasWidth,this.canvasHeight)/2)},getRegion:function(a,b,c){var d=this.target.getShapeAt(a,b,c);return d!==undefined&&this.shapes[d]!==undefined?this.shapes[d]:undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],percent:this.values[a]/this.total*100,color:this.options.get("sliceColors")[a%this.options.get("sliceColors").length],offset:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.renderSlice(b,a),d=this.valueShapes[b];delete this.shapes[d],this.target.replaceWithShape(d,c),this.valueShapes[b]=c.id,this.shapes[c.id]=b},renderSlice:function(a,b){var c=this.target,d=this.options,e=this.radius,f=d.get("borderWidth"),g=d.get("offset"),h=2*Math.PI,i=this.values,j=this.total,k=g?2*Math.PI*(g/360):0,l,m,n,o,p;o=i.length;for(n=0;n<o;n++){l=k,m=k,j>0&&(m=k+h*(i[n]/j));if(a===n)return p=d.get("sliceColors")[n%d.get("sliceColors").length],b&&(p=this.calcHighlightColor(p,d)),c.drawPieSlice(e,e,e-f,l,m,undefined,p);k=m}},render:function(){var a=this.target,b=this.values,c=this.options,d=this.radius,e=c.get("borderWidth"),f,g;if(!z._super.
+render.call(this))return;e&&a.drawCircle(d,d,Math.floor(d-e/2),c.get("borderColor"),undefined,e).append();for(g=b.length;g--;)b[g]&&(f=this.renderSlice(g).append(),this.valueShapes[g]=f.id,this.shapes[f.id]=g);a.render()}}),a.fn.sparkline.box=A=d(a.fn.sparkline._base,{type:"box",init:function(b,c,d,e,f){A._super.init.call(this,b,c,d,e,f),this.values=a.map(c,Number),this.width=d.get("width")==="auto"?"4.0em":e,this.initTarget(),this.values.length||(this.disabled=1)},getRegion:function(){return 1},getCurrentRegionFields:function(){var a=[{field:"lq",value:this.quartiles[0]},{field:"med",value:this.quartiles[1]},{field:"uq",value:this.quartiles[2]}];return this.loutlier!==undefined&&a.push({field:"lo",value:this.loutlier}),this.routlier!==undefined&&a.push({field:"ro",value:this.routlier}),this.lwhisker!==undefined&&a.push({field:"lw",value:this.lwhisker}),this.rwhisker!==undefined&&a.push({field:"rw",value:this.rwhisker}),a},render:function(){var a=this.target,b=this.values,c=b.length,d=this.options,e=this.canvasWidth,f=this.canvasHeight,h=d.get("chartRangeMin")===undefined?Math.min.apply(Math,b):d.get("chartRangeMin"),i=d.get("chartRangeMax")===undefined?Math.max.apply(Math,b):d.get("chartRangeMax"),j=0,k,l,m,n,o,p,q,r,s,t,u;if(!A._super.render.call(this))return;if(d.get("raw"))d.get("showOutliers")&&b.length>5?(l=b[0],k=b[1],n=b[2],o=b[3],p=b[4],q=b[5],r=b[6]):(k=b[0],n=b[1],o=b[2],p=b[3],q=b[4]);else{b.sort(function(a,b){return a-b}),n=g(b,1),o=g(b,2),p=g(b,3),m=p-n;if(d.get("showOutliers")){k=q=undefined;for(s=0;s<c;s++)k===undefined&&b[s]>n-m*d.get("outlierIQR")&&(k=b[s]),b[s]<p+m*d.get("outlierIQR")&&(q=b[s]);l=b[0],r=b[c-1]}else k=b[0],q=b[c-1]}this.quartiles=[n,o,p],this.lwhisker=k,this.rwhisker=q,this.loutlier=l,this.routlier=r,u=e/(i-h+1),d.get("showOutliers")&&(j=Math.ceil(d.get("spotRadius")),e-=2*Math.ceil(d.get("spotRadius")),u=e/(i-h+1),l<k&&a.drawCircle((l-h)*u+j,f/2,d.get("spotRadius"),d.get("outlierLineColor"),d.get("outlierFillColor")).append(),r>q&&a.drawCircle((r-h)*u+j,f/2,d.get("spotRadius"),d.get("outlierLineColor"),d.get("outlierFillColor")).append()),a.drawRect(Math.round((n-h)*u+j),Math.round(f*.1),Math.round((p-n)*u),Math.round(f*.8),d.get("boxLineColor"),d.get("boxFillColor")).append(),a.drawLine(Math.round((k-h)*u+j),Math.round(f/2),Math.round((n-h)*u+j),Math.round(f/2),d.get("lineColor")).append(),a.drawLine(Math.round((k-h)*u+j),Math.round(f/4),Math.round((k-h)*u+j),Math.round(f-f/4),d.get("whiskerColor")).append(),a.drawLine(Math.round((q-h)*u+j),Math.round(f/2),Math.round((p-h)*u+j),Math.round(f/2),d.get("lineColor")).append(),a.drawLine(Math.round((q-h)*u+j),Math.round(f/4),Math.round((q-h)*u+j),Math.round(f-f/4),d.get("whiskerColor")).append(),a.drawLine(Math.round((o-h)*u+j),Math.round(f*.1),Math.round((o-h)*u+j),Math.round(f*.9),d.get("medianColor")).append(),d.get("target")&&(t=Math.ceil(d.get("spotRadius")),a.drawLine(Math.round((d.get("target")-h)*u+j),Math.round(f/2-t),Math.round((d.get("target")-h)*u+j),Math.round(f/2+t),d.get("targetColor")).append(),a.drawLine(Math.round((d.get("target")-h)*u+j-t),Math.round(f/2),Math.round((d.get("target")-h)*u+j+t),Math.round(f/2),d.get("targetColor")).append()),a.render()}}),function(){document.namespaces&&!document.namespaces.v?(a.fn.sparkline.hasVML=!0,document.namespaces.add("v","urn:schemas-microsoft-com:vml","#default#VML")):a.fn.sparkline.hasVML=!1;var b=document.createElement("canvas");a.fn.sparkline.hasCanvas=!!b.getContext&&!!b.getContext("2d")}(),D=d({init:function(a,b,c,d){this.target=a,this.id=b,this.type=c,this.args=d},append:function(){return this.target.appendShape(this),this}}),E=d({_pxregex:/(\d+)(px)?\s*$/i,init:function(b,c,d){if(!b)return;this.width=b,this.height=c,this.target=d,this.lastShapeId=null,d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this)},drawLine:function(a,b,c,d,e,f){return this.drawShape([[a,b],[c,d]],e,f)},drawShape:function(a,b,c,d){return this._genShape("Shape",[a,b,c,d])},drawCircle:function(a,b,c,d,e,f){return this._genShape("Circle",[a,b,c,d,e,f])},drawPieSlice:function(a,b,c,d,e,f,g){return this._genShape("PieSlice",[a,b,c,d,e,f,g])},drawRect:function(a,b,c,d,e,f){return this._genShape("Rect",[a,b,c,d,e,f])},getElement:function(){return this.canvas},getLastShapeId:function(){return this.lastShapeId},reset:function(){alert("reset not implemented")},_insert:function(b,c){a(c).html(b)},_calculatePixelDims:function(b,c,d){var e;e=this._pxregex.exec(c),e?this.pixelHeight=e[1]:this.pixelHeight=a(d).height(),e=this._pxregex.exec(b),e?this.pixelWidth=e[1]:this.pixelWidth=a(d).width()},_genShape:function(a,b){var c=I++;return b.unshift(c),new D(this,c,a,b)},appendShape:function(a){alert("appendShape not implemented")},replaceWithShape:function(a,b){alert("replaceWithShape not implemented")},insertAfterShape:function(a,b){alert("insertAfterShape not implemented")},removeShapeId:function(a){alert("removeShapeId not implemented")},getShapeAt:function(a,b,c){alert("getShapeAt not implemented")},render:function(){alert("render not implemented")}}),F=d(E,{init:function(b,c,d,e){F._super.init.call(this,b,c,d),this.canvas=document.createElement("canvas"),d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this),a(this.canvas).css({display:"inline-block",width:b,height:c,verticalAlign:"top"}),this._insert(this.canvas,d),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,this.interact=e,this.shapes={},this.shapeseq=[],this.currentTargetShapeId=undefined,a(this.canvas).css({width:this.pixelWidth,height:this.pixelHeight})},_getContext:function(a,b,c){var d=this.canvas.getContext("2d");return a!==undefined&&(d.strokeStyle=a),d.lineWidth=c===undefined?1:c,b!==undefined&&(d.fillStyle=b),d},reset:function(){var a=this._getContext();a.clearRect(0,0,this.pixelWidth,this.pixelHeight),this.shapes={},this.shapeseq=[],this.currentTargetShapeId=undefined},_drawShape:function(a,b,c,d,e){var f=this._getContext(c,d,e),g,h;f.beginPath(),f.moveTo(b[0][0]+.5,b[0][1]+.5);for(g=1,h=b.length;g<h;g++)f.lineTo(b[g][0]+.5,b[g][1]+.5);c!==undefined&&f.stroke(),d!==undefined&&f.fill(),this.targetX!==undefined&&this.targetY!==undefined&&f.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawCircle:function(a,b,c,d,e,f,g){var h=this._getContext(e,f,g);h.beginPath(),h.arc(b,c,d,0,2*Math.PI,!1),this.targetX!==undefined&&this.targetY!==undefined&&h.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a),e!==undefined&&h.stroke(),f!==undefined&&h.fill()},_drawPieSlice:function(a,b,c,d,e,f,g,h){var i=this._getContext(g,h);i.beginPath(),i.moveTo(b,c),i.arc(b,c,d,e,f,!1),i.lineTo(b,c),i.closePath(),g!==undefined&&i.stroke(),h&&i.fill(),this.targetX!==undefined&&this.targetY!==undefined&&i.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b+d,c],[b+d,c+e],[b,c+e],[b,c]],f,g)},appendShape:function(a){return this.shapes[a.id]=a,this.shapeseq.push(a.id),this.lastShapeId=a.id,a.id},replaceWithShape:function(a,b){var c=this.shapeseq,d;this.shapes[b.id]=b;for(d=c.length;d--;)c[d]==a&&(c[d]=b.id);delete this.shapes[a]},replaceWithShapes:function(a,b){var c=this.shapeseq,d={},e,f,g;for(f=a.length;f--;)d[a[f]]=!0;for(f=c.length;f--;)e=c[f],d[e]&&(c.splice(f,1),delete this.shapes[e],g=f);for(f=b.length;f--;)c.splice(g,0,b[f].id),this.shapes[b[f].id]=b[f]},insertAfterShape:function(a,b){var c=this.shapeseq,d;for(d=c.length;d--;)if(c[d]===a){c.splice(d+1,0,b.id),this.shapes[b.id]=b;return}},removeShapeId:function(a){var b=this.shapeseq,c;for(c=b.length;c--;)if(b[c]===a){b.splice(c,1);break}delete this.shapes[a]},getShapeAt:function(a,b,c){return this.targetX=b,this.targetY=c,this.render(),this.currentTargetShapeId},render:function(){var a=this.shapeseq,b=this.shapes,c=a.length,d=this._getContext(),e,f,g;d.clearRect(0,0,this.pixelWidth,this.pixelHeight);for(g=0;g<c;g++)e=a[g],f=b[e],this["_draw"+f.type].apply(this,f.args);this.interact||(this.shapes={},this.shapeseq=[])}}),G=d(E,{init:function(b,c,d){var e;G._super.init.call(this,b,c,d),d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this),this.canvas=document.createElement("span"),a(this.canvas).css({display:"inline-block",position:"relative",overflow:"hidden",width:b,height:c,margin:"0px",padding:"0px",verticalAlign:"top"}),this._insert(this.canvas,d),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,e='<v:group coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'"'+' style="position:absolute;top:0;left:0;width:'+this.pixelWidth+"px;height="+this.pixelHeight+'px;"></v:group>',this.canvas.insertAdjacentHTML("beforeEnd",e),this.group=a(this.canvas).children()[0],this.rendered=!1,this.prerender=""},_drawShape:function(a,b,c,d,e){var f=[],g,h,i,j,k,l,m;for(m=0,l=b.length;m<l;m++)f[m]=""+b[m][0]+","+b[m][1];return g=f.splice(0,1),e=e===undefined?1:e,h=c===undefined?' stroked="false" ':' strokeWeight="'+e+'px" strokeColor="'+c+'" ',i=d===undefined?' filled="false"':' fillColor="'+d+'" filled="true" ',j=f[0]===f[f.length-1]?"x ":"",k='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+h+i+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;" '+' path="m '+g+" l "+f.join(", ")+" "+j+'e">'+" </v:shape>",k},_drawCircle:function(a,b,c,d,e,f,g){var h,i,j;return b-=d,c-=d,h=e===undefined?' stroked="false" ':' strokeWeight="'+g+'px" strokeColor="'+e+'" ',i=f===undefined?' filled="false"':' fillColor="'+f+'" filled="true" ',j='<v:oval  id="jqsshape'+a+'" '+h+i+' style="position:absolute;top:'+c+"px; left:"+b+"px; width:"+d*2+"px; height:"+d*2+'px"></v:oval>',j},_drawPieSlice:function(a,b,c,d,e,f,g,h){var i,j,k,l,m,n,o,p;if(e===f)return"";f-e===2*Math.PI&&(e=0,f=2*Math.PI),j=b+Math.round(Math.cos(e)*d),k=c+Math.round(Math.sin(e)*d),l=b+Math.round(Math.cos(f)*d),m=c+Math.round(Math.sin(f)*d);if(j===l&&k===m){if(f-e<Math.PI)return"";j=l=b+d,k=m=c}return j===l&&k===m&&f-e<Math.PI?"":(i=[b-d,c-d,b+d,c+d,j,k,l,m],n=g===undefined?' stroked="false" ':' strokeWeight="1px" strokeColor="'+g+'" ',o=h===undefined?' filled="false"':' fillColor="'+h+'" filled="true" ',p='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+n+o+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;" '+' path="m '+b+","+c+" wa "+i.join(", ")+' x e">'+" </v:shape>",p)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b,c+e],[b+d,c+e],[b+d,c],[b,c]],f,g)},reset:function(){this.group.innerHTML=""},appendShape:function(a){var b=this["_draw"+a.type].apply(this,a.args);return this.rendered?this.group.insertAdjacentHTML("beforeEnd",b):this.prerender+=b,this.lastShapeId=a.id,a.id},replaceWithShape:function(b,c){var d=a("#jqsshape"+b),e=this["_draw"+c.type].apply(this,c.args);d[0].outerHTML=e},replaceWithShapes:function(b,c){var d=a("#jqsshape"+b[0]),e="",f=c.length,g;for(g=0;g<f;g++)e+=this["_draw"+c[g].type].apply(this,c[g].args);d[0].outerHTML=e;for(g=1;g<b.length;g++)a("#jqsshape"+b[g]).remove()},insertAfterShape:function(b,c){var d=a("#jqsshape"+b),e=this["_draw"+c.type].apply(this,c.args);d[0].insertAdjacentHTML("afterEnd",e)},removeShapeId:function(b){var c=a("#jqsshape"+b);this.group.removeChild(c[0])},getShapeAt:function(a,b,c){var d=a.id.substr(8);return d},render:function(){this.rendered||(this.group.innerHTML=this.prerender,this.rendered=!0)}})});
\ No newline at end of file
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 3a068dab045..540cd2287ac 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,29 +10,28 @@
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <span class="oe_goal_sparkline_piechart"></span>
+                    <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                     </t>
-                    <t t-if="goal.type_condition == 'higher'">
-                        <p>
-                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                        </p>
-                        <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p>
-                    </t>
-                    <t t-if="goal.type_condition == 'lower'">
-                        <p>
-                            <t t-esc="goal.current" /> (less than 
-                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                    <t t-if="!goal.type_ponctual">
+                        <t t-if="goal.type_condition == 'higher'">
+                            <p>
+                                <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                 <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            )
-                        </p>
+                            </p>
+                            <!-- <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p> -->
+                        </t>
+                        <t t-if="goal.type_condition == 'lower'">
+                            <p>
+                                <t t-esc="goal.current" /> (less than 
+                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                )
+                            </p>
+                        </t>
                     </t>
-                        <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
-                            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
-                        </a> -->
                 </li>
                 </ul>
             </t>
@@ -42,6 +41,7 @@
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
+                            (Goal: <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
                             </t>
@@ -50,19 +50,22 @@
                     <tr>
                         <th>#</th>
                         <th>Pers.</th>
-                        <th>compl.</th>
-                        <th>Current</th>
+                        <th>current</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
                         <td class="col1"><t t-esc="goal.user_name" /></td>
-                        <td class="col2"><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
+                        <td class="col2">
+                            <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
+                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                        </td>
+<!--                             <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
                         <td class="col3">
                             <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
-                        </td>
+                        </td> -->
                     </tr>
                 </tbody>
                 </table>
diff --git a/addons/hr_gamification/static/src/js/badges.js b/addons/hr_gamification/static/src/js/badges.js
new file mode 100644
index 00000000000..7506c65f144
--- /dev/null
+++ b/addons/hr_gamification/static/src/js/badges.js
@@ -0,0 +1,25 @@
+openerp.hr_gamification = function(instance) {
+    instance.web_kanban.KanbanRecord.include({
+        on_card_clicked: function() {
+            if (this.view.dataset.model === 'gamification.badge') {
+                if (this.record.stat_count.raw_value > 0) {
+                    this.$('.oe_kanban_badge_avatars a').first().click();
+                } else {
+                    return false;
+                }
+            } else if (this.view.dataset.model === 'gamification.badge.user') {
+                var action = {
+                    type: 'ir.actions.act_window',
+                    res_model: 'gamification.badge',
+                    view_mode: 'form',
+                    view_type: 'form,kanban,tree',
+                    views: [[false, 'form']],
+                    res_id: this.record.badge_id.raw_value[0]
+                };
+                this.do_action(action);
+            } else {
+                this._super.apply(this, arguments);
+            }
+        }
+    });
+};

From f8f4734cff3132b2362810d52d213221198ede6c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 17:24:51 +0200
Subject: [PATCH 279/547] [IMP] goal data are ponctual

bzr revid: mat@openerp.com-20130412152451-8rt8le5kmm5yv8hw
---
 addons/gamification/goal_base_data.xml              | 5 +++++
 addons/gamification/static/src/xml/gamification.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 6b383a59291..750ce3284c8 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -7,6 +7,7 @@
             <field name="name">Change Timezone</field>
             <field name="description">Configure your profile and specify your timezone</field>
             <field name="computation_mode">count</field>
+            <field name="ponctual">True</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_users_my')" />
@@ -17,6 +18,7 @@
             <field name="name">Change of avatar</field>
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
+            <field name="ponctual">True</field>
             <!-- problem : default avatar != False -> manually + check in write function -->
             <field name="action_id" eval="ref('base.action_res_users_my')" />
             <field name="res_id_field">id</field>
@@ -27,6 +29,7 @@
             <field name="name">Set your company data</field>
             <field name="description">Specify at least a website</field>
             <field name="computation_mode">count</field>
+            <field name="ponctual">True</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id), ('name', '!=', 'Your Company')]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
@@ -36,6 +39,7 @@
         <record model="gamification.goal.type" id="type_base_company_logo">
             <field name="name">Change your company logo</field>
             <field name="computation_mode">count</field>
+            <field name="ponctual">True</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id),('logo', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
@@ -45,6 +49,7 @@
         <record model="gamification.goal.type" id="type_base_invite">
             <field name="name">Invite new users</field>
             <field name="description">Create at least another user</field>
+            <field name="ponctual">True</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id', '!=', user_id)]</field>
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 540cd2287ac..42e95cf44df 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -46,6 +46,7 @@
                                 <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
                             </t>
                         </th>
+                        <th></th><th></th>
                     </tr>
                     <tr>
                         <th>#</th>

From 7b8b0ed4672690dd4346236ec1a42e6815193c9f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 15 Apr 2013 16:04:01 +0200
Subject: [PATCH 280/547] [IMP] adding features

bzr revid: mat@openerp.com-20130415140401-qzg3f0lz2i9b6kki
---
 addons/gamification/badge.py                  |   2 +
 addons/gamification/goal_view.xml             |   1 +
 addons/gamification/plan.py                   | 120 +++++++++++++++---
 addons/gamification/plan_view.xml             | 100 ++++++++-------
 .../static/src/xml/gamification.xml           |   3 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  31 ++++-
 6 files changed, 192 insertions(+), 65 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 7f7ddea7ce6..cfa130b792f 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -193,6 +193,8 @@ class gamification_badge(osv.Model):
             string="Automatic Rule",
             help="Can this badge be automatically rewarded",
             required=True),
+        'challenge_ids': fields.one2many('gamification.goal.plan', 'reward_id',
+            string="Granted upon completion of"),
 
         'compute_code': fields.char('Compute Code',
             help="The name of the python method that will be executed to verify if a user can receive this badge."),
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index b79dae4a41b..acd27b1a7a0 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -7,6 +7,7 @@
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
             <field name="view_mode">tree,form,kanban</field>
+            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal. 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 684e005599f..aacd2be4022 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 from templates import TemplateHelper
 
@@ -104,6 +105,7 @@ class gamification_goal_plan(osv.Model):
 
     _columns = {
         'name': fields.char('Plan Name', required=True, translate=True),
+        'description': fields.text('Description', translate=True),
         'state': fields.selection([
                 ('draft', 'Draft'),
                 ('inprogress', 'In Progress'),
@@ -113,22 +115,47 @@ class gamification_goal_plan(osv.Model):
             required=True),
         'manager_id': fields.many2one('res.users',
             string='Responsible', help="The user responsible for the plan."),
-        'start_date': fields.date('Planned Start Date', help="The day a new plan will be automatically started. The start and end dates for goals are still defined by the periodicity (eg: weekly goals run from Monday to Sunday)."),
+        'start_date': fields.date('Planned Start Date',
+            help="The day a new plan will be automatically started. If no periodicity is set, will use this date as the goal start date."),
+        'end_date': fields.date('Planned End Date',
+            help="The day a new plan will be automatically closed. If no periodicity is set, will use this date as the goal end date."),
 
-        'user_ids': fields.many2many('res.users',
+        'user_ids': fields.many2many('res.users', 'user_ids',
             string='Users',
             help="List of users to which the goal will be set"),
         'autojoin_group_id': fields.many2one('res.groups',
             string='Auto-subscription Group',
             help='Group of users whose members will automatically be added to the users'),
 
-        'planline_ids': fields.one2many('gamification.goal.planline',
-            'plan_id',
+        'subscription_action': fields.selection([
+                ('automatic', 'The user is subscribed automatically'),
+                ('approve', 'The user has to approve the challenge'),
+            ],
+            string="Subscription approval",
+            help="What happens when the user is added to a challenge (manually or automatically) ?",
+            required=True),
+        'proposed_user_ids': fields.many2many('res.users', 'proposed_user_ids',
+            string="Propose to users"),
+        'proposed_mail_group_ids': fields.many2many('mail.group', 'proposed_mail_group_ids',
+            string="Propose to mail groups"),
+        'proposed_later_user_ids': fields.many2many('res.users', 'proposed_later_user_ids',
+            string='Users to Remind',
+            help="List of users that have asked to decide later if they approve the challenge"),
+        'proposed_refused_user_ids': fields.many2many('res.users', 'refused_approval_user_ids',
+            string='Discard Request Users',
+            help="List of users that have discared the approval request"),
+        'propose_after_login': fields.integer("Propose challenge after login", help="Number of minutes"),
+
+        'planline_ids': fields.one2many('gamification.goal.planline', 'plan_id',
             string='Planline',
-            help="list of goals that will be set",
+            help="List of goals that will be set",
             required=True),
         'planline_count': fields.function(_planline_count, type='integer', string="Planlines"),
 
+        'reward_id': fields.many2one('gamification.badge', string="Reward upon completion"),
+        'reward_bests': fields.integer('Number of Best Perforers Rewared'),
+        'reward_failure': fields.boolean('Grant if not succeed'),
+
         'period': fields.selection([
                 ('once', 'Non recurring'),
                 ('daily', 'Daily'),
@@ -145,11 +172,11 @@ class gamification_goal_plan(osv.Model):
             ],
             string="Display Mode", required=True),
         'report_message_frequency': fields.selection([
-                ('never','Never'),
-                ('onchange','On change'),
-                ('daily','Daily'),
-                ('weekly','Weekly'),
-                ('monthly','Monthly'),
+                ('never', 'Never'),
+                ('onchange', 'On change'),
+                ('daily', 'Daily'),
+                ('weekly', 'Weekly'),
+                ('monthly', 'Monthly'),
                 ('yearly', 'Yearly')
             ],
             string="Report Frequency", required=True),
@@ -165,10 +192,10 @@ class gamification_goal_plan(osv.Model):
             string='Next Report Date'),
 
         'category': fields.selection([
-            ('hr', 'Human Ressources / Appraisals'),
-            ('other', 'Other'),
+                ('hr', 'Human Ressources / Engagement'),
+                ('other', 'Settings / Gamification Tools'),
             ],
-            string="Appears in", help="Only HR plans can be accessed by managers", required=True)
+            string="Appears in", help="Define the visibility of the challenge through menus", required=True),
         }
 
     _defaults = {
@@ -180,8 +207,12 @@ class gamification_goal_plan(osv.Model):
         'start_date': fields.date.today,
         'manager_id': lambda s, cr, uid, c: uid,
         'category': 'hr',
+        'subscription_action': 'automatic',
+        'reward_failure': False,
     }
 
+    _sort = 'end_date start_date name'
+
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
         context = context or {}
@@ -196,8 +227,23 @@ class gamification_goal_plan(osv.Model):
             if new_group:
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
 
+        if 'proposed_user_ids' in vals:
+            for plan in self.browse(cr, uid, ids, context=context):
+                if plan.subscription_action == 'approve':
+                    puser_ids = [puser.id for puser in plan.proposed_user_ids]
+                    ruser_ids = [ruser.id for ruser in plan.proposed_refused_user_ids if ruser.id in puser_ids]
+                    if len(ruser_ids) > 0:
+                        raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user that has refused it'))
+                    auser_ids = [auser.id for auser in plan.proposed_later_user_ids if auser.id in puser_ids]
+                    if len(auser_ids) > 0:
+                        raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user that has cast aside it'))
+                    user_ids = [user.id for user in plan.user_ids if user.id in puser_ids]
+                    if len(user_ids) > 0:
+                        raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user already assigned to it'))
+
         return write_res
 
+    ##### Update #####
 
     def _cron_update(self, cr, uid, context=None, ids=False):
         """Daily cron check.
@@ -215,6 +261,12 @@ class gamification_goal_plan(osv.Model):
             ('start_date', '<=', fields.date.today())])
         self.action_start(cr, uid, planned_plan_ids, context=context)
 
+        # close planned plans
+        planned_plan_ids = self.search(cr, uid, [
+            ('state', '=', 'inprogress'),
+            ('end_date', '>=', fields.date.today())])
+        self.action_close(cr, uid, planned_plan_ids, context=context)
+
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')])
 
@@ -273,10 +325,12 @@ class gamification_goal_plan(osv.Model):
         self.pool.get('gamification.goal').update(cr, uid, goal_ids, context=context)
         return True
 
+    ##### User actions #####
+
     def action_start(self, cr, uid, ids, context=None):
         """Start a draft goal plan
 
-        Change the state of the plan to in progress and genereate related goals
+        Change the state of the plan to in progress and generate related goals
         """
         # subscribe users if autojoin group
         for plan in self.browse(cr, uid, ids, context=context):
@@ -327,6 +381,8 @@ class gamification_goal_plan(osv.Model):
             self.report_progress(cr, uid, plan, context=context)
         return True
 
+    ##### Automatic actions #####
+
     def generate_goals_from_plan(self, cr, uid, ids, context=None):
         """Generate the list of goals linked to a plan.
 
@@ -337,6 +393,12 @@ class gamification_goal_plan(osv.Model):
         for plan in self.browse(cr, uid, ids, context):
             (start_date, end_date) = start_end_date_for_period(plan.period)
 
+            # if no periodicity, use plan dates
+            if not start_date and plan.start_date:
+                start_date = plan.start_date
+            if not end_date and plan.end_date:
+                end_date = plan.end_date
+
             for planline in plan.planline_ids:
                 for user in plan.user_ids:
 
@@ -391,9 +453,11 @@ class gamification_goal_plan(osv.Model):
             # remove duplicates
             unified_subscription = list(set(subscription))
 
-            self.write(cr, uid, ids, {'user_ids': [(4, user) for user in unified_subscription]}, context=context)
+            self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in unified_subscription]}, context=context)
         return True
 
+    ##### JS utilities #####
+
     def get_board_goal_info(self, cr, uid, plan, subset_goal_ids=False, context=None):
         """Get the list of latest goals for a plan, sorted by user ranking for each planline"""
 
@@ -478,6 +542,8 @@ class gamification_goal_plan(osv.Model):
         else:
             return values
 
+    ##### Reporting #####
+
     def report_progress(self, cr, uid, plan, context=None, users=False, subset_goal_ids=False):
         """Post report about the progress of the goals
 
@@ -537,6 +603,30 @@ class gamification_goal_plan(osv.Model):
                                                              subtype='mail.mt_comment')
         return True
 
+    ##### Suggestions #####
+
+    def accept_challenge(self, cr, uid, plan_id, user_id=None, context=None):
+        """The user accept the suggested challenge"""
+        context = context or {}
+        user_id = user_id or uid
+        self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id), 'user_id': (4, user_id)}, context=context)
+        return self.generate_goals_from_plan(cr, uid, [plan_id], context=context)
+
+    def discard_challenge(self, cr, uid, plan_id, user_id=None, context=None):
+        """The user discard the suggested challenge"""
+        context = context or {}
+        user_id = user_id or uid
+        return self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id), 'proposed_refused_user_ids': (4, user_id)}, context=context)
+
+    def postpone_challenge(self, cr, uid, plan_id, user_id=None, context=None):
+        """The user ask to be reminded later for the suggested challenge"""
+        context = context or {}
+        user_id = user_id or uid
+        return self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id), 'proposed_later_user_ids': (4, user_id)}, context=context)
+
+    def get_suggestions_info(self, cr, uid, context=None):
+        pass
+
 
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 910e837c346..f03bf689fdb 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -3,23 +3,24 @@
     <data>
 
         <record id="goal_plan_list_action" model="ir.actions.act_window">
-            <field name="name">Goal Plans</field>
+            <field name="name">Challenges</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
-                    Click to create a goal plan. 
+                    Click to create a challenge. 
                 </p>
                 <p>
                     Assign a list of goals to chosen users to evaluate them.
-                    The plan can use a period (weekly, monthly...) for automatic creation of goals.
+                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.
                     The goals are created for the specified users or member of the group.
                 </p>
             </field>
         </record>
 
         <record id="goal_plan_list_view" model="ir.ui.view">
-            <field name="name">Goal Plans List</field>
+            <field name="name">Challenges List</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <tree string="Goal types" colors="blue:state == 'draft';grey:state == 'done'">
@@ -38,14 +39,14 @@
             <field name="context">{'search_default_group_by_type': True, 'search_default_inprogress': True, 'search_default_plan_id': active_id, 'default_plan_id': active_id}</field>
             <field name="help" type="html">
               <p>
-                There is no goals associated to this plan matching your search.
-                Make sure that your plan is active and associated to at least one user.
+                There is no goals associated to this challenge matching your search.
+                Make sure that your challenge is active and assigned to at least one user.
               </p>
             </field>
         </record>
 
         <record id="goal_plan_form_view" model="ir.ui.view">
-            <field name="name">Goal Plan Form</field>
+            <field name="name">Challenge Form</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
@@ -83,38 +84,51 @@
                             <group>
                                 <field name="manager_id"/>
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="end_date" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                         </group>
                         <notebook>
-                        <page string="Goals">
-                            <field name="planline_ids" nolabel="1" colspan="4">
-                                <tree string="Planline List" version="7.0" editable="bottom" >
-                                    <field name="type_id"/>
-                                    <field name="type_condition"/>
-                                    <field name="target_goal"/>
-                                    <field name="type_full_suffix"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Advanced Options">
-                            <group string="Subscribe Users Automatically">
-                                <field name="autojoin_group_id" />
-                            </group>
-                            <group string="Notification Messages">
-                                <field name="report_message_frequency" />
-                                <field name="report_header" placeholder="e.g. The following message contains the current progress of the sale team..." attrs="{'invisible': [('report_message_frequency','=','never')]}" />
-                                <field name="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
-                            </group>
-                            <group string="Reminders for Manual Goals">
-                                <label for="remind_update_delay" />
-                                <div>
-                                    <field name="remind_update_delay" class="oe_inline"/> days
-                                </div>
-                            </group>
-                            <group string="Category" groups="base.group_no_one">
-                                <field name="category" widget="radio" />
-                            </group>
-                        </page>
+                            <page string="Goals">
+                                <field name="planline_ids" nolabel="1" colspan="4">
+                                    <tree string="Planline List" version="7.0" editable="bottom" >
+                                        <field name="type_id"/>
+                                        <field name="type_condition"/>
+                                        <field name="target_goal"/>
+                                        <field name="type_full_suffix"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Reward">
+                                <group>
+                                    <field name="reward_id"/>
+                                    <field name="reward_bests" attrs="{'invisible': [('reward_id','=', False)]}" />
+                                    <field name="reward_failure" attrs="{'invisible': [('reward_id','=', False)]}" />
+                                </group>
+                            </page>
+                            <page string="Advanced Options">
+                                <group string="Subscribe Users Automatically">
+                                    <field name="autojoin_group_id" />
+                                    <field name="subscription_action" />
+                                    <field name="proposed_user_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
+                                    <field name="proposed_mail_group_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
+                                    <field name="proposed_later_user_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
+                                    <field name="proposed_refused_user_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
+                                </group>
+                                <group string="Notification Messages">
+                                    <field name="report_message_frequency" />
+                                    <field name="report_header" placeholder="e.g. The following message contains the current progress of the sale team..." attrs="{'invisible': [('report_message_frequency','=','never')]}" />
+                                    <field name="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
+                                </group>
+                                <group string="Reminders for Manual Goals">
+                                    <label for="remind_update_delay" />
+                                    <div>
+                                        <field name="remind_update_delay" class="oe_inline"/> days
+                                    </div>
+                                </group>
+                                <group string="Category" groups="base.group_no_one">
+                                    <field name="category" widget="radio" />
+                                </group>
+                            </page>
                         </notebook>
 
                         
@@ -128,7 +142,7 @@
         </record>
 
         <record model="ir.ui.view" id="view_goal_plan_kanban">
-            <field name="name">Goal Plan Kanban</field>
+            <field name="name">Challenge Kanban</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_background_grey">
@@ -141,7 +155,7 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit">Configure Goal Plan</a></li>
+                                        <li><a type="edit">Configure Challenge</a></li>
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
@@ -180,13 +194,13 @@
 
 
         <record id="goal_plan_search_view" model="ir.ui.view">
-            <field name="name">Goal Plan Search</field>
+            <field name="name">Challenge Search</field>
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
-                <search string="Search Goal Plans">
-                    <filter name="draft_inprogress" string="Non-closed Plans"
-                        domain="[('state', 'in', ('inprogress', 'draft'))]"/>
-                    <filter name="hr_plans" string="HR Plans"
+                <search string="Search Challenges">
+                    <filter name="inprogress" string="Running Challenges"
+                        domain="[('state', '=', 'inprogress')]"/>
+                    <filter name="hr_plans" string="HR Challenges"
                         domain="[('category', '=', 'hr')]"/>
                     <field name="name"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 42e95cf44df..27e726697ca 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -41,12 +41,11 @@
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
-                            (Goal: <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
+                            (Goal: max <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
                             </t>
                         </th>
-                        <th></th><th></th>
                     </tr>
                     <tr>
                         <th>#</th>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 0c0ccbcc232..b3838707d68 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -413,27 +413,48 @@
             <field name="act_window_id" ref="action_hr_evaluation_interview_tree"/>
         </record>
 
-        <record id="goals_menu_groupby_act" model="ir.actions.act_window">
+        <record id="goals_menu_groupby_action" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
             <field name="view_type">form</field>
             <field name="name">Goals History</field>
             <field name="view_mode">tree,kanban</field>
             <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
             <field name="domain">[('plan_id.category', '=', 'hr')]</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal. 
+                </p>
+                <p>
+                    A goal is defined by a user and a goal type.
+                    Goals can be created automatically by using goal plans.
+                </p>
+            </field>
         </record>
 
 
         <record id="goal_plan_list_action2" model="ir.actions.act_window">
-            <field name="name">Goal Plans</field>
-            <field name="domain">[('category', '=', 'hr')]</field>
+            <field name="inherit_id" ref="gamification.goal_plan_list_action"/>
+            <field name="name">Challenges</field>
             <field name="res_model">gamification.goal.plan</field>
-            <field name="view_mode">kanban,form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="domain">[('category', '=', 'hr')]</field>
+            <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a challenge. 
+                </p>
+                <p>
+                    Assign a list of goals to chosen users to evaluate them.
+                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.
+                    The goals are created for the specified users or member of the group.
+                </p>
+            </field>
         </record>
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
         <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="goal_plan_list_action2" groups="base.group_hr_user"/>
-        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_act" groups="base.group_hr_user"/>
+        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_action" groups="base.group_hr_user"/>
 
       <!-- Email Compose message Action-->
       <act_window

From 9168ce206a17511652810e4b41fea666c791f203 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 15 Apr 2013 16:12:38 +0200
Subject: [PATCH 281/547] [FIX] isoformat of date

bzr revid: mat@openerp.com-20130415141238-osiod0o6fqtyt8lw
---
 addons/gamification/plan.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index aacd2be4022..99701b1d544 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -54,7 +54,10 @@ def start_end_date_for_period(period):
         start_date = False  # for manual goal, start each time
         end_date = False
 
-    return (start_date, end_date)
+    if start_date and end_date:
+        return (start_date.isoformat(), end_date.isoformat())
+    else:
+        return (start_date, end_date)
 
 
 class gamification_goal_plan(osv.Model):
@@ -428,9 +431,9 @@ class gamification_goal_plan(osv.Model):
                     }
 
                     if start_date:
-                        values['start_date'] = start_date.isoformat()
+                        values['start_date'] = start_date
                     if end_date:
-                        values['end_date'] = end_date.isoformat()
+                        values['end_date'] = end_date
 
                     if planline.plan_id.remind_update_delay:
                         values['remind_update_delay'] = planline.plan_id.remind_update_delay
@@ -479,9 +482,9 @@ class gamification_goal_plan(osv.Model):
             else:
                 # if no subset goals, use the dates for restriction
                 if start_date:
-                    domain.append(('start_date', '=', start_date.isoformat()))
+                    domain.append(('start_date', '=', start_date))
                 if end_date:
-                    domain.append(('end_date', '=', end_date.isoformat()))
+                    domain.append(('end_date', '=', end_date))
                 common_goal_ids = goal_obj.search(cr, uid, domain, context=context)
 
             board_goals = [goal for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context)]
@@ -513,9 +516,9 @@ class gamification_goal_plan(osv.Model):
         else:
             # if no subset goals, use the dates for restriction
             if start_date:
-                domain.append(('start_date', '=', start_date.isoformat()))
+                domain.append(('start_date', '=', start_date))
             if end_date:
-                domain.append(('end_date', '=', end_date.isoformat()))
+                domain.append(('end_date', '=', end_date))
             related_goal_ids = goal_obj.search(cr, uid, domain, context=context)
 
         if len(related_goal_ids) == 0:

From b4d1d803fd58ba7964fec8e695691c93f710f687 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 15 Apr 2013 16:44:55 +0200
Subject: [PATCH 282/547] [FIX] avoid warning for anonymous

bzr revid: mat@openerp.com-20130415144455-w2jl8lxh0pdd6fo1
---
 addons/gamification/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 3b1024015c8..223aeb9ac0e 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -6,7 +6,7 @@ goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
 goal_type_user,"Goal Type User",model_gamification_goal_type,base.group_user,1,0,0,0
 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
 
-plan_user,"Goal Plan User",model_gamification_goal_plan,base.group_user,1,0,0,0
+plan_user,"Goal Plan User",model_gamification_goal_plan,,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
 
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1

From d02eed5d360fee8c24a7ca7d9d40295373b8292f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 15 Apr 2013 16:57:43 +0200
Subject: [PATCH 283/547] [IMP] compute with python for goals

bzr revid: mat@openerp.com-20130415145743-mme15smubk14dvg4
---
 addons/gamification/badge.py                | 13 ++----------
 addons/gamification/badge_view.xml          |  7 +++++--
 addons/gamification/goal.py                 | 23 +++++++++++++++++++--
 addons/gamification/goal_view.xml           |  7 ++++---
 addons/hr_evaluation/hr_evaluation_view.xml |  1 -
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index cfa130b792f..11aebd51a00 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -161,7 +161,7 @@ class gamification_badge(osv.Model):
                 ('everyone', 'Everyone'),
                 ('users', 'A selected list of users'),
                 ('having', 'People having some badges'),
-                ('nobody', 'No one'),
+                ('nobody', 'No one, assigned through challenges'),
             ],
             string="Allowed to Grant",
             help="Who can grant this badge",
@@ -185,15 +185,7 @@ class gamification_badge(osv.Model):
         'remaining_sending': fields.function(_remaining_sending_calc, type='integer',
             string='Remaining Sending Allowed', help="If a maxium is set"),
 
-        'rule_automatic': fields.selection([
-                ('goals', 'List of goals to reach'),
-                ('python', 'Custom python code executed'),
-                ('manual', 'Not automatic'),
-            ],
-            string="Automatic Rule",
-            help="Can this badge be automatically rewarded",
-            required=True),
-        'challenge_ids': fields.one2many('gamification.goal.plan', 'reward_id',
+        'plan_ids': fields.one2many('gamification.goal.plan', 'reward_id',
             string="Granted upon completion of"),
 
         'compute_code': fields.char('Compute Code',
@@ -234,7 +226,6 @@ class gamification_badge(osv.Model):
         'stat_count_distinct': 0,
         'stat_this_month': 0,
         'rule_auth': 'everyone',
-        'rule_automatic': 'manual',
         'compute_code': "self.nobody(cr, uid, context)"
     }
 
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index ef0cb37c71d..f9e17bf2448 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -100,12 +100,12 @@
                                 </div>
                             </div>
                         </group>
-                        <group string="Rules for Automatic Granting">
+<!--                         <group string="Rules for Automatic Granting">
                             <field name="rule_automatic" widget="radio"/>
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
                             <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
                         </group>
-                        <group string="Statistics">
+-->                        <group string="Statistics">
                             <group>
                                 <field name="stat_count"/>
                                 <field name="stat_this_month"/>
@@ -116,6 +116,9 @@
                                 <field name="stat_my_this_month"/>
                             </group>
                         </group>
+                        <group string="Reward for Challenges">
+                            <field name="plan_ids" widget="many2many_kanban" nolabel="1" />
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 0f62fa09c15..a6de0895d92 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -26,6 +26,10 @@ from templates import TemplateHelper
 
 from datetime import date, datetime, timedelta
 
+import logging
+
+_logger = logging.getLogger(__name__)
+
 
 class gamification_goal_type(osv.Model):
     """Goal type definition
@@ -67,11 +71,13 @@ class gamification_goal_type(osv.Model):
                 ('manually', 'Recorded manually'),
                 ('count', 'Automatic: number of records'),
                 ('sum', 'Automatic: sum on a field'),
+                ('python', 'Automatic: execute a specific Python code'),
             ],
             string="Computation Mode",
             required=True),
-        'ponctual': fields.boolean("Ponctual Goal",
-            help="A non-numerical goal is displayed with only two states: TODO or Done."),
+        'ponctual': fields.boolean("Non-numerical Goal",
+            help="Instead of a progress, the goal is displayed with only two states: TODO or Done."),
+
         'model_id': fields.many2one('ir.model',
             string='Model',
             help='The model object for the field to evaluate'),
@@ -84,6 +90,9 @@ class gamification_goal_type(osv.Model):
         'domain': fields.char("Filter Domain",
             help="Technical filters rules to apply",
             required=True),
+        'compute_code': fields.char('Compute Code',
+            help="The name of the python method that will be executed to verify if a user can receive this badge."),
+
         'condition': fields.selection([
                 ('higher', 'The higher the better'),
                 ('lower', 'The lower the better')
@@ -238,6 +247,16 @@ class gamification_goal(osv.Model):
                             context=context,
                             subtype='mail.mt_comment')
 
+            elif goal.type_id.computation_mode == 'python':
+                values = {'cr': cr, 'uid': uid, 'context': context, 'self': self.pool.get('gamification.goal.type')}
+                result = safe_eval(goal.type_id.compute_code, values, {})
+
+                if type(result) == float or type(result) == int:
+                    towrite = {'current': result}
+                else:
+                    _logger.exception(_('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
+                    # raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
+
             else:  # count or sum
                 obj = self.pool.get(goal.type_id.model_id.model)
                 field_date_name = goal.type_id.field_date_id.name
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index acd27b1a7a0..925edc76eb5 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -240,10 +240,11 @@
                                 <field widget="radio" name="computation_mode"/>
 
                                 <!-- Hide the fields below if manually -->
-                                <field name="model_id" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" class="oe_inline"/>
+                                <field name="model_id" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))], 'required':[('computation_mode','in',('sum', 'count'))]}" class="oe_inline"/>
                                 <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]"  class="oe_inline"/>
-                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','=','manually')]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]" class="oe_inline"/>
-                                <field name="domain" attrs="{'invisible':[('computation_mode','=','manually')], 'required':[('computation_mode','!=','manually')]}" class="oe_inline"/>
+                                <field name="field_date_id" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]" class="oe_inline"/>
+                                <field name="domain" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))], 'required':[('computation_mode','in',('sum', 'count'))]}" class="oe_inline"/>
+                                <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}"/>
 
                                 <field name="condition" widget="radio"/>
                                 <field name="ponctual" />
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index b3838707d68..e2a58e38230 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -433,7 +433,6 @@
 
 
         <record id="goal_plan_list_action2" model="ir.actions.act_window">
-            <field name="inherit_id" ref="gamification.goal_plan_list_action"/>
             <field name="name">Challenges</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">kanban,tree,form</field>

From 0222ae2a211667f9f38e173ff3211615cd5dc7af Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 15 Apr 2013 17:50:14 +0200
Subject: [PATCH 284/547] [IMP] better data

bzr revid: mat@openerp.com-20130415155014-y6bdafhnmb5g7kqj
---
 addons/gamification/goal.py                   |  6 +--
 addons/gamification/goal_base_data.xml        | 10 ++--
 addons/gamification/plan.py                   | 17 +++++--
 addons/gamification/plan_view.xml             |  7 +--
 addons/gamification/static/src/css/goal.css   | 12 +++--
 .../static/src/xml/gamification.xml           | 13 ++---
 .../gamification_sale_crm/sale_crm_goals.xml  | 48 ++++++++-----------
 addons/hr_evaluation/hr_evaluation_view.xml   |  4 +-
 8 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index a6de0895d92..59225724193 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -145,9 +145,9 @@ class gamification_goal(osv.Model):
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
         goal_type = self.pool.get('gamification.goal.type')
         if not type_id:
-            return {'value':{'type_id': False}}
+            return {'value': {'type_id': False}}
         goal_type = goal_type.browse(cr, uid, type_id, context=context)
-        ret = {'value' : {'computation_mode' : goal_type.computation_mode}}
+        ret = {'value': {'computation_mode': goal_type.computation_mode}}
         return ret
 
     _columns = {
@@ -188,7 +188,7 @@ class gamification_goal(osv.Model):
             track_visibility='always'),
 
         'computation_mode': fields.related('type_id', 'computation_mode',
-            type='char', 
+            type='char',
             string="Type computation mode"),
         'remind_update_delay': fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 750ce3284c8..41c62b991a7 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -4,7 +4,7 @@
 
         <!-- goal types -->
         <record model="gamification.goal.type" id="type_base_timezone">
-            <field name="name">Change Timezone</field>
+            <field name="name">Set your Timezone</field>
             <field name="description">Configure your profile and specify your timezone</field>
             <field name="computation_mode">count</field>
             <field name="ponctual">True</field>
@@ -15,7 +15,7 @@
         </record>
 
         <record model="gamification.goal.type" id="type_base_avatar">
-            <field name="name">Change of avatar</field>
+            <field name="name">Set your Avatar</field>
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
             <field name="ponctual">True</field>
@@ -26,7 +26,7 @@
 
 
         <record model="gamification.goal.type" id="type_base_company_data">
-            <field name="name">Set your company data</field>
+            <field name="name">Set your Company Data</field>
             <field name="description">Specify at least a website</field>
             <field name="computation_mode">count</field>
             <field name="ponctual">True</field>
@@ -37,7 +37,7 @@
         </record>
 
         <record model="gamification.goal.type" id="type_base_company_logo">
-            <field name="name">Change your company logo</field>
+            <field name="name">Set your Company Logo</field>
             <field name="computation_mode">count</field>
             <field name="ponctual">True</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
@@ -47,7 +47,7 @@
         </record>
 
         <record model="gamification.goal.type" id="type_base_invite">
-            <field name="name">Invite new users</field>
+            <field name="name">Invite new Users</field>
             <field name="description">Create at least another user</field>
             <field name="ponctual">True</field>
             <field name="computation_mode">count</field>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 99701b1d544..feb12f6df83 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -107,7 +107,7 @@ class gamification_goal_plan(osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Plan Name', required=True, translate=True),
+        'name': fields.char('Challenge Name', required=True, translate=True),
         'description': fields.text('Description', translate=True),
         'state': fields.selection([
                 ('draft', 'Draft'),
@@ -117,11 +117,11 @@ class gamification_goal_plan(osv.Model):
             string='State',
             required=True),
         'manager_id': fields.many2one('res.users',
-            string='Responsible', help="The user responsible for the plan."),
+            string='Responsible', help="The user responsible for the challenge."),
         'start_date': fields.date('Planned Start Date',
-            help="The day a new plan will be automatically started. If no periodicity is set, will use this date as the goal start date."),
+            help="The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."),
         'end_date': fields.date('Planned End Date',
-            help="The day a new plan will be automatically closed. If no periodicity is set, will use this date as the goal end date."),
+            help="The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."),
 
         'user_ids': fields.many2many('res.users', 'user_ids',
             string='Users',
@@ -641,7 +641,7 @@ class gamification_goal_planline(osv.Model):
 
     _name = 'gamification.goal.planline'
     _description = 'Gamification generic goal for plan'
-    _order = "sequence_type, id"
+    _order = "sequence, sequence_type, id"
 
     def _get_planline_types(self, cr, uid, ids, context=None):
         """Return the ids of planline items related to the gamification.goal.type
@@ -667,6 +667,9 @@ class gamification_goal_planline(osv.Model):
             ondelete="cascade"),
         'target_goal': fields.float('Target Value to Reach',
             required=True),
+        'sequence': fields.integer('Sequence',
+            help='Sequence number for ordering',
+            required=True),
         'sequence_type': fields.related('type_id', 'sequence',
             type='integer',
             string='Sequence',
@@ -680,3 +683,7 @@ class gamification_goal_planline(osv.Model):
         'type_monetary': fields.related('type_id', 'monetary', type="boolean", readonly=True, string="Monetary"),
         'type_full_suffix': fields.related('type_id', 'full_suffix', type="char", readonly=True, string="Suffix"),
     }
+
+    _default = {
+        'sequence': 1,
+    }
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index f03bf689fdb..96e1a247bdd 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -52,8 +52,8 @@
                 <form string="Goal types" version="7.0">
                     <header>
                         <button string="Start Now" type="object" name="action_start" states="draft" class="oe_highlight"/>
-                        <button string="Check Plan" type="object" name="action_check" states="inprogress"/>
-                        <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
+                        <button string="Check Challenge" type="object" name="action_check" states="inprogress"/>
+                        <button string="Close Challenge" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Reset to Draft" type="object" name="action_cancel" states="inprogress"/>
                         <button string="Reset Completion" type="object" name="action_reset" states="done"/>
                         <button string="Report Progress" type="object" name="action_report_progress" states="inprogress,done" groups="base.group_no_one"/>
@@ -66,7 +66,7 @@
                             <h1>    
                                 <field name="name" placeholder="e.g. Monthly Sales Objectives"/>
                             </h1>
-                            <label for="user_ids" class="oe_edit_only" string="Apply Plan To"/>
+                            <label for="user_ids" class="oe_edit_only" string="Assign Challenge To"/>
                             <div>
                                 <field name="user_ids" widget="many2many_tags" />
                             </div>
@@ -91,6 +91,7 @@
                             <page string="Goals">
                                 <field name="planline_ids" nolabel="1" colspan="4">
                                     <tree string="Planline List" version="7.0" editable="bottom" >
+                                        <field name="sequence" widget="handle"/>
                                         <field name="type_id"/>
                                         <field name="type_condition"/>
                                         <field name="target_goal"/>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index e081b666bc3..81a7d0bf9c9 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -102,7 +102,7 @@
     background-color: #fff;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table td,th {
-    vertical-align: center;
+    vertical-align: middle;
     border: none;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 40%; }
@@ -120,10 +120,16 @@
 .openerp .oe_mail_wall .oe_mail_wall_aside li p {
     margin:5px 0;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_update_plan {
-    display: inline-block;
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action {
+    visibility: hidden;
+    display: block;
     float: right;
 }
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover > .oe_update_plan,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover .oe_goal_action {
+    visibility: visible;
+}
 .openerp .oe_mail_wall .oe_mail {
     display: inline-block;
 }
\ No newline at end of file
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 27e726697ca..ff0c6056172 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -3,8 +3,8 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
-        <div t-foreach="widget.goals_info.info" t-as="plan">
-            <em><a class="oe_update_plan" rol="button" t-attf-id="{plan.id}">refresh</a></em>
+        <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
+            <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
             <h3><t t-esc="plan.name" /></h3>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
@@ -13,7 +13,7 @@
                     <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
-                        <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                        <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
                     </t>
                     <t t-if="!goal.type_ponctual">
                         <t t-if="goal.type_condition == 'higher'">
@@ -43,7 +43,7 @@
                             <t t-esc="planline.type_name"/>
                             (Goal: max <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
-                                <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
+                                <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
                         </th>
                     </tr>
@@ -61,11 +61,6 @@
                             <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
                             <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
                         </td>
-<!--                             <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
-                        <td class="col3">
-                            <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                            <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
-                        </td> -->
                     </tr>
                 </tbody>
                 </table>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index d7f9934b722..7e27e423ef0 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -14,6 +14,16 @@
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_invoice')]</field>
         </record>
 
+        <record model="gamification.goal.type" id="type_crm_nbr_new_leads">
+            <field name="name"># New Leads</field>
+            <field name="description">Based on the creation date</field>
+            <field name="computation_mode">count</field>
+            <field name="unit">leads</field>
+            <field name="model_id" eval="ref('crm.model_crm_lead')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
+            <field name="domain">[('user_id','=',user_id)]</field>
+        </record>
+
         <record model="gamification.goal.type" id="type_crm_lead_delay_open">
             <field name="name">Time to Qualify a Lead</field>
             <field name="description">The average number of days to open the case (lower than)</field>
@@ -49,16 +59,6 @@
             <field name="domain">[('user_id','=',user_id),('type','='),('state','=','done')]</field>
         </record> 
 
-        <record model="gamification.goal.type" id="type_crm_nbr_new_leads">
-            <field name="name"># New Leads</field>
-            <field name="description">Based on the creation date</field>
-            <field name="computation_mode">count</field>
-            <field name="unit">leads</field>
-            <field name="model_id" eval="ref('crm.model_crm_lead')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
-            <field name="domain">[('user_id','=',user_id)]</field>
-        </record>
-
         <record model="gamification.goal.type" id="type_crm_nbr_new_opportunities">
             <field name="name"># New Opportunities</field>
             <field name="description">Based on the opening date</field>
@@ -127,7 +127,7 @@
 
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_crm_sale">
-            <field name="name">Salesperson</field>
+            <field name="name">Monthly Sales Targets</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">board</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
@@ -136,7 +136,7 @@
         </record>
 
         <record model="gamification.goal.plan" id="plan_crm_marketing">
-            <field name="name">Marketing team</field>
+            <field name="name">Lead Acquisition</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">progressbar</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
@@ -150,16 +150,6 @@
             <field name="target_goal">20000</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale3">
-            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
-            <field name="target_goal">5</field>
-            <field name="plan_id" eval="ref('plan_crm_sale')" />
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale4">
-            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
-            <field name="target_goal">5</field>
-            <field name="plan_id" eval="ref('plan_crm_sale')" />
-        </record>
         <record model="gamification.goal.planline" id="planline_crm_sale5">
             <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
             <field name="target_goal">4</field>
@@ -167,21 +157,23 @@
         </record>
 
 
-
         <record model="gamification.goal.planline" id="planline_crm_marketing1">
-            <field name="type_id" eval="ref('type_crm_lead_delay_open')" />
-            <field name="target_goal">15</field>
-            <field name="plan_id" eval="ref('plan_crm_marketing')" />
-        </record>
-        <record model="gamification.goal.planline" id="planline_crm_marketing2">
             <field name="type_id" eval="ref('type_crm_nbr_new_leads')" />
             <field name="target_goal">7</field>
             <field name="plan_id" eval="ref('plan_crm_marketing')" />
+            <field name="sequence">1</field>
+        </record>
+        <record model="gamification.goal.planline" id="planline_crm_marketing2">
+            <field name="type_id" eval="ref('type_crm_lead_delay_open')" />
+            <field name="target_goal">15</field>
+            <field name="plan_id" eval="ref('plan_crm_marketing')" />
+            <field name="sequence">2</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing3">
             <field name="type_id" eval="ref('type_crm_nbr_new_opportunities')" />
             <field name="target_goal">5</field>
             <field name="plan_id" eval="ref('plan_crm_marketing')" />
+            <field name="sequence">3</field>
         </record>
 
     </data>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e2a58e38230..66375dfc916 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -413,7 +413,7 @@
             <field name="act_window_id" ref="action_hr_evaluation_interview_tree"/>
         </record>
 
-        <record id="goals_menu_groupby_action" model="ir.actions.act_window">
+        <record id="goals_menu_groupby_action2" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
             <field name="view_type">form</field>
             <field name="name">Goals History</field>
@@ -453,7 +453,7 @@
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
         <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="goal_plan_list_action2" groups="base.group_hr_user"/>
-        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_action" groups="base.group_hr_user"/>
+        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_action2" groups="base.group_hr_user"/>
 
       <!-- Email Compose message Action-->
       <act_window

From 8d23c604d91b0180f0dca25b3a907aa642d12c5a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 16 Apr 2013 12:27:24 +0200
Subject: [PATCH 285/547] [IMP] switch to challenges

bzr revid: mat@openerp.com-20130416102724-0ejrlecls30xhol3
---
 addons/gamification/badge.py                  |  2 +-
 addons/gamification/badge_view.xml            | 10 ++--
 addons/gamification/goal.py                   | 13 +++--
 addons/gamification/goal_base_data.xml        | 10 ++--
 addons/gamification/goal_view.xml             |  9 ++-
 addons/gamification/plan.py                   | 57 ++++++-------------
 addons/gamification/plan_view.xml             | 22 ++++---
 addons/gamification/res_users.py              |  4 +-
 .../static/src/js/gamification.js             |  2 +-
 .../static/src/xml/gamification.xml           |  7 +--
 10 files changed, 57 insertions(+), 79 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 11aebd51a00..e4c100b0bb6 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -186,7 +186,7 @@ class gamification_badge(osv.Model):
             string='Remaining Sending Allowed', help="If a maxium is set"),
 
         'plan_ids': fields.one2many('gamification.goal.plan', 'reward_id',
-            string="Granted upon completion of"),
+            string="Reward for Challenges"),
 
         'compute_code': fields.char('Compute Code',
             help="The name of the python method that will be executed to verify if a user can receive this badge."),
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index f9e17bf2448..5d616ba6a42 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -83,7 +83,7 @@
                         <group>
                             <field name="description" nolabel="1" placeholder="Badge Description" />
                         </group>
-                        <group string="Rules for User Granting">
+                        <group string="Granting">
                             <field name="rule_auth" widget="radio" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
@@ -93,13 +93,16 @@
                             <div>
                                 <field name="stat_my_monthly_sending" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
                                 <div attrs="{'invisible': [('remaining_sending','=',-1)]}" class="oe_grey">
-                                    You can still send <field name="remaining_sending" class="oe_inline"/> badges this month
+                                    You can still grant <field name="remaining_sending" class="oe_inline"/> badges this month
                                 </div>
                                 <div attrs="{'invisible': [('remaining_sending','!=',-1)]}" class="oe_grey">
                                     No monthly sending limit
                                 </div>
                             </div>
                         </group>
+                        <group string="Rewards for challenges">
+                            <field name="plan_ids" widget="many2many_kanban" nolabel="1" />
+                        </group>
 <!--                         <group string="Rules for Automatic Granting">
                             <field name="rule_automatic" widget="radio"/>
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
@@ -116,9 +119,6 @@
                                 <field name="stat_my_this_month"/>
                             </group>
                         </group>
-                        <group string="Reward for Challenges">
-                            <field name="plan_ids" widget="many2many_kanban" nolabel="1" />
-                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 59225724193..444970bf3e7 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -75,8 +75,11 @@ class gamification_goal_type(osv.Model):
             ],
             string="Computation Mode",
             required=True),
-        'ponctual': fields.boolean("Non-numerical Goal",
-            help="Instead of a progress, the goal is displayed with only two states: TODO or Done."),
+        'display_mode': fields.selection([
+                ('progress', 'Progressive (using numerical values)'),
+                ('checkbox', 'Checkbox (done or not-done)'),
+            ],
+            string="Displayed as", required=True),
 
         'model_id': fields.many2one('ir.model',
             string='Model',
@@ -118,7 +121,7 @@ class gamification_goal_type(osv.Model):
         'computation_mode': 'manually',
         'domain': "[]",
         'monetary': False,
-        'ponctual': False,
+        'display_mode': 'progress',
     }
 
 
@@ -203,8 +206,8 @@ class gamification_goal(osv.Model):
             type='char', string='Type Condition', readonly=True),
         'type_suffix': fields.related('type_id', 'full_suffix',
             type="char", string="Suffix", readonly=True),
-        'type_ponctual': fields.related('type_id', 'ponctual',
-            type="boolean", string="Ponctual Goal", readonly=True),
+        'type_display': fields.related('type_id', 'display_mode',
+            type="char", string="Display Mode", readonly=True),
     }
 
     _defaults = {
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 41c62b991a7..afd278e92a5 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -7,7 +7,7 @@
             <field name="name">Set your Timezone</field>
             <field name="description">Configure your profile and specify your timezone</field>
             <field name="computation_mode">count</field>
-            <field name="ponctual">True</field>
+            <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_users_my')" />
@@ -18,7 +18,7 @@
             <field name="name">Set your Avatar</field>
             <field name="description">In your user perference</field>
             <field name="computation_mode">manually</field>
-            <field name="ponctual">True</field>
+            <field name="display_mode">checkbox</field>
             <!-- problem : default avatar != False -> manually + check in write function -->
             <field name="action_id" eval="ref('base.action_res_users_my')" />
             <field name="res_id_field">id</field>
@@ -29,7 +29,7 @@
             <field name="name">Set your Company Data</field>
             <field name="description">Specify at least a website</field>
             <field name="computation_mode">count</field>
-            <field name="ponctual">True</field>
+            <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id), ('name', '!=', 'Your Company')]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
@@ -39,7 +39,7 @@
         <record model="gamification.goal.type" id="type_base_company_logo">
             <field name="name">Set your Company Logo</field>
             <field name="computation_mode">count</field>
-            <field name="ponctual">True</field>
+            <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id),('logo', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
@@ -49,7 +49,7 @@
         <record model="gamification.goal.type" id="type_base_invite">
             <field name="name">Invite new Users</field>
             <field name="description">Create at least another user</field>
-            <field name="ponctual">True</field>
+            <field name="display_mode">checkbox</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id', '!=', user_id)]</field>
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 925edc76eb5..fc1fdbab4ee 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -137,7 +137,7 @@
                     <field name="target_goal"/>
                     <field name="type_condition"/>
                     <field name="type_suffix"/>
-                    <field name="type_ponctual"/>
+                    <field name="type_display"/>
                     <field name="start_date"/>
                     <field name="end_date"/>
                     <field name="last_update"/>
@@ -154,13 +154,13 @@
                                     </div>
                                     <field name="user_id" />
                                     <div class="oe_goal_state_block">
-                                        <t t-if="record.type_ponctual.value">
+                                        <t t-if="record.type_display.raw_value == 'checkbox'">
                                             <div class="oe_goal_state oe_e"><t t-if="record.state.raw_value=='reached'"><span class="oe_green">W</span></t>
                                                 <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">N</t>
                                                 <t t-if="record.state.raw_value=='failed'"><span class="oe_red">X</span></t>
                                             </div>
                                         </t>
-                                        <t t-if="!record.type_ponctual.value">
+                                        <t t-if="record.type_display.raw_value == 'progress'">
                                             <t t-if="record.type_condition.raw_value =='higher'">
                                                 <div class="oe_goal_gauge"></div>
                                             </t>
@@ -245,11 +245,10 @@
                                 <field name="field_date_id" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]" class="oe_inline"/>
                                 <field name="domain" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))], 'required':[('computation_mode','in',('sum', 'count'))]}" class="oe_inline"/>
                                 <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}"/>
-
                                 <field name="condition" widget="radio"/>
-                                <field name="ponctual" />
                             </group>
                             <group string="Formating Options">
+                                <field name="display_mode" widget="radio" />
                                 <field name="unit" class="oe_inline"/>
                                 <field name="monetary"  class="oe_inline"/>
                             </group>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index feb12f6df83..efe80601029 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -118,9 +118,9 @@ class gamification_goal_plan(osv.Model):
             required=True),
         'manager_id': fields.many2one('res.users',
             string='Responsible', help="The user responsible for the challenge."),
-        'start_date': fields.date('Planned Start Date',
+        'start_date': fields.date('Start Date',
             help="The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."),
-        'end_date': fields.date('Planned End Date',
+        'end_date': fields.date('End Date',
             help="The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."),
 
         'user_ids': fields.many2many('res.users', 'user_ids',
@@ -130,24 +130,8 @@ class gamification_goal_plan(osv.Model):
             string='Auto-subscription Group',
             help='Group of users whose members will automatically be added to the users'),
 
-        'subscription_action': fields.selection([
-                ('automatic', 'The user is subscribed automatically'),
-                ('approve', 'The user has to approve the challenge'),
-            ],
-            string="Subscription approval",
-            help="What happens when the user is added to a challenge (manually or automatically) ?",
-            required=True),
         'proposed_user_ids': fields.many2many('res.users', 'proposed_user_ids',
             string="Propose to users"),
-        'proposed_mail_group_ids': fields.many2many('mail.group', 'proposed_mail_group_ids',
-            string="Propose to mail groups"),
-        'proposed_later_user_ids': fields.many2many('res.users', 'proposed_later_user_ids',
-            string='Users to Remind',
-            help="List of users that have asked to decide later if they approve the challenge"),
-        'proposed_refused_user_ids': fields.many2many('res.users', 'refused_approval_user_ids',
-            string='Discard Request Users',
-            help="List of users that have discared the approval request"),
-        'propose_after_login': fields.integer("Propose challenge after login", help="Number of minutes"),
 
         'planline_ids': fields.one2many('gamification.goal.planline', 'plan_id',
             string='Planline',
@@ -155,9 +139,11 @@ class gamification_goal_plan(osv.Model):
             required=True),
         'planline_count': fields.function(_planline_count, type='integer', string="Planlines"),
 
-        'reward_id': fields.many2one('gamification.badge', string="Reward upon completion"),
-        'reward_bests': fields.integer('Number of Best Perforers Rewared'),
-        'reward_failure': fields.boolean('Grant if not succeed'),
+        'reward_id': fields.many2one('gamification.badge', string="For Every Succeding User"),
+        'reward_first_id': fields.many2one('gamification.badge', string="For 1st user"),
+        'reward_second_id': fields.many2one('gamification.badge', string="For 2nd user"),
+        'reward_third_id': fields.many2one('gamification.badge', string="For 3rd user"),
+        'reward_failure': fields.boolean('Reward Top 3 even if not succeed'),
 
         'period': fields.selection([
                 ('once', 'Non recurring'),
@@ -210,7 +196,6 @@ class gamification_goal_plan(osv.Model):
         'start_date': fields.date.today,
         'manager_id': lambda s, cr, uid, c: uid,
         'category': 'hr',
-        'subscription_action': 'automatic',
         'reward_failure': False,
     }
 
@@ -232,17 +217,9 @@ class gamification_goal_plan(osv.Model):
 
         if 'proposed_user_ids' in vals:
             for plan in self.browse(cr, uid, ids, context=context):
-                if plan.subscription_action == 'approve':
-                    puser_ids = [puser.id for puser in plan.proposed_user_ids]
-                    ruser_ids = [ruser.id for ruser in plan.proposed_refused_user_ids if ruser.id in puser_ids]
-                    if len(ruser_ids) > 0:
-                        raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user that has refused it'))
-                    auser_ids = [auser.id for auser in plan.proposed_later_user_ids if auser.id in puser_ids]
-                    if len(auser_ids) > 0:
-                        raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user that has cast aside it'))
-                    user_ids = [user.id for user in plan.user_ids if user.id in puser_ids]
-                    if len(user_ids) > 0:
-                        raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user already assigned to it'))
+                puser_ids = [puser.id for puser in plan.proposed_user_ids]
+                if len([user for user in plan.user_ids if user.id in puser_ids]) > 0:
+                    raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user already assigned to it'))
 
         return write_res
 
@@ -612,6 +589,9 @@ class gamification_goal_plan(osv.Model):
         """The user accept the suggested challenge"""
         context = context or {}
         user_id = user_id or uid
+        user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
+        message = "%s has joined the challenge" % user.name
+        self.message_post(cr, uid, plan_id, body=message, context=context)
         self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id), 'user_id': (4, user_id)}, context=context)
         return self.generate_goals_from_plan(cr, uid, [plan_id], context=context)
 
@@ -619,13 +599,10 @@ class gamification_goal_plan(osv.Model):
         """The user discard the suggested challenge"""
         context = context or {}
         user_id = user_id or uid
-        return self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id), 'proposed_refused_user_ids': (4, user_id)}, context=context)
-
-    def postpone_challenge(self, cr, uid, plan_id, user_id=None, context=None):
-        """The user ask to be reminded later for the suggested challenge"""
-        context = context or {}
-        user_id = user_id or uid
-        return self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id), 'proposed_later_user_ids': (4, user_id)}, context=context)
+        user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
+        message = "%s has refused the challenge" % user.name
+        self.message_post(cr, uid, plan_id, body=message, context=context)
+        return self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id)}, context=context)
 
     def get_suggestions_info(self, cr, uid, context=None):
         pass
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 96e1a247bdd..14c124f1e10 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -102,18 +102,20 @@
                             <page string="Reward">
                                 <group>
                                     <field name="reward_id"/>
-                                    <field name="reward_bests" attrs="{'invisible': [('reward_id','=', False)]}" />
-                                    <field name="reward_failure" attrs="{'invisible': [('reward_id','=', False)]}" />
+                                    <field name="reward_first_id" />
+                                    <field name="reward_second_id" attrs="{'invisible': [('reward_first_id','=', False)]}" />
+                                    <field name="reward_third_id" attrs="{'invisible': ['|',('reward_first_id','=', False),('reward_second_id','=', False)]}" />
+                                    <field name="reward_failure" attrs="{'invisible': [('reward_first_id','=', False)]}" />
                                 </group>
+                                <div class="oe_grey">
+                                    <p>Badges are granted when a challenge is finished. This is either when at the end of a running period (eg: end of the month for a monthly challenge) or at the end date of a challenge (if no periodicity is set).</p>
+                                    <p>Ranking is done on the number of succeeded goals and the percentage of each one.</p>
+                                </div>
                             </page>
                             <page string="Advanced Options">
-                                <group string="Subscribe Users Automatically">
+                                <group string="Subscriptions">
                                     <field name="autojoin_group_id" />
-                                    <field name="subscription_action" />
-                                    <field name="proposed_user_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
-                                    <field name="proposed_mail_group_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
-                                    <field name="proposed_later_user_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
-                                    <field name="proposed_refused_user_ids" attrs="{'invisible':[('subscription_action','=','automatic')]}" widget="many2many_tags" />
+                                    <field name="proposed_user_ids" widget="many2many_tags" />
                                 </group>
                                 <group string="Notification Messages">
                                     <field name="report_message_frequency" />
@@ -131,7 +133,9 @@
                                 </group>
                             </page>
                         </notebook>
-
+                        <group>
+                            <field name="description" placeholder="Describe the challenge: what is does, who it targets, why it matters..."/>
+                        </group>
                         
                     </sheet>
                     <div class="oe_chatter">
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index ace2a5bd451..a3ee85337b4 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -58,7 +58,7 @@ class res_users_gamification_group(osv.Model):
                             'type_monetary': planline_board['goal_type'].monetary,
                             'type_unit': planline_board['goal_type'].unit,
                             'type_action': True if planline_board['goal_type'].action_id else False,
-                            'type_ponctual': planline_board['goal_type'].ponctual,
+                            'type_display': planline_board['goal_type'].display_mode,
                             'target_goal': planline_board['target_goal'],
                             'goals': []}
                     for goal in planline_board['board_goals']:
@@ -92,7 +92,7 @@ class res_users_gamification_group(osv.Model):
                         'type_monetary': goal.type_id.monetary,
                         'type_unit': goal.type_id.unit,
                         'type_action': True if goal.type_id.action_id else False,
-                        'type_ponctual': goal.type_id.ponctual,
+                        'type_display': goal.type_id.display_mode,
                         'state': goal.state,
                         'completeness': goal.completeness,
                         'computation_mode': goal.computation_mode,
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index aafdcbf8659..7f1e31d2c24 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -105,7 +105,7 @@ openerp.gamification = function(instance) {
             self.$(".oe_goal_sparkline_piechart").each(function() {
                 var completeness = parseInt( $(this).attr('data-completeness'), 10);
                 var values = [completeness, 100-completeness];
-                $(this).sparkline(values, {type: 'pie', offset: 180, sliceColors: ['#01922D','#ff0000']});
+                $(this).sparkline(values, {type: 'pie', offset: 180, sliceColors: ['#0B610B','#F78181']});
             });
         }
     });
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index ff0c6056172..adcd6fa37b0 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -15,7 +15,7 @@
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
                     </t>
-                    <t t-if="!goal.type_ponctual">
+                    <t t-if="goal.type_display == 'progress'">
                         <t t-if="goal.type_condition == 'higher'">
                             <p>
                                 <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
@@ -47,11 +47,6 @@
                             </t>
                         </th>
                     </tr>
-                    <tr>
-                        <th>#</th>
-                        <th>Pers.</th>
-                        <th>current</th>
-                    </tr>
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">

From 0b0c24a6364c98604d1b9d06462274e87a79d0bd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 16 Apr 2013 14:45:58 +0200
Subject: [PATCH 286/547] [REF] moving to only hr_gamification module

bzr revid: mat@openerp.com-20130416124558-p40tkw8mgr4e7v04
---
 addons/gamification/badge_view.xml            | 11 ++--
 addons/gamification/plan.py                   |  3 +-
 addons/gamification/plan_view.xml             |  4 +-
 .../sale_crm_goals_demo.xml                   | 20 -------
 addons/hr_evaluation/__openerp__.py           |  2 +-
 addons/hr_evaluation/hr_evaluation.py         |  8 ---
 addons/hr_evaluation/hr_evaluation_view.xml   | 44 ---------------
 .../security/hr_evaluation_security.xml       |  2 +-
 .../security/ir.model.access.csv              |  7 +--
 addons/hr_gamification/__init__.py            |  2 +-
 addons/hr_gamification/__openerp__.py         | 13 +++--
 .../{badge.py => gamification.py}             |  8 +++
 .../{badge_view.xml => gamification_view.xml} | 54 +++++++++++++++++--
 .../security/ir.model.access.csv              |  5 ++
 .../src/js/{badges.js => gamification.js}     |  8 +--
 15 files changed, 83 insertions(+), 108 deletions(-)
 rename addons/hr_gamification/{badge.py => gamification.py} (92%)
 rename addons/hr_gamification/{badge_view.xml => gamification_view.xml} (63%)
 create mode 100644 addons/hr_gamification/security/ir.model.access.csv
 rename addons/hr_gamification/static/src/js/{badges.js => gamification.js} (63%)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 5d616ba6a42..f86f104e96f 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -103,7 +103,8 @@
                         <group string="Rewards for challenges">
                             <field name="plan_ids" widget="many2many_kanban" nolabel="1" />
                         </group>
-<!--                         <group string="Rules for Automatic Granting">
+<!--
+                         <group string="Rules for Automatic Granting">
                             <field name="rule_automatic" widget="radio"/>
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
                             <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
@@ -144,12 +145,6 @@
                         <t t-name="kanban-box">
                             <div t-attf-class="#{record.stat_my.raw_value ? 'oe_kanban_color_5' : 'oe_kanban_color_white'} oe_kanban_card oe_kanban_global_click oe_kanban_badge">
                                 <div class="oe_kanban_content">
-                                    <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                        <span class="oe_e">í</span>
-                                        <ul class="oe_dropdown_menu">
-                                            <li><a type="open">Badge Details</a></li>
-                                        </ul>
-                                    </div>
                                     <div class="oe_kanban_left">
                                         <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="110" height="110" /></a>
                                     </div>
@@ -173,7 +168,7 @@
                                             </span>
                                         </t>
                                         <t t-if="record.remaining_sending.value == 0">
-                                            <div class="oe_grey">Can not send</div>
+                                            <div class="oe_grey">Can not grant</div>
                                         </t>
                                     </div>
                                     <div class="oe_kanban_badge_avatars">
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index efe80601029..5e36206e4d5 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -645,8 +645,7 @@ class gamification_goal_planline(osv.Model):
         'target_goal': fields.float('Target Value to Reach',
             required=True),
         'sequence': fields.integer('Sequence',
-            help='Sequence number for ordering',
-            required=True),
+            help='Sequence number for ordering'),
         'sequence_type': fields.related('type_id', 'sequence',
             type='integer',
             string='Sequence',
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 14c124f1e10..94ccc0793b2 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -98,6 +98,7 @@
                                         <field name="type_full_suffix"/>
                                     </tree>
                                 </field>
+                                <field name="description" placeholder="Describe the challenge: what is does, who it targets, why it matters..."/>
                             </page>
                             <page string="Reward">
                                 <group>
@@ -133,9 +134,6 @@
                                 </group>
                             </page>
                         </notebook>
-                        <group>
-                            <field name="description" placeholder="Describe the challenge: what is does, who it targets, why it matters..."/>
-                        </group>
                         
                     </sheet>
                     <div class="oe_chatter">
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index 970450f5df6..679d80e3472 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -19,26 +19,6 @@
             <field name="state">inprogress</field>
         </record>
 
-        <record model="gamification.goal" id="goal_crm_sale3">
-            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
-            <field name="user_id" eval="ref('base.user_demo')" />
-            <field name="planline_id" eval="ref('planline_crm_sale3')" />
-            <field name="start_date" eval="time.strftime('2013-03-01')" />
-            <field name="end_date" eval="time.strftime('2013-03-31')" />
-            <field name="target_goal">5</field>
-            <field name="state">inprogress</field>
-        </record>
-
-        <record model="gamification.goal" id="goal_crm_sale4">
-            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
-            <field name="user_id" eval="ref('base.user_demo')" />
-            <field name="planline_id" eval="ref('planline_crm_sale4')" />
-            <field name="start_date" eval="time.strftime('2013-03-01')" />
-            <field name="end_date" eval="time.strftime('2013-03-31')" />
-            <field name="target_goal">5</field>
-            <field name="state">inprogress</field>
-        </record>
-
         <record model="gamification.goal" id="goal_crm_sale5">
             <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
             <field name="user_id" eval="ref('base.user_demo')" />
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 8249468a600..0c999ec4f7b 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -28,7 +28,7 @@
     'website': 'http://www.openerp.com',
     'summary': 'Periodical Evaluations, Appraisals, Surveys',
     'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg','images/hr_interview_requests.jpeg'],
-    'depends': ['hr','base_calendar','survey','gamification'],
+    'depends': ['hr','base_calendar','survey'],
     'description': """
 Periodical Employees evaluation and appraisals
 ==============================================
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 29669eec1d6..026c3afac09 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -105,17 +105,9 @@ class hr_employee(osv.osv):
     _inherit="hr.employee"
     
 
-    def _get_employee_goals(self, cr, uid, ids, field_name, arg, context=None):
-        """Return the list of goals assigned to the employee"""
-        res = {}
-        for employee in self.browse(cr, uid, ids, context=context):
-            res[employee.id] = self.pool.get('gamification.goal').search(cr,uid,[('user_id', '=', employee.user_id.id), ('plan_id.category', '=', 'hr')], context=context)
-        return res
-
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
         'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
-        'goal_ids': fields.function(_get_employee_goals, type="one2many", obj='gamification.goal', string="Employee HR Goals")
     }
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
         now = parser.parse(datetime.now().strftime('%Y-%m-%d'))
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 66375dfc916..2462daa6301 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -147,11 +147,6 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
             </xpath>
-            <xpath expr="//page[@string='Public Information']" position="after">
-                <page string="Goals">
-                    <field name="goal_ids" widget="many2many_kanban" />
-                </page>
-            </xpath>
             </field>
         </record>
 
@@ -413,47 +408,8 @@
             <field name="act_window_id" ref="action_hr_evaluation_interview_tree"/>
         </record>
 
-        <record id="goals_menu_groupby_action2" model="ir.actions.act_window">
-            <field name="res_model">gamification.goal</field>
-            <field name="view_type">form</field>
-            <field name="name">Goals History</field>
-            <field name="view_mode">tree,kanban</field>
-            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
-            <field name="domain">[('plan_id.category', '=', 'hr')]</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to create a goal. 
-                </p>
-                <p>
-                    A goal is defined by a user and a goal type.
-                    Goals can be created automatically by using goal plans.
-                </p>
-            </field>
-        </record>
-
-
-        <record id="goal_plan_list_action2" model="ir.actions.act_window">
-            <field name="name">Challenges</field>
-            <field name="res_model">gamification.goal.plan</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="domain">[('category', '=', 'hr')]</field>
-            <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to create a challenge. 
-                </p>
-                <p>
-                    Assign a list of goals to chosen users to evaluate them.
-                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.
-                    The goals are created for the specified users or member of the group.
-                </p>
-            </field>
-        </record>
-
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem id="gamification_plan_menu_hr" parent="menu_eval_hr" action="goal_plan_list_action2" groups="base.group_hr_user"/>
-        <menuitem id="gamification_goal_menu_hr" parent="menu_eval_hr" action="goals_menu_groupby_action2" groups="base.group_hr_user"/>
 
       <!-- Email Compose message Action-->
       <act_window
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 1305c81934b..7c7d6f43ee3 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data noupdate="0">
 
-    <!-- make Employee users Survey users and Gamification manager -->
+    <!-- make Employee users Survey users -->
     <record id="base.group_user" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
     </record>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index ffeacde94ca..4be3d74b7d8 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -39,9 +39,4 @@ access_survey_response_hr_employee,survey.response.employee,survey.model_survey_
 access_survey_question_column_heading_hr_employee,survey.question.column.heading.employee,survey.model_survey_question_column_heading,base.group_user,1,0,0,0
 access_survey_response_line_hr_employee,survey.response.line.employee,survey.model_survey_response_line,base.group_user,1,1,1,0
 access_survey_response_answer_hr_employee,survey.response.answer.hr.employee,survey.model_survey_response_answer,base.group_user,1,1,1,0
-access_survey_tbl_column_heading_hr_employee,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_user,1,1,1,0
-
-plan_officer,"Goal Plan Officer",gamification.model_gamification_goal_plan,base.group_hr_user,1,1,1,1
-planline_officer,"Goal Planline Officer",gamification.model_gamification_goal_planline,base.group_hr_user,1,1,1,1
-badge_officer,"Badge Officer",gamification.model_gamification_badge,base.group_hr_user,1,1,1,1
-badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,base.group_hr_user,1,1,1,1
\ No newline at end of file
+access_survey_tbl_column_heading_hr_employee,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_user,1,1,1,0
\ No newline at end of file
diff --git a/addons/hr_gamification/__init__.py b/addons/hr_gamification/__init__.py
index 16a4761cb3f..cef4a8c371c 100644
--- a/addons/hr_gamification/__init__.py
+++ b/addons/hr_gamification/__init__.py
@@ -1 +1 @@
-import badge
+import gamification
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index c28a43fd32a..9b7be7b3ea0 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -24,11 +24,16 @@
     'author': 'OpenERP SA',
     'category': 'HR',
     'depends': ['gamification', 'hr'],
-    'description': """Use the HR ressources for the gamification process of goals.
+    'description': """Use the HR ressources for the gamification process.
 
+The HR officer can now manage challenges and badges.
 This allow the user to send badges to employees instead of simple users.
-Badge received are displayed on the user profile.""",
-    'data': ['badge_view.xml'],
+Badge received are displayed on the user profile.
+""",
+    'data': [
+        'security/ir.model.access.csv',
+        'gamification_view.xml',
+    ],
     'auto_install': True,
-    'js': ['static/src/js/badges.js'],
+    'js': ['static/src/js/gamification.js'],
 }
diff --git a/addons/hr_gamification/badge.py b/addons/hr_gamification/gamification.py
similarity index 92%
rename from addons/hr_gamification/badge.py
rename to addons/hr_gamification/gamification.py
index e4ccac1cb75..43a9a97f94d 100644
--- a/addons/hr_gamification/badge.py
+++ b/addons/hr_gamification/gamification.py
@@ -130,6 +130,13 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _inherit = "hr.employee"
 
+    def _get_employee_goals(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the list of goals assigned to the employee"""
+        res = {}
+        for employee in self.browse(cr, uid, ids, context=context):
+            res[employee.id] = self.pool.get('gamification.goal').search(cr,uid,[('user_id', '=', employee.user_id.id), ('plan_id.category', '=', 'hr')], context=context)
+        return res
+
     def _get_employee_badges(self, cr, uid, ids, field_name, arg, context=None):
         """Return the list of badge_users assigned to the employee"""
         res = {}
@@ -148,6 +155,7 @@ class hr_employee(osv.osv):
         return res
 
     _columns = {
+        'goal_ids': fields.function(_get_employee_goals, type="one2many", obj='gamification.goal', string="Employee HR Goals"),
         'badge_ids': fields.function(_get_employee_badges, type="one2many",
             obj='gamification.badge.user', string="Employee Badges"),
         'has_badges': fields.function(_has_badges, type="boolean", string="Has Badges"),
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/gamification_view.xml
similarity index 63%
rename from addons/hr_gamification/badge_view.xml
rename to addons/hr_gamification/gamification_view.xml
index fac64711591..59bb0a612b8 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/gamification_view.xml
@@ -23,9 +23,6 @@
             </field>
         </record>
 
-        <menuitem id="gamification_badge_menu_hr" parent="hr.menu_hr_main" action="gamification.badge_list_action" />
-
-
         <record id="gamification.view_badge_wizard_reward" model="ir.ui.view">
             <field name="name">Reward Employee Badge Form</field>
             <field name="model">gamification.badge.user.wizard</field>
@@ -86,7 +83,58 @@
                         <field name="badge_ids" widget="many2many_kanban" />
                     </page>
                 </xpath>
+                <xpath expr="//page[@string='Public Information']" position="after">
+                    <page string="Goals">
+                        <field name="goal_ids" widget="many2many_kanban" />
+                    </page>
+                </xpath>
+
             </field>
         </record>
+
+
+        <record id="goals_menu_groupby_action2" model="ir.actions.act_window">
+            <field name="res_model">gamification.goal</field>
+            <field name="view_type">form</field>
+            <field name="name">Goals History</field>
+            <field name="view_mode">tree,kanban</field>
+            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
+            <field name="domain">[('plan_id.category', '=', 'hr')]</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a goal. 
+                </p>
+                <p>
+                    A goal is defined by a user and a goal type.
+                    Goals can be created automatically by using goal plans.
+                </p>
+            </field>
+        </record>
+
+
+        <record id="goal_plan_list_action2" model="ir.actions.act_window">
+            <field name="name">Challenges</field>
+            <field name="res_model">gamification.goal.plan</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="domain">[('category', '=', 'hr')]</field>
+            <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a challenge. 
+                </p>
+                <p>
+                    Assign a list of goals to chosen users to evaluate them.
+                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.
+                    The goals are created for the specified users or member of the group.
+                </p>
+            </field>
+        </record>
+
+        <menuitem id="menu_hr_gamification" parent="hr.menu_hr_root" name="Engagement" sequence="40"/>
+
+        <menuitem id="gamification_badge_menu_hr" parent="menu_hr_gamification" action="gamification.badge_list_action" />
+        <menuitem id="gamification_plan_menu_hr" parent="menu_hr_gamification" action="goal_plan_list_action2" groups="base.group_hr_user"/>
+        <menuitem id="gamification_goal_menu_hr" parent="menu_hr_gamification" action="goals_menu_groupby_action2" groups="base.group_hr_user"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_gamification/security/ir.model.access.csv b/addons/hr_gamification/security/ir.model.access.csv
new file mode 100644
index 00000000000..a2a9cf3010b
--- /dev/null
+++ b/addons/hr_gamification/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+plan_officer,"Goal Plan Officer",gamification.model_gamification_goal_plan,base.group_hr_user,1,1,1,1
+planline_officer,"Goal Planline Officer",gamification.model_gamification_goal_planline,base.group_hr_user,1,1,1,1
+badge_officer,"Badge Officer",gamification.model_gamification_badge,base.group_hr_user,1,1,1,1
+badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,base.group_hr_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/hr_gamification/static/src/js/badges.js b/addons/hr_gamification/static/src/js/gamification.js
similarity index 63%
rename from addons/hr_gamification/static/src/js/badges.js
rename to addons/hr_gamification/static/src/js/gamification.js
index 7506c65f144..a9126464a10 100644
--- a/addons/hr_gamification/static/src/js/badges.js
+++ b/addons/hr_gamification/static/src/js/gamification.js
@@ -1,13 +1,7 @@
 openerp.hr_gamification = function(instance) {
     instance.web_kanban.KanbanRecord.include({
         on_card_clicked: function() {
-            if (this.view.dataset.model === 'gamification.badge') {
-                if (this.record.stat_count.raw_value > 0) {
-                    this.$('.oe_kanban_badge_avatars a').first().click();
-                } else {
-                    return false;
-                }
-            } else if (this.view.dataset.model === 'gamification.badge.user') {
+            if (this.view.dataset.model === 'gamification.badge.user') {
                 var action = {
                     type: 'ir.actions.act_window',
                     res_model: 'gamification.badge',

From b2bb03ba4a26807cee969c238639e60faced138e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 16 Apr 2013 15:48:47 +0200
Subject: [PATCH 287/547] [FIX] correct actions

bzr revid: mat@openerp.com-20130416134847-celf4nbl7748vnj5
---
 addons/gamification/goal.py                   | 23 +++++++------------
 .../static/src/js/gamification.js             |  2 +-
 addons/hr/hr.py                               |  2 --
 addons/hr/res_config.py                       |  4 ++--
 addons/hr_gamification/__openerp__.py         |  1 -
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 444970bf3e7..f9a9cb93620 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -357,21 +357,9 @@ class gamification_goal(osv.Model):
         In case of a manual goal, should return a wizard to update the value
         :return: action description in a dictionnary
         """
-        print("get_action")
         goal = self.browse(cr, uid, goal_id, context=context)
         if goal.type_id.action_id:
-            action_obj = goal.type_id.action_id
-            action = {
-                'name': action_obj.name,
-                'view_type': action_obj.view_type,
-                'view_mode': action_obj.view_mode,
-                'res_model': action_obj.res_model,
-                'domain': action_obj.domain,
-                'context': action_obj.context,
-                'type': 'ir.actions.act_window',
-                'search_view_id': action_obj.search_view_id.id,
-                'views': [(v.view_id.id, v.view_mode) for v in action_obj.view_ids]
-            }
+            action = goal.type_id.action_id.read()[0]
 
             if goal.type_id.res_id_field:
                 current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
@@ -381,9 +369,14 @@ class gamification_goal(osv.Model):
                 for field_name in field_names[1:]:
                     res = res.__getitem__(field_name)
                 action['res_id'] = res
-                action['view_mode'] = 'form'  # if one element to display, should see it in form mode
+
+                # if one element to display, should see it in form mode if possible
+                views = action['views']
+                for (view_id, mode) in action['views']:
+                    if mode == "form":
+                        views = [(view_id, mode)]
+                action['views'] = views
                 action['target'] = 'new'
-            print(action)
             return action
 
         if goal.computation_mode == 'manually':
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 7f1e31d2c24..e68874c866b 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -155,7 +155,7 @@ openerp.gamification = function(instance) {
                             "#ff0000",
                             "#f9c802",
                             "#a9d70b"
-                        ],
+                        ]
                     });
                 }
             });
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 176205d87b2..467f34f708b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -23,8 +23,6 @@ from openerp import addons
 import logging
 from openerp.osv import fields, osv
 from openerp import tools
-from openerp.tools.translate import _
-
 _logger = logging.getLogger(__name__)
 
 class hr_employee_category(osv.osv):
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 2eec37726e2..94c029262ff 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -40,9 +40,9 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_recruitment."""),
         'module_hr_contract': fields.boolean('Record contracts per employee',
             help ="""This installs the module hr_contract."""),
-        'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation and goals',
+        'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
-        'module_hr_gamification': fields.boolean('Manage badges',
+        'module_hr_gamification': fields.boolean('Drive engagement with challenges and badges',
             help ="""This installs the module hr_gamification."""),
         'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (the sale application will be installed)',
             help ="""This installs the module account_analytic_analysis, which will install sales management too."""),
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index 9b7be7b3ea0..ed7a18dd3e9 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -34,6 +34,5 @@ Badge received are displayed on the user profile.
         'security/ir.model.access.csv',
         'gamification_view.xml',
     ],
-    'auto_install': True,
     'js': ['static/src/js/gamification.js'],
 }

From 24f44d38c4f6d9e92ebb0fbfce70c37c20b03332 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 10:24:02 +0200
Subject: [PATCH 288/547] [REF] remove automatic code for badges

bzr revid: mat@openerp.com-20130418082402-3h89j54gdvwe3dwu
---
 addons/gamification/badge.py       | 93 ------------------------------
 addons/gamification/badge_data.xml |  3 -
 addons/gamification/badge_view.xml |  8 +--
 addons/gamification/cron.xml       | 11 ----
 4 files changed, 1 insertion(+), 114 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index e4c100b0bb6..56dff256402 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -261,99 +261,6 @@ class gamification_badge(osv.Model):
 
         return res
 
-    def _cron_check(self, cr, uid, context=None):
-        """Run cron on all automatic goals"""
-        ids = self.search(cr, uid, [('rule_automatic', '!=', 'manual')], context=context)
-        self.check_automatic(cr, uid, ids, context=context)
-
-    def check_automatic(self, cr, uid, ids, context=None):
-        """Check if the badges should be deserved to users
-
-        Only badges with an automatic rule specified are checked to be
-        granted, other type of badge will be skipped. Send alert messages to
-        the one validating the condition.
-        :param ids: the list of id of the badges to check
-
-        In case of python code to execute, the user should input the name of
-        the function that will be excuted through safe_eval. The globals
-        variables available are cr (database cursor), uid (current user id)
-        and context.
-
-        To create new functions in different modules, create a class extending
-        the 'gamification.badge.execute' class and implementing this method. The result
-        of the function should be a list of res.users ids (int). A badge_user
-        linked to this badge will be created for each of these users and a
-        notification will be send.
-        Beware that the case of user already having this badge is NOT checked
-        and is the responsability of the python code.
-
-        In case of list of goals to check, the case of a user already having
-        this badge is checked and the user will not receive badge at each run
-        of this method.
-        """
-
-        context = context or {}
-        badge_user_obj = self.pool.get('gamification.badge.user')
-
-        for badge in self.browse(cr, uid, ids, context=context):
-
-            if badge.rule_automatic == 'python':
-                values = {'cr': cr, 'uid': uid, 'context': context, 'self': self.pool.get('gamification.badge.execute')}
-                result = safe_eval(badge.compute_code, values, {})
-
-                # code_obj = compile(badge.compute_code, '<string>', 'exec')
-                # code_globals = {}
-                # code_locals = {'cr': cr, 'uid': uid, 'context': context, 'result': []}
-                # exec code_obj in code_globals, code_locals
-                if type(result) == list:
-                    user_badge_ids = [
-                        badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
-                        for user_id in result
-                    ]
-                    self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
-                else:
-                    raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(badge.compute_code)))
-
-            elif badge.rule_automatic == 'goals':
-                common_users = None
-                for goal_type in badge.goal_type_ids:
-                    res = self.pool.get('gamification.goal').read_group(cr, uid, [
-                        ('type_id', '=', goal_type.id),
-                        ('state', '=', 'reached'),
-                    ], ['user_id', 'state', 'type_id'], ['user_id'], context=context)
-
-                    users = [goal['user_id'][0] for goal in res]
-                    if common_users is None:
-                        # first type, include all
-                        common_users = users
-                    else:
-                        merged_list = [user_id for user_id in users if user_id in common_users]
-                        common_users = merged_list
-
-                if common_users is None:
-                    # nobody succeeded the goals
-                    continue
-
-                # remove users having already this badge
-                badge_user_not_having = []
-                for user_id in common_users:
-                    badge_user_having = badge_user_obj.search(cr, uid, [
-                        ('user_id', '=', user_id),
-                        ('badge_id', '=', badge.id)], context=context)
-                    if len(badge_user_having) == 0:
-                        badge_user_not_having.append(user_id)
-
-                # create badge users for users deserving the badge
-                user_badge_ids = [
-                    badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge.id}, context=context)
-                    for user_id in badge_user_not_having
-                ]
-                self.send_badge(cr, uid, badge.id, user_badge_ids, context=context)
-
-            # else  badge.rule_automatic == 'manual':
-
-        return True
-
     def check_granting(self, cr, uid, user_from_id, badge_id, context=None):
         """Check the user can grant a badge and raise the appropriate exception
         if not"""
diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index 6351f3772c6..d77a409d711 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -5,7 +5,6 @@
             <field name="name">Good Job</field>
             <field name="description">You did great at your job.</field>
             <field name="rule_auth">everyone</field>
-            <field name="rule_automatic">manual</field>
             <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QAxACcAA+BYKlhAAAACXBI
                                 WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMdCSITq3pssgAAIABJREFUeNrtvXmcXVWZ7/191h7O
                                 UPOUVOZKQmaSMAYIiDIIiIKCXqFRabyK2tfb9qA92Gq3b3uV621xbBC1VbRFEEUmgaDM8xCmEMhI
@@ -223,7 +222,6 @@
             <field name="name">Problem Solver</field>
             <field name="description">No one can solve challenges like you do.</field>
             <field name="rule_auth">everyone</field>
-            <field name="rule_automatic">manual</field>
             <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QAVgB7ADQ3APIQAAAACXBI
                                 WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMdCQASe88aBAAAIABJREFUeNrsvXeYZld15vtbe59z
                                 vlj1Va7OUa1Wq6UWykIJJBAKgEDkYMCAB2xsj8O1fa/TjO0Zj+1nDL4YX3DAeEyOJuNLECAJhFBA
@@ -622,7 +620,6 @@
             <field name="name">Brilliant</field>
             <field name="description">With your brilliant ideas, you are an inspiration to others.</field>
             <field name="rule_auth">everyone</field>
-            <field name="rule_automatic">manual</field>
             <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QAvQBcABUZb0TlAAAACXBI
                                 WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMdCTAQSodN2wAAIABJREFUeNrsvXmUbVd93/nZe5/x
                                 zlPN9eZRehqRkBACZGywmWwwNnjAcXDbTsftOEknbnevtnt5OXHshHjICrEhcRaJzdDGYIyZBEgI
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index f86f104e96f..6b7b4f2628b 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -103,13 +103,7 @@
                         <group string="Rewards for challenges">
                             <field name="plan_ids" widget="many2many_kanban" nolabel="1" />
                         </group>
-<!--
-                         <group string="Rules for Automatic Granting">
-                            <field name="rule_automatic" widget="radio"/>
-                            <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
-                            <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
-                        </group>
--->                        <group string="Statistics">
+                        <group string="Statistics">
                             <group>
                                 <field name="stat_count"/>
                                 <field name="stat_this_month"/>
diff --git a/addons/gamification/cron.xml b/addons/gamification/cron.xml
index 084a878982d..52726176841 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/cron.xml
@@ -12,16 +12,5 @@
             <field name="function">_cron_update</field>
             <field name="args">()</field>
         </record>
-        <record forcecreate="True" id="ir_cron_check_badge"
-            model="ir.cron">
-            <field name="name">Run Bagde Checker</field>
-            <field name="interval_number">1</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field eval="False" name="doall" />
-            <field name="model">gamification.badge</field>
-            <field name="function">_cron_check</field>
-            <field name="args">()</field>
-        </record>
     </data>
 </openerp>
\ No newline at end of file

From 5c082c36a7ceb81322501551c9726e6cbdad6238 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 11:20:47 +0200
Subject: [PATCH 289/547] [ADD] goal type python code instead of badges

bzr revid: mat@openerp.com-20130418092047-yi7ay30mu4epkqc5
---
 addons/gamification/badge_execute.py  | 46 ---------------------
 addons/gamification/goal_type_data.py | 59 +++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 46 deletions(-)
 delete mode 100644 addons/gamification/badge_execute.py
 create mode 100644 addons/gamification/goal_type_data.py

diff --git a/addons/gamification/badge_execute.py b/addons/gamification/badge_execute.py
deleted file mode 100644
index ba01fac02e0..00000000000
--- a/addons/gamification/badge_execute.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from openerp.osv import osv
-from openerp.tools.translate import _
-from datetime import date
-
-
-class gamification_badge_execute(osv.AbstractModel):
-    """Class that contains the methods to execute for badge granting"""
-
-    _name = 'gamification.badge.execute'
-    _description = 'Gamification Badge Execute'
-
-    def nobody(self, cr, uid, context):
-        """Return an empty list of users"""
-        return []
-
-    def everybody(self, cr, uid, context):
-        """Return the id of every user"""
-        return self.pool.get('res.users').search(cr, uid, [], context=context)
-
-    def today_users(self, cr, uid, context):
-        """Return the list of users that were connected today"""
-        domain = [('login_date', '=', date.today().isoformat())]
-        return self.pool.get('res.users').search(cr, uid, domain, context=context)
-
-    def long_time_users(self, cr, uid, context, badge_ref=None):
-        """Return the list of users that were created at least year ago
-
-        :param badge_ref: the xml reference of a badge, the users having
-        already this badge will be excluded
-        """
-        today = date.today()
-        domain = [('create_date', '<=', today.replace(year=today.year-1).isoformat())]
-
-        if badge_ref:
-            # retrieve the badge object
-            badge = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', badge_ref)
-            if not badge or not badge[1]:
-                raise osv.except_osv(_('Error!'), _('Unknown badge reference gamification.%s' % str(badge_ref)))
-
-            # exclude ids of user already having this badge
-            badge_user_obj = self.pool.get('gamification.badge.user')
-            badge_user_ids = badge_user_obj.search(cr, uid, [('badge_id', '=', badge[1])], context=context)
-            excluded_user_ids = [badge_user.user_id.id for badge_user in badge_user_obj.browse(cr, uid, badge_user_ids, context=context)]
-            domain.append(('id', 'not in', excluded_user_ids))
-
-        return self.pool.get('res.users').search(cr, uid, domain, context=context)
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/goal_type_data.py
new file mode 100644
index 00000000000..37976a45742
--- /dev/null
+++ b/addons/gamification/goal_type_data.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import osv
+from openerp import SUPERUSER_ID
+
+from datetime import date
+from dateutil.relativedelta import relativedelta
+
+
+class gamification_goal_type_data(osv.Model):
+    """Goal type data
+
+    Methods for more complex goals not possible with the 'sum' and 'count' mode.
+    Each method should return the value that will be set in the 'current' field
+    of a user's goal. The return type must be a float or integer.
+    """
+    _inherit = 'gamification.goal.type'
+
+    def last_connection(self, cr, uid, context=None):
+        """Return the number of days since the last connection"""
+        if context is None: context = {}
+        user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+        delta = date.today() - user.login_date
+        return delta.days
+
+    def months_since_created(self, cr, uid, context=None):
+        """Return the number of months since the user was created"""
+        if context is None: context = {}
+        user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+        today = date.today()
+        delta = relativedelta(years=user.create_date.year - today.year, months=user.create_date.month - today.month)
+        return delta.years*12 + delta.months
+
+    def number_mail_groups(self, cr, uid, context=None):
+        """Return the number of mail group the user has joined
+        For example purpose, similar goal could be done with a 'count' goal.
+        """
+        if context is None: context = {}
+        mail_group_ids = self.pool.get('mail.group').search(cr, uid, [('message_is_follower', '=', True)], context=context)
+        return len(mail_group_ids)

From 06159a516abb7203d997d2dcb77b0fcc849c2b5a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 12:32:29 +0200
Subject: [PATCH 290/547] [IMP] show suggested threads

bzr revid: mat@openerp.com-20130418103229-xkyu6qyzdola03hn
---
 addons/gamification/plan.py                   |  2 +-
 addons/gamification/res_users.py              | 16 +++++++++-
 addons/gamification/static/src/css/goal.css   | 25 ++++++----------
 .../static/src/js/gamification.js             | 30 ++++++++++++-------
 .../static/src/xml/gamification.xml           | 14 +++++++++
 5 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 5e36206e4d5..17a0ee79c43 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -131,7 +131,7 @@ class gamification_goal_plan(osv.Model):
             help='Group of users whose members will automatically be added to the users'),
 
         'proposed_user_ids': fields.many2many('res.users', 'proposed_user_ids',
-            string="Propose to users"),
+            string="Suggest to users"),
 
         'planline_ids': fields.one2many('gamification.goal.planline', 'plan_id',
             string='Planline',
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index a3ee85337b4..2cdf24d4c4b 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -30,7 +30,7 @@ class res_users_gamification_group(osv.Model):
         all_goals_info = []
         plan_obj = self.pool.get('gamification.goal.plan')
 
-        plan_ids = plan_obj.search(cr, uid, [('user_ids', 'in', uid)], context=context)
+        plan_ids = plan_obj.search(cr, uid, [('user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
         for plan in plan_obj.browse(cr, uid, plan_ids, context=context):
             # serialize goals info to be able to use it in javascript
             serialized_goals_info = {
@@ -103,6 +103,20 @@ class res_users_gamification_group(osv.Model):
             all_goals_info.append(serialized_goals_info)
         return all_goals_info
 
+    def get_challenge_suggestions(self, cr, uid, context=None):
+        """Return the list of goal plans suggested to the user"""
+        if context is None: context = {}
+        plan_info = []
+        plan_ids = self.pool.get('gamification.goal.plan').search(cr, uid, [('proposed_user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
+        for plan in self.pool.get('gamification.goal.plan').browse(cr, uid, plan_ids, context=context):
+            values = {
+                'id': plan.id,
+                'name': plan.name,
+                'description': plan.description,
+            }
+            plan_info.append(values)
+        return plan_info
+
 
 class res_groups_gamification_group(osv.Model):
     """ Update of res.groups class
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 81a7d0bf9c9..e3dd25b67e4 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -58,30 +58,23 @@
 }
 
 /* Mail Sidebar */
-
 .openerp .oe_mail_wall .oe_mail_wall_aside {
-    margin-left: 20px;
-    margin-top: 20px;
+    margin-top: 15px;
     position: relative;
     display: inline-block;
     vertical-align: top;
-    width: 300px;
+    width: 260px;
 }
-.openerp .oe_mail_wall_aside .oe_gamification_goal {
+.openerp .oe_mail_wall .oe_mail_wall_aside {
+    position: relative;
+    vertical-align: top;
     background: #EDEDF6;
-    height: auto;
-    padding: 15px;
-    border: solid 1px rgba(0,0,0,0.03);
+    border-radius: 2px;
 }
-
-/*.openerp .oe_gamification_goal .oe_goal_reached:before {
-    content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMSCREbCamR5gAAAXhJREFUOMuV0z9rlEEQBvDf7htFFIwQBCvRQuFAJSJooY29VrH0E1hcCqNign8SYzAxRfTA0nyAg3wBK1GCKSwTK8G7j6AgiHl3LbLmwOQu8Wl2mZ15Zp6ZnWC/GMcrjBvBdTRkX4P/QdNZrGKkWN7sn+CuE5IvsqOyKFnRMhb3DJwsZ2VV5ZgoCt5qGdsyD8ITzGJSW3BVkAUdlZsu++0T/SU8xxQeuyj7LKEWJKcs6Px16y9harv0NVEQBZWmBR33e26Dm/hMW3BLLUvW/XJBlM31XIZMlNsi7pWa5jGjIbiBXBLd8UL+N0e0WIInvMNp8+Wltqx2SBJk06Z98HRnkUHTOZWPomEVojOiUZV26foP2XkHdD3aSRBxXDIsSRKyddmyGklQa5vRtbl7myprvrnisOBa0TuEgyBhziXwfneCrTG+9kDSkgQJSbaJ2ix42H9QYXvTakdEG4KThfanoKHS9XIvgt7KjspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=);
-    margin-left:-20px;
+.openerp .oe_mail_wall_aside > div {
+    background: #EDEDF6;
+    padding: 5px 0 0 15px;
 }
-.openerp .oe_gamification_goal .oe_goal_failed:before {
-    content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMVECkXmaDBcAAAAUxJREFUKM+N0jFrVEEUhuFnV1KICS7ExcLCSgiCYJXCxt5C8B+ohYVgYeUfMJBCUIydkCpRLG3EThSxU0ypxMZKYQkSzd7cO3dmLJxNNhckGTgMfHPe+c6ZOZ7Sb7gauOIIq+V2wwVjFjNtYhS4dgh0L1EnvhtzKbGdyQW+8R/ofmJc8r64Ra/hYuJHEbda7nSgB1PQRsVpc2j+xfnEZjncjtz9zLHIw0SdyZH3uwx/wmDq5oaFyKeJc2QzsVOgVzXDveRBp5fAucjbTJ5E5EWYhtDvPkJiC1878rdEdUAZHHQ7FVkrpdaJ35lQXJ8EZveST5a9Zr7lZYFS5HHF2cjztF/ys11OgDP0auYjbwrURFZGzMAvjkfW077z6z/MGjGMfCxQFXnU7fsdvcjq5FsSH1RcnkAty4eM3EqiyTTW6AeuB5aOOOTLgZt/AfLdvLh74DfrAAAAAElFTkSuQmCC);
-    margin-left:-20px;
-}*/
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached,
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed {
     text-decoration: line-through;
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index e68874c866b..464fd1ace5a 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -9,6 +9,7 @@ openerp.gamification = function(instance) {
             this.deferred = $.Deferred();
             this.res_user = new instance.web.DataSetSearch(this, 'res.users');
             this.goals_info = {};
+            this.challenge_suggestions = {};
         },
         events: {
             'click a.oe_update_goal': function(event) {
@@ -45,6 +46,7 @@ openerp.gamification = function(instance) {
             var self = this;
             this._super.apply(this, arguments);
             self.get_goal_todo_info();
+            self.get_challenge_suggestions();
         },
         render_template: function(target,template) {
             var self = this;
@@ -65,6 +67,22 @@ openerp.gamification = function(instance) {
                     self.render_money_fields(self.goals_info.info[0].currency);
                     self.render_progress_bars();
                     self.render_piechars();
+                } else {
+                    self.$el.filter(".oe_gamification_goal").hide();
+                }
+            });
+        },
+        get_challenge_suggestions: function() {
+            var self = this;
+            var challenge_suggestions = this.res_user.call('get_challenge_suggestions', {}).then(function(res) {
+                self.challenge_suggestions['info'] = res;
+                console.log(res);
+            });
+            $.when(challenge_suggestions).done(function() {
+                if(self.challenge_suggestions.info.length > 0){
+                    self.render_template_replace(self.$el.filter(".oe_gamification_suggestion"),'gamification.challenge_suggestions');
+                } else {
+                    self.$el.filter(".oe_gamification_suggestion").hide();
                 }
             });
         },
@@ -128,6 +146,7 @@ openerp.gamification = function(instance) {
             var rendering = this._super();
             var self = this;
 
+            // add gauge in goal kanban views
             $.when(rendering).done(function() {
                 if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
                     var unique_id = _.uniqueId("goal_gauge_");
@@ -140,16 +159,6 @@ openerp.gamification = function(instance) {
                         max: self.record.target_goal.raw_value,
                         relativeGaugeSize: true,
                         humanFriendly: true,
-                        // add space between value and symbol
-                        // textRenderer: function(value) {
-                        //     symbol = self.record.type_suffix.raw_value;
-                        //     humannbr = humanFriendlyNumber(value, 0)
-                        //     if ((humannbr + symbol).length > 6) {
-                        //         return humannbr;
-                        //     } else {
-                        //         return humannbr + " " + symbol;
-                        //     }
-                        // },
                         label: self.record.type_suffix.raw_value,
                         levelColors: [
                             "#ff0000",
@@ -160,6 +169,7 @@ openerp.gamification = function(instance) {
                 }
             });
         },
+        // open related goals when clicking on challenge kanban view
         on_card_clicked: function() {
             if (this.view.dataset.model === 'gamification.goal.plan') {
                 this.$('.oe_kanban_project_list a').first().click();
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index adcd6fa37b0..22c1233d336 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -1,5 +1,6 @@
 <templates>
     <t t-name="gamification.user_wall_sidebar" class="oe_gamification_user_wall_sidebar">
+        <div class="oe_gamification_suggestion"><em>No challenge suggestions</em></div>
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
@@ -63,4 +64,17 @@
         </div>
     </t>
 
+    <t t-name="gamification.challenge_suggestions">
+        <h3>Suggested challenges</h3>
+        <div t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
+            <p>
+                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply">reply</a>
+                <t t-if="challenge.description.value">
+                    <br/>
+                    <em><t t-esc="challenge.description.value"/></em>
+                </t>
+            </p>
+        </div>
+    </t>
+
 </templates>

From d853f64aab1f988478b573ac24e6de6b648ed5a3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 16:11:17 +0200
Subject: [PATCH 291/547] [FIX] filter on lead

bzr revid: mat@openerp.com-20130418141117-sff6ly4p041eqt4n
---
 addons/gamification_sale_crm/sale_crm_goals.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 7e27e423ef0..7ca2e006697 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -21,7 +21,7 @@
             <field name="unit">leads</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
-            <field name="domain">[('user_id','=',user_id)]</field>
+            <field name="domain">[('user_id','=',user_id),('type', '=', 'lead')]</field>
         </record>
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_open">
@@ -33,7 +33,7 @@
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
-            <field name="domain">[('user_id','=',user_id)]</field>
+            <field name="domain">[('user_id','=',user_id),('type', '=', 'lead')]</field>
         </record> 
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_close">

From 8a95c92353868f4a1a53ddc27eb6bc5943c06188 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 18:05:12 +0200
Subject: [PATCH 292/547] [ADD] wizard to accept challenges

bzr revid: mat@openerp.com-20130418160512-v9tw81ddki79kwv5
---
 addons/gamification/__init__.py               |  1 -
 addons/gamification/goal.py                   |  2 +-
 addons/gamification/plan.py                   | 25 ++++++++-----
 addons/gamification/plan_view.xml             | 37 +++++++++++++++++++
 addons/gamification/res_users.py              |  5 +++
 addons/gamification/static/src/css/goal.css   | 32 +++++++++++-----
 .../static/src/js/gamification.js             | 26 ++++++++++++-
 .../static/src/xml/gamification.xml           | 25 +++++++------
 8 files changed, 119 insertions(+), 34 deletions(-)

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index 845af643db1..b7f7efeac07 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -2,4 +2,3 @@ import goal
 import plan
 import res_users
 import badge
-import badge_execute
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index f9a9cb93620..234acd4a879 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -215,7 +215,7 @@ class gamification_goal(osv.Model):
         'state': 'draft',
         'start_date': fields.date.today,
     }
-    _order = 'create_date, end_date desc, type_id'
+    _order = 'create_date, end_date desc, type_id, id'
 
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 17a0ee79c43..faa5d34b481 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -585,27 +585,34 @@ class gamification_goal_plan(osv.Model):
 
     ##### Suggestions #####
 
-    def accept_challenge(self, cr, uid, plan_id, user_id=None, context=None):
+    def accept_challenge(self, cr, uid, plan_ids, context=None, user_id=None):
         """The user accept the suggested challenge"""
         context = context or {}
         user_id = user_id or uid
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
-        self.message_post(cr, uid, plan_id, body=message, context=context)
-        self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id), 'user_id': (4, user_id)}, context=context)
-        return self.generate_goals_from_plan(cr, uid, [plan_id], context=context)
+        self.message_post(cr, uid, plan_ids, body=message, context=context)
+        self.write(cr, uid, plan_ids, {'proposed_user_ids': [(3, user_id)], 'user_id': [(4, user_id)]}, context=context)
+        return self.generate_goals_from_plan(cr, uid, plan_ids, context=context)
 
-    def discard_challenge(self, cr, uid, plan_id, user_id=None, context=None):
+    def discard_challenge(self, cr, uid, plan_ids, context=None, user_id=None):
         """The user discard the suggested challenge"""
         context = context or {}
         user_id = user_id or uid
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has refused the challenge" % user.name
-        self.message_post(cr, uid, plan_id, body=message, context=context)
-        return self.write(cr, uid, [plan_id], {'proposed_user_ids': (3, user_id)}, context=context)
+        self.message_post(cr, uid, plan_ids, body=message, context=context)
+        return self.write(cr, uid, plan_ids, {'proposed_user_ids': (3, user_id)}, context=context)
 
-    def get_suggestions_info(self, cr, uid, context=None):
-        pass
+    def reply_challenge_wizard(self, cr, uid, plan_id, context=None):
+        context = context or {}
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        result = mod_obj.get_object_reference(cr, uid, 'gamification', 'challenge_wizard')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result['res_id'] = plan_id
+        return result
 
 
 class gamification_goal_planline(osv.Model):
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 94ccc0793b2..785219d302c 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -6,6 +6,7 @@
             <field name="name">Challenges</field>
             <field name="res_model">gamification.goal.plan</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="view_id" ref="goal_plan_form_view"/>
             <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
@@ -214,5 +215,41 @@
             </field>
         </record>
 
+
+        <record id="view_challenge_wizard" model="ir.ui.view">
+            <field name="name">Challenge Wizard</field>
+            <field name="model">gamification.goal.plan</field>
+            <field name="arch" type="xml">
+                <form string="Challenge" version="7.0">
+                    <div class="oe_title">
+                        <field name="name" nolabel="1" readonly="1"/>
+                    </div>
+                    <field name="description" nolabel="1" readonly="1" />
+                    The challenge is running from <field name="start_date" class="oe_inline" readonly="1" /> to <field name="end_date" class="oe_inline" readonly="1" />
+                    <group string="Members">
+                        <field name="user_ids" nolabel="1" readonly="1" widget="many2many_tags" />
+                    </group>
+                    <group string="Reward">
+                        <field name="reward_id" readonly="1" widget="many2many_tags" />
+                        <field name="reward_first_id" readonly="1" widget="many2many_tags" />
+                        <field name="reward_second_id" readonly="1" widget="many2many_tags" />
+                        <field name="reward_third_id" readonly="1" widget="many2many_tags" />
+                    </group>
+                    <footer>
+                        <button string="Accept" type="object" name="accept_challenge" class="oe_highlight" /> or
+                        <button string="Discard" type="object" name="discard_challenge" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="challenge_wizard" model="ir.actions.act_window">
+            <field name="name">Challenge Description</field>
+            <field name="res_model">gamification.goal.plan</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_challenge_wizard"/>
+            <field name="target">new</field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 2cdf24d4c4b..8592b3f7338 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -62,9 +62,14 @@ class res_users_gamification_group(osv.Model):
                             'target_goal': planline_board['target_goal'],
                             'goals': []}
                     for goal in planline_board['board_goals']:
+                        # Keep only the Top 3 and the current user
+                        if goal[0] > 2 and goal[1].user_id.id != uid:
+                            continue
+
                         vals['goals'].append({
                             'rank': goal[0]+1,
                             'id': goal[1].id,
+                            'user_id': goal[1].user_id.id,
                             'user_name': goal[1].user_id.name,
                             'state': goal[1].state,
                             'completeness': goal[1].completeness,
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index e3dd25b67e4..360cf1d9046 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -63,17 +63,13 @@
     position: relative;
     display: inline-block;
     vertical-align: top;
-    width: 260px;
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside {
-    position: relative;
-    vertical-align: top;
+    width: 280px;
     background: #EDEDF6;
     border-radius: 2px;
 }
 .openerp .oe_mail_wall_aside > div {
     background: #EDEDF6;
-    padding: 5px 0 0 15px;
+    padding: 5px 5px 0 15px;
 }
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached,
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed {
@@ -94,14 +90,30 @@
 .oe_mail_wall_aside .oe_list_content tbody tr:nth-child(even) {
     background-color: #fff;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td,th {
+.openerp .oe_mail_wall .oe_mail_wall_aside td,
+.openerp .oe_mail_wall .oe_mail_wall_aside th {
     vertical-align: middle;
     border: none;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 40%; }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td.col2 { width: 50%; }
-/* ... and 10% left for ranking */
+.openerp .oe_mail_wall_aside .oe_list_content tbody th {
+    padding-left: 5px;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside table .col0 {
+    font-size: 150%;
+    font-weight: bold;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside table td.col0 { width: 25px; }
+.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 32px; }
 
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 32px; }
+
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
+    background: rgb(173, 219, 178);
+/*    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QQSDDgQbtbJfgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAAMSURBVAjXY2jY2AoAA2sBt0HZbqoAAAAASUVORK5CYII=);
+    background-image: url("http://lorempixel.com/20/10/");
+    background-repeat: repeat-y;
+    background-position: 0 50%;*/
+}
 .openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar {
     width: 100%;
     display: inline-block;
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 464fd1ace5a..41b6125a4c9 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -40,6 +40,20 @@ openerp.gamification = function(instance) {
                         self.get_goal_todo_info();
                     });
                 });
+            },
+            'click a.oe_challenge_reply': function(event) {
+                var self = this;
+                var plan_id = parseInt(event.currentTarget.id, 10);
+                var plan_action = new instance.web.Model('gamification.goal.plan').call('reply_challenge_wizard', [plan_id]).then(function(res) {
+                    plan_action['action'] = res;
+                });
+                $.when(plan_action).done(function() {
+                    var action_manager = new instance.web.ActionManager(this);
+                    action_manager.do_action(plan_action.action).done(function () {
+                        console.log(plan_action.action);
+                        self.get_goal_todo_info();
+                    });
+                });
             }
         },
         renderElement: function() {
@@ -65,8 +79,9 @@ openerp.gamification = function(instance) {
                 if(self.goals_info.info.length > 0){
                     self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
                     self.render_money_fields(self.goals_info.info[0].currency);
-                    self.render_progress_bars();
+                    // self.render_progress_bars();
                     self.render_piechars();
+                    self.render_user_avatars();
                 } else {
                     self.$el.filter(".oe_gamification_goal").hide();
                 }
@@ -76,7 +91,6 @@ openerp.gamification = function(instance) {
             var self = this;
             var challenge_suggestions = this.res_user.call('get_challenge_suggestions', {}).then(function(res) {
                 self.challenge_suggestions['info'] = res;
-                console.log(res);
             });
             $.when(challenge_suggestions).done(function() {
                 if(self.challenge_suggestions.info.length > 0){
@@ -125,6 +139,14 @@ openerp.gamification = function(instance) {
                 var values = [completeness, 100-completeness];
                 $(this).sparkline(values, {type: 'pie', offset: 180, sliceColors: ['#0B610B','#F78181']});
             });
+        },
+        render_user_avatars: function() {
+            var self = this;
+            self.$(".oe_user_avatar").each(function() {
+                var user_id = parseInt( $(this).attr('data-id'), 10);
+                var url = instance.session.url('/web/binary/image', {model: 'res.users', field: 'image_small', id: user_id});
+                $(this).attr("src", url);
+            });
         }
     });
 
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 22c1233d336..29114897153 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -51,12 +51,19 @@
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <th><t t-esc="goal.rank" /></th>
-                        <td class="col1"><t t-esc="goal.user_name" /></td>
-                        <td class="col2">
-                            <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
-                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
-                        </td>
+                        <div style="background:#fff;">
+                            <th class="col0"><t t-esc="goal.rank" /></th>
+                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
+                            <td class="col2" style="width:150px;">
+                                <div class="oe_goal_progress" t-attf-style="width: #{goal.completeness}%;">
+                                    <div style="width:150px;">
+                                    <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
+                                    <t t-esc="goal.user_name"/><br/>
+                                    <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                    </div>
+                                </div>
+                            </td>
+                        </div>
                     </tr>
                 </tbody>
                 </table>
@@ -68,11 +75,7 @@
         <h3>Suggested challenges</h3>
         <div t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
             <p>
-                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply">reply</a>
-                <t t-if="challenge.description.value">
-                    <br/>
-                    <em><t t-esc="challenge.description.value"/></em>
-                </t>
+                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}">reply</a>
             </p>
         </div>
     </t>

From 957ad448397b6cb99594a7ec1a639d48c716631e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 09:59:07 +0200
Subject: [PATCH 293/547] [FIX] display correct challenge view

bzr revid: mat@openerp.com-20130419075907-e02jdc1fxhk0qcsj
---
 addons/gamification/plan_view.xml | 41 +++++++++++++++++--------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 785219d302c..0737681dc6f 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -2,24 +2,6 @@
 <openerp>
     <data>
 
-        <record id="goal_plan_list_action" model="ir.actions.act_window">
-            <field name="name">Challenges</field>
-            <field name="res_model">gamification.goal.plan</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="view_id" ref="goal_plan_form_view"/>
-            <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to create a challenge. 
-                </p>
-                <p>
-                    Assign a list of goals to chosen users to evaluate them.
-                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.
-                    The goals are created for the specified users or member of the group.
-                </p>
-            </field>
-        </record>
-
         <record id="goal_plan_list_view" model="ir.ui.view">
             <field name="name">Challenges List</field>
             <field name="model">gamification.goal.plan</field>
@@ -184,6 +166,29 @@
             </field>
         </record>
 
+        <record id="goal_plan_list_action" model="ir.actions.act_window">
+            <field name="name">Challenges</field>
+            <field name="res_model">gamification.goal.plan</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a challenge. 
+                </p>
+                <p>
+                    Assign a list of goals to chosen users to evaluate them.
+                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.
+                    The goals are created for the specified users or member of the group.
+                </p>
+            </field>
+        </record>
+        <record id="goal_plan_list_action_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="act_window_id" ref="goal_plan_list_action"/>
+            <field name="view_id" ref="goal_plan_form_view"/>
+        </record>
+
         <!-- Planline -->
         <record id="goal_planline_list_view" model="ir.ui.view">
             <field name="name">Goal planline list</field>

From b7a6b6e1307eac912d88a786ba6cce1b4088e71b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 12:22:45 +0200
Subject: [PATCH 294/547] [ADD] display single kanban

bzr revid: mat@openerp.com-20130419102245-pri7z7tdyh7xe5c9
---
 addons/gamification/plan.py                  | 48 ++++++++++-
 addons/gamification/plan_view.xml            | 84 +++++++++++++++++---
 addons/gamification/static/src/css/goal.css  |  6 +-
 addons/hr_gamification/gamification_view.xml | 12 +++
 4 files changed, 136 insertions(+), 14 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index faa5d34b481..0de445c40c8 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -106,6 +106,46 @@ class gamification_goal_plan(osv.Model):
             res[plan.id] = len(plan.planline_ids)
         return res
 
+    def _reward_id_many(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the field reward_id as a many2many field"""
+        res = dict.fromkeys(ids, 0)
+        for plan in self.browse(cr, uid, ids, context):
+            if plan.reward_id:
+                res[plan.id] = [plan.reward_id.id]
+            else:
+                res[plan.id] = []
+        return res
+
+    def _reward_first_id_many(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the field reward_first_id as a many2many field"""
+        res = dict.fromkeys(ids, 0)
+        for plan in self.browse(cr, uid, ids, context):
+            if plan.reward_first_id:
+                res[plan.id] = [plan.reward_first_id.id]
+            else:
+                res[plan.id] = []
+        return res
+
+    def _reward_second_id_many(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the field reward_second_id as a many2many field"""
+        res = dict.fromkeys(ids, 0)
+        for plan in self.browse(cr, uid, ids, context):
+            if plan.reward_second_id:
+                res[plan.id] = [plan.reward_second_id.id]
+            else:
+                res[plan.id] = []
+        return res
+
+    def _reward_third_id_many(self, cr, uid, ids, field_name, arg, context=None):
+        """Return the field reward_third_id as a many2many field"""
+        res = dict.fromkeys(ids, 0)
+        for plan in self.browse(cr, uid, ids, context):
+            if plan.reward_third_id:
+                res[plan.id] = [plan.reward_third_id.id]
+            else:
+                res[plan.id] = []
+        return res
+
     _columns = {
         'name': fields.char('Challenge Name', required=True, translate=True),
         'description': fields.text('Description', translate=True),
@@ -143,7 +183,12 @@ class gamification_goal_plan(osv.Model):
         'reward_first_id': fields.many2one('gamification.badge', string="For 1st user"),
         'reward_second_id': fields.many2one('gamification.badge', string="For 2nd user"),
         'reward_third_id': fields.many2one('gamification.badge', string="For 3rd user"),
-        'reward_failure': fields.boolean('Reward Top 3 even if not succeed'),
+        'reward_failure': fields.boolean('Reward Bests if not Succeeded?'),
+        # same fields but as many2many to be able to display as kanban
+        'reward_id_many': fields.function(_reward_id_many, type="many2many", relation="gamification.badge", string="For Every Succeding User"),
+        'reward_first_id_many': fields.function(_reward_first_id_many, type="many2many", relation="gamification.badge", string="For 1st user"),
+        'reward_second_id_many': fields.function(_reward_second_id_many, type="many2many", relation="gamification.badge", string="For 2nd user"),
+        'reward_third_id_many': fields.function(_reward_third_id_many, type="many2many", relation="gamification.badge", string="For 3rd user"),
 
         'period': fields.selection([
                 ('once', 'Non recurring'),
@@ -295,6 +340,7 @@ class gamification_goal_plan(osv.Model):
             if fields.date.today() == plan.next_report_date:
                 self.report_progress(cr, uid, plan, context=context)
                 self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
+
         return True
 
     def quick_update(self, cr, uid, plan_id, context=None):
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 0737681dc6f..c41b0c37e85 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -184,6 +184,12 @@
         </record>
         <record id="goal_plan_list_action_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
+            <field name="view_mode">kanban</field>
+            <field name="act_window_id" ref="goal_plan_list_action"/>
+            <field name="view_id" ref="view_goal_plan_kanban"/>
+        </record>
+        <record id="goal_plan_list_action_view2" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="goal_plan_list_action"/>
             <field name="view_id" ref="goal_plan_form_view"/>
@@ -226,23 +232,81 @@
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <form string="Challenge" version="7.0">
+                    <field name="reward_id" invisible="1"/>
+                    <field name="reward_first_id" invisible="1"/>
+                    <field name="reward_second_id" invisible="1"/>
+                    <field name="reward_third_id" invisible="1"/>
+                    <field name="reward_failure" invisible="1"/>
                     <div class="oe_title">
-                        <field name="name" nolabel="1" readonly="1"/>
+                        <h1><field name="name" nolabel="1" readonly="1"/></h1>
                     </div>
                     <field name="description" nolabel="1" readonly="1" />
                     The challenge is running from <field name="start_date" class="oe_inline" readonly="1" /> to <field name="end_date" class="oe_inline" readonly="1" />
-                    <group string="Members">
-                        <field name="user_ids" nolabel="1" readonly="1" widget="many2many_tags" />
-                    </group>
                     <group string="Reward">
-                        <field name="reward_id" readonly="1" widget="many2many_tags" />
-                        <field name="reward_first_id" readonly="1" widget="many2many_tags" />
-                        <field name="reward_second_id" readonly="1" widget="many2many_tags" />
-                        <field name="reward_third_id" readonly="1" widget="many2many_tags" />
+                        <div class="oe_grey" attrs="{'invisible': ['|',('reward_id','!=',False),('reward_first_id','!=',False)]}">
+                            There is no reward upon completion of this challenge.
+                        </div>
+                        <group attrs="{'invisible': [('reward_id','=',False),('reward_first_id','=',False)]}">
+                            <field name="reward_id_many" readonly="1" attrs="{'invisible': [('reward_first_id','=', False)]}" widget="many2many_kanban">
+                                <kanban>
+                                    <field name="image"/>
+                                    <templates>
+                                        <t t-name="kanban-box"><div class="oe_kanban_record">
+                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
+                                            <field name="name"/>
+                                        </div></t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                            <field name="reward_first_id_many" readonly="1" attrs="{'invisible': [('reward_first_id','=', False)]}" widget="many2many_kanban">
+                                <kanban>
+                                    <field name="image"/>
+                                    <templates>
+                                        <t t-name="kanban-box"><div class="oe_kanban_record">
+                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
+                                            <field name="name"/>
+                                        </div></t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                            <field name="reward_second_id_many" readonly="1" attrs="{'invisible': [('reward_second_id','=', False)]}" widget="many2many_kanban">
+                                <kanban>
+                                    <field name="image"/>
+                                    <templates>
+                                        <t t-name="kanban-box"><div class="oe_kanban_record">
+                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
+                                            <field name="name"/>
+                                        </div></t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                            <field name="reward_third_id_many" readonly="1" attrs="{'invisible': [('reward_third_id','=', False)]}" widget="many2many_kanban">
+                                <kanban>
+                                    <field name="image"/>
+                                    <templates>
+                                        <t t-name="kanban-box"><div class="oe_kanban_record">
+                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
+                                            <field name="name"/>
+                                        </div></t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                        </group>
+                        <div class="oe_grey" attrs="{'invisible': [('reward_failure','=',False)]}">
+                            Even if the challenge is failed, best challengers will be rewarded
+                        </div>
+                    </group>
+                    <group string="Challengers">
+                        <div class="oe_grey" colspan="4">Who will you be competiting with ?</div>
+                        <field name="user_ids" string="Participating" readonly="1" widget="many2many_tags" />
+                        <field name="proposed_user_ids" string="Invited" readonly="1" widget="many2many_tags" />
                     </group>
                     <footer>
-                        <button string="Accept" type="object" name="accept_challenge" class="oe_highlight" /> or
-                        <button string="Discard" type="object" name="discard_challenge" class="oe_link"/>
+                        <center>
+                            <button string="Accept" type="object" name="accept_challenge" class="oe_highlight" />
+                            <button string="Discard" type="object" name="discard_challenge"/> or
+                            <button string="reply later" special="cancel" class="oe_link"/>
+                        </center>
                     </footer>
                 </form>
             </field>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 360cf1d9046..d8f4f7ca3fe 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -7,10 +7,10 @@
     width: 250px;
     min-height: 150px;
 }
-.oe_kanban_badge_avatars {
+.openerp .oe_kanban_badge_avatars {
     margin-top: 8px;
 }
-.oe_kanban_badge_avatars img {
+.openerp .oe_kanban_badge_avatars img {
     width: 30px;
     height: 30px;
     padding-left: 0;
@@ -18,7 +18,7 @@
     border-radius: 2px;
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
-.oe_kanban_goal .oe_goal_state_block {
+.openerp .oe_kanban_goal .oe_goal_state_block {
     width:200px;
     height:130px;
     margin: auto;
diff --git a/addons/hr_gamification/gamification_view.xml b/addons/hr_gamification/gamification_view.xml
index 59bb0a612b8..fa43895e618 100644
--- a/addons/hr_gamification/gamification_view.xml
+++ b/addons/hr_gamification/gamification_view.xml
@@ -129,6 +129,18 @@
                 </p>
             </field>
         </record>
+        <record id="goal_plan_list_action2_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">kanban</field>
+            <field name="act_window_id" ref="goal_plan_list_action2"/>
+            <field name="view_id" ref="gamification.view_goal_plan_kanban"/>
+        </record>
+        <record id="goal_plan_list_action2_view2" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="act_window_id" ref="goal_plan_list_action2"/>
+            <field name="view_id" ref="gamification.goal_plan_form_view"/>
+        </record>
 
         <menuitem id="menu_hr_gamification" parent="hr.menu_hr_root" name="Engagement" sequence="40"/>
 

From cdecfc8e4a957ca7ad07dd68d362166d162a2f5e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 12:41:23 +0200
Subject: [PATCH 295/547] [IMP] prevent drag&drop of goals

bzr revid: mat@openerp.com-20130419104123-4n6phm37216nj2u6
---
 addons/gamification/goal.py       | 6 +++++-
 addons/gamification/plan_view.xml | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 234acd4a879..3c1109ac44f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -339,7 +339,11 @@ class gamification_goal(osv.Model):
         change, a report is generated"""
 
         vals['last_update'] = fields.date.today()
+        result = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         for goal in self.browse(cr, uid, ids, context=context):
+            if goal.state != "draft" and ('type_id' in vals or 'user_id' in vals):
+                # avoid drag&drop in kanban view
+                raise osv.except_osv(_('Error!'), _('Can not modify a started goal'))
 
             if 'current' in vals:
                 if 'just_created' in context:
@@ -349,7 +353,7 @@ class gamification_goal(osv.Model):
                 if goal.plan_id and goal.plan_id.report_message_frequency == 'onchange':
                     plan_obj = self.pool.get('gamification.goal.plan')
                     plan_obj.report_progress(cr, uid, goal.plan_id, users=[goal.user_id], context=context)
-        return super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
+        return result
 
     def get_action(self, cr, uid, goal_id, context=None):
         """Get the ir.action related to update the goal
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index c41b0c37e85..e07740f02c6 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -182,6 +182,7 @@
                 </p>
             </field>
         </record>
+        <!-- Specify form view ID to avoid selecting view_challenge_wizard -->
         <record id="goal_plan_list_action_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">kanban</field>

From 263124a6f3287934b8e17f89a7f72720a4404e12 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 17:05:23 +0200
Subject: [PATCH 296/547] [ADD] check rewards for challenges

bzr revid: mat@openerp.com-20130419150523-0oyf1pav9tn552o1
---
 addons/gamification/plan.py            | 130 ++++++++++++++++++++++---
 addons/gamification/plan_view.xml      |   2 +-
 addons/hr_gamification/gamification.py |  12 ++-
 3 files changed, 127 insertions(+), 17 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 0de445c40c8..d40735c71bf 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -30,7 +30,7 @@ import logging
 _logger = logging.getLogger(__name__)
 
 
-def start_end_date_for_period(period):
+def start_end_date_for_period(period, global_start_date=False, global_end_date=False):
     """Return the start and end date for a goal period based on today
 
     :return: (start_date, end_date), datetime.date objects, False if the period is
@@ -51,8 +51,8 @@ def start_end_date_for_period(period):
         start_date = today.replace(month=1, day=1)
         end_date = today.replace(month=12, day=31)
     else:  # period == 'once':
-        start_date = False  # for manual goal, start each time
-        end_date = False
+        start_date = global_start_date  # for manual goal, start each time
+        end_date = global_end_date
 
     if start_date and end_date:
         return (start_date.isoformat(), end_date.isoformat())
@@ -293,7 +293,7 @@ class gamification_goal_plan(osv.Model):
         self.action_close(cr, uid, planned_plan_ids, context=context)
 
         if not ids:
-            ids = self.search(cr, uid, [('state', '=', 'inprogress')])
+            ids = self.search(cr, uid, [('state', '=', 'inprogress')], context=context)
 
         return self._update_all(cr, uid, ids, context=context)
 
@@ -335,12 +335,11 @@ class gamification_goal_plan(osv.Model):
             if len(closed_goals_to_report) > 0:
                 # some goals need a final report
                 self.report_progress(cr, uid, plan, subset_goal_ids=closed_goals_to_report, context=context)
-                self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
 
             if fields.date.today() == plan.next_report_date:
                 self.report_progress(cr, uid, plan, context=context)
-                self.write(cr, uid, plan.id, {'last_report_date': fields.date.today}, context=context)
 
+        self.check_challenge_reward(cr, uid, ids, context=context)
         return True
 
     def quick_update(self, cr, uid, plan_id, context=None):
@@ -363,10 +362,8 @@ class gamification_goal_plan(osv.Model):
             if plan.autojoin_group_id:
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
 
-            if len(plan.user_ids) > 0:
-                self.write(cr, uid, plan.id, {'state': 'inprogress'}, context=context)
-            else:
-                _logger.warning("Can not start planned plan, no subscribed users")
+            self.write(cr, uid, plan.id, {'state': 'inprogress'}, context=context)
+            self.message_post(cr, uid, plan.id, body="New challenge started.", context=context)
         return self.generate_goals_from_plan(cr, uid, ids, context=context)
 
     def action_check(self, cr, uid, ids, context=None):
@@ -381,6 +378,7 @@ class gamification_goal_plan(osv.Model):
 
         Change the state of the plan to in done
         Does NOT close the related goals, this is handled by the goal itself"""
+        self.check_challenge_reward(cr, uid, ids, force=True, context=context)
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def action_reset(self, cr, uid, ids, context=None):
@@ -627,9 +625,9 @@ class gamification_goal_plan(osv.Model):
                                                              body=body_html,
                                                              context=context,
                                                              subtype='mail.mt_comment')
-        return True
+        return self.write(cr, uid, plan.id, {'last_report_date': fields.date.today()}, context=context)
 
-    ##### Suggestions #####
+    ##### Challenges #####
 
     def accept_challenge(self, cr, uid, plan_ids, context=None, user_id=None):
         """The user accept the suggested challenge"""
@@ -660,6 +658,114 @@ class gamification_goal_plan(osv.Model):
         result['res_id'] = plan_id
         return result
 
+    def check_challenge_reward(self, cr, uid, plan_ids, force=False, context=None):
+        """Actions for the end of a challenge
+
+        If a reward was selected, grant it to the correct users.
+        The TOP 3 reward should be granted at:
+            - the end date for a challenge with no periodicity
+            - the end of a period for challenge with periodicity
+            - when a challenge is manually closed
+        The every success reward should be granted at:
+            - the end date for a challenge with no periodicity
+            - the end of a period for challenge with periodicity
+            - as soon as a user reach every goal of a plan
+        (can not reward TOP 3 for challenge/goals with no end date)
+        """
+        for plan in self.browse(cr, uid, plan_ids, context=context):
+            (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
+            yesterday = date.today() - timedelta(days=1)
+            if end_date == yesterday.isoformat() or force:
+                # reward everybody
+                rewarded_users = []
+                if plan.reward_id:
+                    for user in plan.user_ids:
+                        reached_goal_ids = self.pool.get('gamification.goal').search(cr, uid, [
+                            ('plan_id', '=', plan.id),
+                            ('user_id', '=', user.id),
+                            ('start_date', '=', start_date),
+                            ('end_date', '=', end_date),
+                            ('state', '=', 'reached')
+                        ], context=context)
+                        if len(reached_goal_ids) == len(plan.planline_ids):
+                            self.reward_user(cr, uid, user.id, plan.reward_id.id, context)
+                            rewarded_users.append(user)
+
+                # reward bests
+                best_users = []
+                if plan.reward_first_id:
+                    (first_user, second_user, third_user) = self.get_top3_users(cr, uid, plan, context)
+                    if first_user:
+                        self.reward_user(cr, uid, first_user.id, plan.reward_first_id.id, context)
+                        best_users.append(first_user)
+                    if second_user and plan.reward_second_id:
+                        self.reward_user(cr, uid, second_user.id, plan.reward_second_id.id, context)
+                        best_users.append(second_user)
+                    if third_user and plan.reward_third_id:
+                        self.reward_user(cr, uid, third_user.id, plan.reward_second_id.id, context)
+                        best_users.append(third_user)
+
+                print(end_date, force)
+                # open chatter message
+                message_body = "The challenge %s is finished." % plan.name
+                if rewarded_users:
+                    message_body += " Badge rewards were sent to %s." % ", ".join([user.name for user in rewarded_users])
+                if best_users:
+                    message_body += " Specials badges were sent to %s." % ", ".join([user.name for user in best_users])
+                if not rewarded_users and not best_users and (plan.reward_id or plan.reward_first_id):
+                    message_body += " No badge was granted as nobody reached the required conditions."
+                self.message_post(cr, uid, plan.id, body=message_body, context=context)
+        return True
+
+    def get_top3_users(self, cr, uid, plan, context=None):
+        """Get the top 3 users for a defined plan
+
+        Ranking criterias:
+            - succeed every goal of the challenge
+            - total completeness of each goal (can be over 100)
+        """
+        goal_obj = self.pool.get('gamification.goal')
+        (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
+        challengers = []
+        for user in plan.user_ids:
+            all_reached = True
+            total_completness = 0
+            # every goal of the user for the running period
+            goal_ids = goal_obj.search(cr, uid, [
+                ('plan_id', '=', plan.id),
+                ('user_id', '=', user.id),
+                ('start_date', '=', start_date),
+                ('end_date', '=', end_date)
+            ], context=context)
+            for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
+                if goal.state != 'reached':
+                    all_reached = False
+                if goal.type_condition == 'higher':
+                    # can be over 100
+                    total_completness += 100.0 * goal.current / goal.target_goal
+                elif goal.state == 'reached':
+                    # for lower goals, can not get percentage so 0 or 100
+                    total_completness += 100
+
+            challengers.append({'user': user, 'all_reached': all_reached, 'total_completness': total_completness})
+        sorted_challengers = sorted(challengers, key=lambda k: (k['all_reached'], k['total_completness']), reverse=True)
+        print(sorted_challengers)
+        if len(sorted_challengers) == 0 or (not plan.reward_failure and not sorted_challengers[0]['all_reached']):
+            # nobody succeeded
+            return (False, False, False)
+        if len(sorted_challengers) == 1 or (not plan.reward_failure and not sorted_challengers[1]['all_reached']):
+            # only one user succeeded
+            return (sorted_challengers[0]['user'], False, False)
+        if len(sorted_challengers) == 2 or (not plan.reward_failure and not sorted_challengers[2]['all_reached']):
+            # only one user succeeded
+            return (sorted_challengers[0]['user'], sorted_challengers[1]['user'], False)
+        return (sorted_challengers[0]['user'], sorted_challengers[1]['user'], sorted_challengers[2]['user'])
+
+    def reward_user(self, cr, uid, user_id, badge_id, context=None):
+        """Create a badge user and send the badge to him"""
+        user_badge_id = self.pool.get('gamification.badge.user').create(cr, uid, {'user_id': user_id, 'badge_id': badge_id}, context=context)
+        return self.pool.get('gamification.badge').send_badge(cr, uid, badge_id, [user_badge_id], context=context)
+
 
 class gamification_goal_planline(osv.Model):
     """Gamification goal planline
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index e07740f02c6..394d70578b6 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -298,7 +298,7 @@
                         </div>
                     </group>
                     <group string="Challengers">
-                        <div class="oe_grey" colspan="4">Who will you be competiting with ?</div>
+                        <div class="oe_grey" colspan="4">Who will you be competiting with ?<br/><br/></div>
                         <field name="user_ids" string="Participating" readonly="1" widget="many2many_tags" />
                         <field name="proposed_user_ids" string="Invited" readonly="1" widget="many2many_tags" />
                     </group>
diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/gamification.py
index 43a9a97f94d..3d07ca1b4f8 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/gamification.py
@@ -148,10 +148,14 @@ class hr_employee(osv.osv):
         """Return the list of badge_users assigned to the employee"""
         res = {}
         for employee in self.browse(cr, uid, ids, context=context):
-            if len(self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)) > 0:
-                res[employee.id] = True
-            else:
-                res[employee.id] = False
+            employee_badge_ids = self.pool.get('gamification.badge.user').search(cr, uid, [
+                '|',
+                    ('employee_id', '=', employee.id),
+                    '&',
+                        ('employee_id', '=', False),
+                        ('user_id', '=', employee.user_id.id)
+                ], context=context)
+            res[employee.id] = len(employee_badge_ids) > 0
         return res
 
     _columns = {

From 4fb6e9b682901e02e615936c75bbe8ca6cee8b8b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 17:48:17 +0200
Subject: [PATCH 297/547] [IMP] display user's badges on employee

bzr revid: mat@openerp.com-20130419154817-rq09s1f5nl6ryhka
---
 addons/gamification/plan.py                         | 2 +-
 addons/gamification/static/src/css/goal.css         | 5 +----
 addons/gamification/static/src/xml/gamification.xml | 2 +-
 addons/hr_gamification/gamification.py              | 8 +++++++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index d40735c71bf..8df348b1af9 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -764,7 +764,7 @@ class gamification_goal_plan(osv.Model):
     def reward_user(self, cr, uid, user_id, badge_id, context=None):
         """Create a badge user and send the badge to him"""
         user_badge_id = self.pool.get('gamification.badge.user').create(cr, uid, {'user_id': user_id, 'badge_id': badge_id}, context=context)
-        return self.pool.get('gamification.badge').send_badge(cr, uid, badge_id, [user_badge_id], context=context)
+        return self.pool.get('gamification.badge').send_badge(cr, uid, badge_id, [user_badge_id], user_from=None, context=context)
 
 
 class gamification_goal_planline(osv.Model):
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index d8f4f7ca3fe..e481a800c79 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -107,12 +107,9 @@
 
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 32px; }
 
+/* background progress bar */
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
     background: rgb(173, 219, 178);
-/*    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QQSDDgQbtbJfgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAAMSURBVAjXY2jY2AoAA2sBt0HZbqoAAAAASUVORK5CYII=);
-    background-image: url("http://lorempixel.com/20/10/");
-    background-repeat: repeat-y;
-    background-position: 0 50%;*/
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar {
     width: 100%;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 29114897153..c6946d6397d 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -51,7 +51,7 @@
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div style="background:#fff;">
+                        <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
                             <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
                             <td class="col2" style="width:150px;">
diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/gamification.py
index 3d07ca1b4f8..bbda1e23ab1 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/gamification.py
@@ -141,7 +141,13 @@ class hr_employee(osv.osv):
         """Return the list of badge_users assigned to the employee"""
         res = {}
         for employee in self.browse(cr, uid, ids, context=context):
-            res[employee.id] = self.pool.get('gamification.badge.user').search(cr, uid, [('employee_id', '=', employee.id)], context=context)
+            res[employee.id] = self.pool.get('gamification.badge.user').search(cr, uid, [
+                '|',
+                    ('employee_id', '=', employee.id),
+                    '&',
+                        ('employee_id', '=', False),
+                        ('user_id', '=', employee.user_id.id)
+                ], context=context)
         return res
 
     def _has_badges(self, cr, uid, ids, field_name, arg, context=None):

From 0ea778bc0da0c074406ac3a1adc1856b846ae63f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 17:53:42 +0200
Subject: [PATCH 298/547] [IMP] display progressbar in indivial mode

bzr revid: mat@openerp.com-20130419155342-776hyozede04zgz7
---
 addons/gamification/static/src/xml/gamification.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index c6946d6397d..428342e08b6 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,9 +9,10 @@
             <h3><t t-esc="plan.name" /></h3>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
-                <ul class="oe_goals_list">
-                <li t-foreach="plan.goals" t-as="goal">
-                    <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
+                <ul class="oe_goals_list" style="width:200px;">
+                <li t-foreach="plan.goals" t-as="goal" t-attf-style="width: #{goal.completeness}%;" class="oe_goal_progress">
+                    <div style="width:200px;">
+                    <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
@@ -33,6 +34,7 @@
                             </p>
                         </t>
                     </t>
+                    </div>
                 </li>
                 </ul>
             </t>

From 38f205ef32a1acd3d5712d203c5f18d2d0805c95 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 11:32:36 +0200
Subject: [PATCH 299/547] [IMP] more consistent display of challenges

bzr revid: mat@openerp.com-20130422093236-y76ad91yoyemejxa
---
 addons/gamification/plan.py                   | 29 +++----
 addons/gamification/plan_view.xml             | 14 ++++
 addons/gamification/static/src/css/goal.css   | 78 ++++++++++++-------
 .../static/src/xml/gamification.xml           | 76 +++++++++---------
 4 files changed, 115 insertions(+), 82 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 8df348b1af9..4a47987e59d 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -158,10 +158,6 @@ class gamification_goal_plan(osv.Model):
             required=True),
         'manager_id': fields.many2one('res.users',
             string='Responsible', help="The user responsible for the challenge."),
-        'start_date': fields.date('Start Date',
-            help="The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."),
-        'end_date': fields.date('End Date',
-            help="The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."),
 
         'user_ids': fields.many2many('res.users', 'user_ids',
             string='Users',
@@ -170,6 +166,21 @@ class gamification_goal_plan(osv.Model):
             string='Auto-subscription Group',
             help='Group of users whose members will automatically be added to the users'),
 
+        'period': fields.selection([
+                ('once', 'Non recurring'),
+                ('daily', 'Daily'),
+                ('weekly', 'Weekly'),
+                ('monthly', 'Monthly'),
+                ('yearly', 'Yearly')
+            ],
+            string='Periodicity',
+            help='Period of automatic goal assigment. If none is selected, should be launched manually.',
+            required=True),
+        'start_date': fields.date('Start Date',
+            help="The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."),
+        'end_date': fields.date('End Date',
+            help="The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."),
+
         'proposed_user_ids': fields.many2many('res.users', 'proposed_user_ids',
             string="Suggest to users"),
 
@@ -190,16 +201,6 @@ class gamification_goal_plan(osv.Model):
         'reward_second_id_many': fields.function(_reward_second_id_many, type="many2many", relation="gamification.badge", string="For 2nd user"),
         'reward_third_id_many': fields.function(_reward_third_id_many, type="many2many", relation="gamification.badge", string="For 3rd user"),
 
-        'period': fields.selection([
-                ('once', 'Non recurring'),
-                ('daily', 'Daily'),
-                ('weekly', 'Weekly'),
-                ('monthly', 'Monthly'),
-                ('yearly', 'Yearly')
-            ],
-            string='Periodicity',
-            help='Period of automatic goal assigment. If none is selected, should be launched manually.',
-            required=True),
         'visibility_mode': fields.selection([
                 ('progressbar', 'Individual Goals'),
                 ('board', 'Leader Board (Group Ranking)'),
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 394d70578b6..4f2e71ad0bd 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -242,7 +242,21 @@
                         <h1><field name="name" nolabel="1" readonly="1"/></h1>
                     </div>
                     <field name="description" nolabel="1" readonly="1" />
+                    <div attrs="{'invisible': ['|',('start_date','!=', False),('end_date','!=', False)]}" class="oe_grey">
+                        This  challenge has no starting and end date specified, it will be closed 
+                    </div>
                     The challenge is running from <field name="start_date" class="oe_inline" readonly="1" /> to <field name="end_date" class="oe_inline" readonly="1" />
+                    <group string="Goals">
+                        <field name="planline_ids" nolabel="1" readonly="1" colspan="4">
+                            <tree string="Planline List" version="7.0" editable="bottom" >
+                                <field name="sequence" widget="handle"/>
+                                <field name="type_id"/>
+                                <field name="type_condition"/>
+                                <field name="target_goal"/>
+                                <field name="type_full_suffix"/>
+                            </tree>
+                        </field>
+                    </group>
                     <group string="Reward">
                         <div class="oe_grey" attrs="{'invisible': ['|',('reward_id','!=',False),('reward_first_id','!=',False)]}">
                             There is no reward upon completion of this challenge.
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index e481a800c79..c113ac6ad2e 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -71,23 +71,49 @@
     background: #EDEDF6;
     padding: 5px 5px 0 15px;
 }
-.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached,
+.openerp .oe_mail_wall_aside h3 {
+    font-size: 1.3em;
+    margin-left: -7px;
+    font-variant: small-caps;
+    text-transform: capitalize;
+    line-height: 1em;
+}
+/* mark goal as completed */
+.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached {
+    /*text-decoration: line-through;*/
+    color: rgb(17, 95, 17);
+}
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed {
-    text-decoration: line-through;
+    color: rgb(95, 17, 17);
 }
 
-.openerp .oe_mail_wall .oe_mail_wall_aside ul {
+.openerp .oe_mail_wall_aside .oe_goals_list {
     list-style-type: none; 
-    padding-left: 20px;
+    padding-left: 15px;
     margin-bottom: 15px;
+    width: 200px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside li {
-    margin-bottom: 15px;
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box {
+    background: rgb(173, 219, 178);
+    min-height: 32px;
+}
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box {
+    display: inline-block;
+    width: 200px;
+    min-height: 32px;
+    vertical-align: middle;
+    border: solid 1px white;
+}
+.openerp .oe_mail_wall_aside table.oe_goals_list .oe_goal_inner_box {
+    border: none;
+}
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong {
+    padding-left: 5px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table {
     margin: 10px 0;
 }
-.oe_mail_wall_aside .oe_list_content tbody tr:nth-child(even) {
+.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
     background-color: #fff;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside td,
@@ -95,41 +121,33 @@
     vertical-align: middle;
     border: none;
 }
-.openerp .oe_mail_wall_aside .oe_list_content tbody th {
+.openerp .oe_mail_wall_aside .oe_goals_list thead th {
+    padding: 5px;
+}
+.openerp .oe_mail_wall_aside .oe_goals_list tbody tr {
+    height: 32px;
+}
+.openerp .oe_mail_wall_aside .oe_goals_list tbody th {
     padding-left: 5px;
+    height: 32px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table .col0 {
-    font-size: 150%;
+    font-size: 160%;
     font-weight: bold;
+    width: 24px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td.col0 { width: 25px; }
-.openerp .oe_mail_wall .oe_mail_wall_aside table td.col1 { width: 32px; }
-
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar { width: 32px; }
-
-/* background progress bar */
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
-    background: rgb(173, 219, 178);
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside table progress,.oe_form_field_progressbar {
-    width: 100%;
-    display: inline-block;
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside li progress,.oe_form_field_progressbar {
-    width: 80%;
-    display: inline-block;
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside li p {
-    margin:5px 0;
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar {
+    width: 32px;
+    padding-right: 5px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action {
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box .oe_goal_action {
     visibility: hidden;
     display: block;
     float: right;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover > .oe_update_plan,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover .oe_goal_action {
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action {
     visibility: visible;
 }
 .openerp .oe_mail_wall .oe_mail {
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 428342e08b6..e3782a7d22b 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,42 +4,41 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
+        <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
             <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-            <h3><t t-esc="plan.name" /></h3>
+            <h4><t t-esc="plan.name" /></h4>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
-                <ul class="oe_goals_list" style="width:200px;">
-                <li t-foreach="plan.goals" t-as="goal" t-attf-style="width: #{goal.completeness}%;" class="oe_goal_progress">
-                    <div style="width:200px;">
-                    <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
-                    <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
-                    <t t-if="goal.computation_mode == 'manually' or goal.type_action">
-                        <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
-                    </t>
-                    <t t-if="goal.type_display == 'progress'">
-                        <t t-if="goal.type_condition == 'higher'">
-                            <p>
-                                <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            </p>
-                            <!-- <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p> -->
+                <div class="oe_goals_list">
+                    <div class="oe_goal_outer_box" t-foreach="plan.goals" t-as="goal" t-attf-style="width: #{goal.completeness}%;">
+                    <div class="oe_goal_inner_box">
+                        <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
+                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
+                        <t t-if="goal.computation_mode == 'manually' or goal.type_action">
+                            <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
                         </t>
-                        <t t-if="goal.type_condition == 'lower'">
-                            <p>
-                                <t t-esc="goal.current" /> (less than 
-                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+
+                        <t t-if="goal.type_display == 'progress'">
+                            <t t-if="goal.type_condition == 'higher'">
+                                    <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                     <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                                )
-                            </p>
+                            </t>
+                            <t t-if="goal.type_condition == 'lower'">
+                                
+                                    <t t-esc="goal.current" /> (less than 
+                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                    )
+                                
+                            </t>
                         </t>
-                    </t>
                     </div>
-                </li>
-                </ul>
+                    </div>
+                </div>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
-                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline" class="oe_list_content">
+                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
                     <thead>
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
@@ -55,14 +54,14 @@
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
-                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col2" style="width:150px;">
-                                <div class="oe_goal_progress" t-attf-style="width: #{goal.completeness}%;">
-                                    <div style="width:150px;">
+                            <td><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
+                            <td class="col1" style="width:200px;">
+                                <div class="oe_goal_outer_box" t-attf-style="width: #{goal.completeness}%;">
+                                <div class="oe_goal_inner_box">
                                     <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
-                                    <t t-esc="goal.user_name"/><br/>
+                                    <t t-esc="goal.user_name"/>
                                     <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
-                                    </div>
+                                </div>
                                 </div>
                             </td>
                         </div>
@@ -74,12 +73,13 @@
     </t>
 
     <t t-name="gamification.challenge_suggestions">
-        <h3>Suggested challenges</h3>
-        <div t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
-            <p>
-                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}">reply</a>
-            </p>
-        </div>
+        <h3>Suggestions</h3>
+        <em>You have been invited to the following challenges:</em>
+        <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
+            <li>
+                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}">accept?</a>
+            </li>
+        </ul>
     </t>
 
 </templates>

From 4ed53ad39e92f4f7d09e974e0f86ac9b2402a48b Mon Sep 17 00:00:00 2001
From: "Somesh Khare (OpenERP)" <skh@openerp.com>
Date: Mon, 22 Apr 2013 18:19:43 +0530
Subject: [PATCH 300/547] [FIX]hr_holidays, hr_timesheet: XMLSyntaxError Error
 occurred when company name have ampersand '&' sign (Case: Ref 591630)

bzr revid: skh@openerp.com-20130422124943-04zhbhbj9snvikqv
---
 addons/hr_holidays/report/holidays_summary_report.py | 2 +-
 addons/hr_timesheet/report/users_timesheet.py        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index f60d7a3ee1c..f5bc6271b90 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -96,7 +96,7 @@ class report_custom(report_rml):
         res=cr.fetchone()[0]
         date_xml=[]
         date_today=time.strftime('%Y-%m-%d %H:%M:%S')
-        date_xml +=['<res name="%s" today="%s" />' % (res,date_today)]
+        date_xml +=['<res name="%s" today="%s" />' % (to_xml(res),date_today)]
 
         cr.execute("SELECT id, name, color_name FROM hr_holidays_status ORDER BY id")
         legend=cr.fetchall()
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 4827994f2cd..a7bb81cb81f 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -27,6 +27,7 @@ from openerp import pooler
 from openerp.tools.translate import _
 from openerp.report import report_sxw
 from openerp.tools import ustr
+from openerp.tools import to_xml
 
 
 def lengthmonth(year, month):
@@ -104,7 +105,7 @@ class report_custom(report_rml):
         <date>%s</date>
         <company>%s</company>
         </header>
-        '''  % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)
+        '''  % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name))
 
         xml='''<?xml version="1.0" encoding="UTF-8" ?>
         <report>

From 8b400f7e883a0bcee2cd29c7539f786a084b40f5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 15:33:55 +0200
Subject: [PATCH 301/547] [IMP] remove many2many display and clean ups

bzr revid: mat@openerp.com-20130422133355-ffhglxrkdia2hz4j
---
 addons/gamification/__openerp__.py            |  1 -
 addons/gamification/goal.py                   | 16 +++--
 addons/gamification/goal_base_data.xml        |  2 +-
 addons/gamification/plan.py                   | 51 --------------
 addons/gamification/plan_view.xml             | 69 +++----------------
 addons/gamification/static/src/css/goal.css   | 16 +++--
 .../static/src/js/gamification.js             | 25 -------
 .../static/src/xml/gamification.xml           | 18 +++--
 .../gamification_sale_crm/sale_crm_goals.xml  |  6 --
 .../sale_crm_goals_demo.xml                   | 10 ---
 10 files changed, 40 insertions(+), 174 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index e966d9f3bad..5946e81224f 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -57,7 +57,6 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
     'js': [
         'static/src/js/gamification.js',
         'static/src/js/justgage.js',
-        'static/src/js/jquery.sparkline.2.1.1.min.js',
     ],
     'qweb': ['static/src/xml/gamification.xml'],
 }
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 3c1109ac44f..2377f5843c9 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -138,11 +138,17 @@ class gamification_goal(osv.Model):
         """Return the percentage of completeness of the goal, between 0 and 100"""
         res = {}
         for goal in self.browse(cr, uid, ids, context):
-            if goal.current > 0:
-                res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
-            else:
-                res[goal.id] = 0.0
-
+            # if goal.computation_mode == 'higher':
+                if goal.current > 0:
+                    res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
+                else:
+                    res[goal.id] = 0.0
+            # else:
+            #     # a goal 'lower than' has only two values possible: 0 or 100%
+            #     if goal.current < goal.target_goal:
+            #         res[goal.id] = 100.0
+            #     else:
+            #         res[goal.id] = 0.0
         return res
 
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index afd278e92a5..b1958475ce8 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -59,7 +59,7 @@
 
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_base_discover">
-            <field name="name">Discover OpenERP</field>
+            <field name="name">Set up your Profile</field>
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 4a47987e59d..5f75d8ecda4 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -106,46 +106,6 @@ class gamification_goal_plan(osv.Model):
             res[plan.id] = len(plan.planline_ids)
         return res
 
-    def _reward_id_many(self, cr, uid, ids, field_name, arg, context=None):
-        """Return the field reward_id as a many2many field"""
-        res = dict.fromkeys(ids, 0)
-        for plan in self.browse(cr, uid, ids, context):
-            if plan.reward_id:
-                res[plan.id] = [plan.reward_id.id]
-            else:
-                res[plan.id] = []
-        return res
-
-    def _reward_first_id_many(self, cr, uid, ids, field_name, arg, context=None):
-        """Return the field reward_first_id as a many2many field"""
-        res = dict.fromkeys(ids, 0)
-        for plan in self.browse(cr, uid, ids, context):
-            if plan.reward_first_id:
-                res[plan.id] = [plan.reward_first_id.id]
-            else:
-                res[plan.id] = []
-        return res
-
-    def _reward_second_id_many(self, cr, uid, ids, field_name, arg, context=None):
-        """Return the field reward_second_id as a many2many field"""
-        res = dict.fromkeys(ids, 0)
-        for plan in self.browse(cr, uid, ids, context):
-            if plan.reward_second_id:
-                res[plan.id] = [plan.reward_second_id.id]
-            else:
-                res[plan.id] = []
-        return res
-
-    def _reward_third_id_many(self, cr, uid, ids, field_name, arg, context=None):
-        """Return the field reward_third_id as a many2many field"""
-        res = dict.fromkeys(ids, 0)
-        for plan in self.browse(cr, uid, ids, context):
-            if plan.reward_third_id:
-                res[plan.id] = [plan.reward_third_id.id]
-            else:
-                res[plan.id] = []
-        return res
-
     _columns = {
         'name': fields.char('Challenge Name', required=True, translate=True),
         'description': fields.text('Description', translate=True),
@@ -195,11 +155,6 @@ class gamification_goal_plan(osv.Model):
         'reward_second_id': fields.many2one('gamification.badge', string="For 2nd user"),
         'reward_third_id': fields.many2one('gamification.badge', string="For 3rd user"),
         'reward_failure': fields.boolean('Reward Bests if not Succeeded?'),
-        # same fields but as many2many to be able to display as kanban
-        'reward_id_many': fields.function(_reward_id_many, type="many2many", relation="gamification.badge", string="For Every Succeding User"),
-        'reward_first_id_many': fields.function(_reward_first_id_many, type="many2many", relation="gamification.badge", string="For 1st user"),
-        'reward_second_id_many': fields.function(_reward_second_id_many, type="many2many", relation="gamification.badge", string="For 2nd user"),
-        'reward_third_id_many': fields.function(_reward_third_id_many, type="many2many", relation="gamification.badge", string="For 3rd user"),
 
         'visibility_mode': fields.selection([
                 ('progressbar', 'Individual Goals'),
@@ -261,12 +216,6 @@ class gamification_goal_plan(osv.Model):
             if new_group:
                 self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
 
-        if 'proposed_user_ids' in vals:
-            for plan in self.browse(cr, uid, ids, context=context):
-                puser_ids = [puser.id for puser in plan.proposed_user_ids]
-                if len([user for user in plan.user_ids if user.id in puser_ids]) > 0:
-                    raise osv.except_osv(_('Error!'), _('Can not propose a challenge to an user already assigned to it'))
-
         return write_res
 
     ##### Update #####
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index 4f2e71ad0bd..b1e79fa8ba5 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -233,19 +233,17 @@
             <field name="model">gamification.goal.plan</field>
             <field name="arch" type="xml">
                 <form string="Challenge" version="7.0">
-                    <field name="reward_id" invisible="1"/>
-                    <field name="reward_first_id" invisible="1"/>
-                    <field name="reward_second_id" invisible="1"/>
-                    <field name="reward_third_id" invisible="1"/>
                     <field name="reward_failure" invisible="1"/>
                     <div class="oe_title">
                         <h1><field name="name" nolabel="1" readonly="1"/></h1>
                     </div>
                     <field name="description" nolabel="1" readonly="1" />
-                    <div attrs="{'invisible': ['|',('start_date','!=', False),('end_date','!=', False)]}" class="oe_grey">
-                        This  challenge has no starting and end date specified, it will be closed 
-                    </div>
-                    The challenge is running from <field name="start_date" class="oe_inline" readonly="1" /> to <field name="end_date" class="oe_inline" readonly="1" />
+                    <group>
+                        <field name="start_date" readonly="1" />
+                        <field name="end_date" readonly="1" />
+                        <field name="user_ids" string="Participating" readonly="1" widget="many2many_tags" />
+                        <field name="proposed_user_ids" string="Invited" readonly="1" widget="many2many_tags" />
+                    </group>
                     <group string="Goals">
                         <field name="planline_ids" nolabel="1" readonly="1" colspan="4">
                             <tree string="Planline List" version="7.0" editable="bottom" >
@@ -262,64 +260,19 @@
                             There is no reward upon completion of this challenge.
                         </div>
                         <group attrs="{'invisible': [('reward_id','=',False),('reward_first_id','=',False)]}">
-                            <field name="reward_id_many" readonly="1" attrs="{'invisible': [('reward_first_id','=', False)]}" widget="many2many_kanban">
-                                <kanban>
-                                    <field name="image"/>
-                                    <templates>
-                                        <t t-name="kanban-box"><div class="oe_kanban_record">
-                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
-                                            <field name="name"/>
-                                        </div></t>
-                                    </templates>
-                                </kanban>
-                            </field>
-                            <field name="reward_first_id_many" readonly="1" attrs="{'invisible': [('reward_first_id','=', False)]}" widget="many2many_kanban">
-                                <kanban>
-                                    <field name="image"/>
-                                    <templates>
-                                        <t t-name="kanban-box"><div class="oe_kanban_record">
-                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
-                                            <field name="name"/>
-                                        </div></t>
-                                    </templates>
-                                </kanban>
-                            </field>
-                            <field name="reward_second_id_many" readonly="1" attrs="{'invisible': [('reward_second_id','=', False)]}" widget="many2many_kanban">
-                                <kanban>
-                                    <field name="image"/>
-                                    <templates>
-                                        <t t-name="kanban-box"><div class="oe_kanban_record">
-                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
-                                            <field name="name"/>
-                                        </div></t>
-                                    </templates>
-                                </kanban>
-                            </field>
-                            <field name="reward_third_id_many" readonly="1" attrs="{'invisible': [('reward_third_id','=', False)]}" widget="many2many_kanban">
-                                <kanban>
-                                    <field name="image"/>
-                                    <templates>
-                                        <t t-name="kanban-box"><div class="oe_kanban_record">
-                                            <div class="oe_kanban_badge_avatars"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="32" height="32" /></div>
-                                            <field name="name"/>
-                                        </div></t>
-                                    </templates>
-                                </kanban>
-                            </field>
+                            <field name="reward_id" readonly="1" attrs="{'invisible': [('reward_first_id','=', False)]}" />
+                            <field name="reward_first_id" readonly="1" attrs="{'invisible': [('reward_first_id','=', False)]}" />
+                            <field name="reward_second_id" readonly="1" attrs="{'invisible': [('reward_second_id','=', False)]}" />
+                            <field name="reward_third_id" readonly="1" attrs="{'invisible': [('reward_third_id','=', False)]}" />
                         </group>
                         <div class="oe_grey" attrs="{'invisible': [('reward_failure','=',False)]}">
                             Even if the challenge is failed, best challengers will be rewarded
                         </div>
                     </group>
-                    <group string="Challengers">
-                        <div class="oe_grey" colspan="4">Who will you be competiting with ?<br/><br/></div>
-                        <field name="user_ids" string="Participating" readonly="1" widget="many2many_tags" />
-                        <field name="proposed_user_ids" string="Invited" readonly="1" widget="many2many_tags" />
-                    </group>
                     <footer>
                         <center>
                             <button string="Accept" type="object" name="accept_challenge" class="oe_highlight" />
-                            <button string="Discard" type="object" name="discard_challenge"/> or
+                            <button string="Reject" type="object" name="discard_challenge"/> or
                             <button string="reply later" special="cancel" class="oe_link"/>
                         </center>
                     </footer>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index c113ac6ad2e..c4f74aae557 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -80,11 +80,8 @@
 }
 /* mark goal as completed */
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached {
-    /*text-decoration: line-through;*/
-    color: rgb(17, 95, 17);
-}
-.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_failed {
-    color: rgb(95, 17, 17);
+    text-decoration: line-through;
+    color: rgb(138, 137, 137);
 }
 
 .openerp .oe_mail_wall_aside .oe_goals_list {
@@ -94,7 +91,7 @@
     width: 200px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box {
-    background: rgb(173, 219, 178);
+    background: rgb(213, 213, 213);
     min-height: 32px;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box {
@@ -110,8 +107,12 @@
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong {
     padding-left: 5px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside table {
+.openerp .oe_mail_wall .oe_mail_wall_aside table.oe_goals_list {
     margin: 10px 0;
+    border: solid 1px white;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list thead {
+    font-weight: normal;
 }
 .oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
     background-color: #fff;
@@ -122,6 +123,7 @@
     border: none;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list thead th {
+    font-weight: normal;
     padding: 5px;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list tbody tr {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 41b6125a4c9..edfc304f83f 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -79,8 +79,6 @@ openerp.gamification = function(instance) {
                 if(self.goals_info.info.length > 0){
                     self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
                     self.render_money_fields(self.goals_info.info[0].currency);
-                    // self.render_progress_bars();
-                    self.render_piechars();
                     self.render_user_avatars();
                 } else {
                     self.$el.filter(".oe_gamification_goal").hide();
@@ -117,29 +115,6 @@ openerp.gamification = function(instance) {
                 money_field.replace($(this));
             });
         },
-        render_progress_bars: function() {
-            var self = this;
-
-            dfm = new instance.web.form.DefaultFieldManager(self);
-            // Generate a FieldMonetary for each .oe_goal_field_monetary
-            self.$(".oe_goal_progress").each(function() {
-                progress_field = new instance.web.form.FieldProgressBar(dfm, {
-                    attrs: {
-                        modifiers: '{"readonly": true}'
-                    }
-                });
-                progress_field.set('value', $(this).attr('value'));
-                progress_field.replace($(this));
-            });
-        },
-        render_piechars: function() {
-            var self = this;
-            self.$(".oe_goal_sparkline_piechart").each(function() {
-                var completeness = parseInt( $(this).attr('data-completeness'), 10);
-                var values = [completeness, 100-completeness];
-                $(this).sparkline(values, {type: 'pie', offset: 180, sliceColors: ['#0B610B','#F78181']});
-            });
-        },
         render_user_avatars: function() {
             var self = this;
             self.$(".oe_user_avatar").each(function() {
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index e3782a7d22b..c83862af829 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -11,13 +11,12 @@
 
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <div class="oe_goals_list">
-                    <div class="oe_goal_outer_box" t-foreach="plan.goals" t-as="goal" t-attf-style="width: #{goal.completeness}%;">
+                    <div t-attf-class="#{goal.type_display == 'progress' ? 'oe_goal_outer_box' : ''}" t-foreach="plan.goals" t-as="goal" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : ''}">
                     <div class="oe_goal_inner_box">
-                        <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
-                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
+                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
                         <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                             <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
-                        </t>
+                        </t><br/>
 
                         <t t-if="goal.type_display == 'progress'">
                             <t t-if="goal.type_condition == 'higher'">
@@ -38,11 +37,11 @@
                 </div>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
-                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
+                <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
                     <thead>
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <t t-esc="planline.type_name"/>
+                            <strong><t t-esc="planline.type_name"/></strong><br/>
                             (Goal: max <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
@@ -55,11 +54,10 @@
                         <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
                             <td><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col1" style="width:200px;">
+                            <td class="col1" style="width:180px;">
                                 <div class="oe_goal_outer_box" t-attf-style="width: #{goal.completeness}%;">
                                 <div class="oe_goal_inner_box">
-                                    <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
-                                    <t t-esc="goal.user_name"/>
+                                    <t t-esc="goal.user_name"/><br/>
                                     <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
                                 </div>
                                 </div>
@@ -77,7 +75,7 @@
         <em>You have been invited to the following challenges:</em>
         <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
             <li>
-                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}">accept?</a>
+                <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>
             </li>
         </ul>
     </t>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 7ca2e006697..1977ed80c33 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -124,7 +124,6 @@
 
 
 
-
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_crm_sale">
             <field name="name">Monthly Sales Targets</field>
@@ -150,11 +149,6 @@
             <field name="target_goal">20000</field>
             <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
-        <record model="gamification.goal.planline" id="planline_crm_sale5">
-            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
-            <field name="target_goal">4</field>
-            <field name="plan_id" eval="ref('plan_crm_sale')" />
-        </record>
 
 
         <record model="gamification.goal.planline" id="planline_crm_marketing1">
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index 679d80e3472..f38e1ae75bf 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -18,16 +18,6 @@
             <field name="target_goal">2000</field>
             <field name="state">inprogress</field>
         </record>
-
-        <record model="gamification.goal" id="goal_crm_sale5">
-            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
-            <field name="user_id" eval="ref('base.user_demo')" />
-            <field name="planline_id" eval="ref('planline_crm_sale5')" />
-            <field name="start_date" eval="time.strftime('2013-03-01')" />
-            <field name="end_date" eval="time.strftime('2013-03-31')" />
-            <field name="target_goal">4</field>
-            <field name="state">inprogress</field>
-        </record>
         
     </data>
 </openerp>

From c76b9fb8e874e18fe9f2f34436125a94d944569e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 15:55:40 +0200
Subject: [PATCH 302/547] [IMP] remove unused sparklines and display actions

bzr revid: mat@openerp.com-20130422135540-9ozlret4qjz6ivcq
---
 addons/gamification/static/src/css/goal.css   | 16 ++++++++-------
 .../src/js/jquery.sparkline.2.1.1.min.js      |  5 -----
 .../static/src/xml/gamification.xml           | 20 ++++++++++++-------
 3 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index c4f74aae557..fa6c9e096ab 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -117,8 +117,8 @@
 .oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
     background-color: #fff;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside td,
-.openerp .oe_mail_wall .oe_mail_wall_aside th {
+.openerp .oe_mail_wall_aside td,
+.openerp .oe_mail_wall_aside th {
     vertical-align: middle;
     border: none;
 }
@@ -133,22 +133,24 @@
     padding-left: 5px;
     height: 32px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside table .col0 {
+.openerp .oe_mail_wall_aside table.oe_goals_list .col0 {
     font-size: 160%;
     font-weight: bold;
     width: 24px;
 }
+.openerp .oe_mail_wall_aside table.oe_goals_list .col1 {
+    width: 200px;
+}
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar {
     width: 32px;
     padding-right: 5px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box .oe_goal_action {
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action {
     visibility: hidden;
-    display: block;
-    float: right;
+    font-size: 25px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal:hover > .oe_update_plan,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_clear:hover .oe_update_plan,
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action {
     visibility: visible;
 }
diff --git a/addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js b/addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js
deleted file mode 100644
index 74187063f45..00000000000
--- a/addons/gamification/static/src/js/jquery.sparkline.2.1.1.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* jquery.sparkline 2.1.1 - http://omnipotent.net/jquery.sparkline/ 
-** Licensed under the New BSD License - see above site for details */
-
-(function(a){typeof define=="function"&&define.amd?define(["jquery"],a):a(jQuery)})(function(a){"use strict";var b={},c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I=0;c=function(){return{common:{type:"line",lineColor:"#00f",fillColor:"#cdf",defaultPixelsPerValue:3,width:"auto",height:"auto",composite:!1,tagValuesAttribute:"values",tagOptionsPrefix:"spark",enableTagOptions:!1,enableHighlight:!0,highlightLighten:1.4,tooltipSkipNull:!0,tooltipPrefix:"",tooltipSuffix:"",disableHiddenCheck:!1,numberFormatter:!1,numberDigitGroupCount:3,numberDigitGroupSep:",",numberDecimalMark:".",disableTooltips:!1,disableInteraction:!1},line:{spotColor:"#f80",highlightSpotColor:"#5f5",highlightLineColor:"#f22",spotRadius:1.5,minSpotColor:"#f80",maxSpotColor:"#f80",lineWidth:1,normalRangeMin:undefined,normalRangeMax:undefined,normalRangeColor:"#ccc",drawNormalOnTop:!1,chartRangeMin:undefined,chartRangeMax:undefined,chartRangeMinX:undefined,chartRangeMaxX:undefined,tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')},bar:{barColor:"#3366cc",negBarColor:"#f44",stackedBarColor:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],zeroColor:undefined,nullColor:undefined,zeroAxis:!0,barWidth:4,barSpacing:1,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:!1,colorMap:undefined,tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')},tristate:{barWidth:4,barSpacing:1,posBarColor:"#6f6",negBarColor:"#f44",zeroBarColor:"#999",colorMap:{},tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),tooltipValueLookups:{map:{"-1":"Loss",0:"Draw",1:"Win"}}},discrete:{lineHeight:"auto",thresholdColor:undefined,thresholdValue:0,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:!1,tooltipFormat:new e("{{prefix}}{{value}}{{suffix}}")},bullet:{targetColor:"#f33",targetWidth:3,performanceColor:"#33f",rangeColors:["#d3dafe","#a8b6ff","#7f94ff"],base:undefined,tooltipFormat:new e("{{fieldkey:fields}} - {{value}}"),tooltipValueLookups:{fields:{r:"Range",p:"Performance",t:"Target"}}},pie:{offset:0,sliceColors:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],borderWidth:0,borderColor:"#000",tooltipFormat:new e('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')},box:{raw:!1,boxLineColor:"#000",boxFillColor:"#cdf",whiskerColor:"#000",outlierLineColor:"#333",outlierFillColor:"#fff",medianColor:"#f00",showOutliers:!0,outlierIQR:1.5,spotRadius:1.5,target:undefined,targetColor:"#4a2",chartRangeMax:undefined,chartRangeMin:undefined,tooltipFormat:new e("{{field:fields}}: {{value}}"),tooltipFormatFieldlistKey:"field",tooltipValueLookups:{fields:{lq:"Lower Quartile",med:"Median",uq:"Upper Quartile",lo:"Left Outlier",ro:"Right Outlier",lw:"Left Whisker",rw:"Right Whisker"}}}}},B='.jqstooltip { position: absolute;left: 0px;top: 0px;visibility: hidden;background: rgb(0, 0, 0) transparent;background-color: rgba(0,0,0,0.6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";color: white;font: 10px arial, san serif;text-align: left;white-space: nowrap;padding: 5px;border: 1px solid white;z-index: 10000;}.jqsfield { color: white;font: 10px arial, san serif;text-align: left;}',d=function(){var b,c;return b=function(){this.init.apply(this,arguments)},arguments.length>1?(arguments[0]?(b.prototype=a.extend(new arguments[0],arguments[arguments.length-1]),b._super=arguments[0].prototype):b.prototype=arguments[arguments.length-1],arguments.length>2&&(c=Array.prototype.slice.call(arguments,1,-1),c.unshift(b.prototype),a.extend.apply(a,c))):b.prototype=arguments[0],b.prototype.cls=b,b},a.SPFormatClass=e=d({fre:/\{\{([\w.]+?)(:(.+?))?\}\}/g,precre:/(\w+)\.(\d+)/,init:function(a,b){this.format=a,this.fclass=b},render:function(a,b,c){var d=this,e=a,f,g,h,i,j;return this.format.replace(this.fre,function(){var a;return g=arguments[1],h=arguments[3],f=d.precre.exec(g),f?(j=f[2],g=f[1]):j=!1,i=e[g],i===undefined?"":h&&b&&b[h]?(a=b[h],a.get?b[h].get(i)||i:b[h][i]||i):(k(i)&&(c.get("numberFormatter")?i=c.get("numberFormatter")(i):i=p(i,j,c.get("numberDigitGroupCount"),c.get("numberDigitGroupSep"),c.get("numberDecimalMark"))),i)})}}),a.spformat=function(a,b){return new e(a,b)},f=function(a,b,c){return a<b?b:a>c?c:a},g=function(a,b){var c;return b===2?(c=Math.floor(a.length/2),a.length%2?a[c]:(a[c-1]+a[c])/2):a.length%2?(c=(a.length*b+b)/4,c%1?(a[Math.floor(c)]+a[Math.floor(c)-1])/2:a[c-1]):(c=(a.length*b+2)/4,c%1?(a[Math.floor(c)]+a[Math.floor(c)-1])/2:a[c-1])},h=function(a){var b;switch(a){case"undefined":a=undefined;break;case"null":a=null;break;case"true":a=!0;break;case"false":a=!1;break;default:b=parseFloat(a),a==b&&(a=b)}return a},i=function(a){var b,c=[];for(b=a.length;b--;)c[b]=h(a[b]);return c},j=function(a,b){var c,d,e=[];for(c=0,d=a.length;c<d;c++)a[c]!==b&&e.push(a[c]);return e},k=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},p=function(b,c,d,e,f){var g,h;b=(c===!1?parseFloat(b).toString():b.toFixed(c)).split(""),g=(g=a.inArray(".",b))<0?b.length:g,g<b.length&&(b[g]=f);for(h=g-d;h>0;h-=d)b.splice(h,0,e);return b.join("")},l=function(a,b,c){var d;for(d=b.length;d--;){if(c&&b[d]===null)continue;if(b[d]!==a)return!1}return!0},m=function(a){var b=0,c;for(c=a.length;c--;)b+=typeof a[c]=="number"?a[c]:0;return b},o=function(b){return a.isArray(b)?b:[b]},n=function(a){var b;document.createStyleSheet?document.createStyleSheet().cssText=a:(b=document.createElement("style"),b.type="text/css",document.getElementsByTagName("head")[0].appendChild(b),b[typeof document.body.style.WebkitAppearance=="string"?"innerText":"innerHTML"]=a)},a.fn.simpledraw=function(b,c,d,e){var f,g;if(d&&(f=this.data("_jqs_vcanvas")))return f;b===undefined&&(b=a(this).innerWidth()),c===undefined&&(c=a(this).innerHeight());if(a.fn.sparkline.hasCanvas)f=new F(b,c,this,e);else{if(!a.fn.sparkline.hasVML)return!1;f=new G(b,c,this)}return g=a(this).data("_jqs_mhandler"),g&&g.registerCanvas(f),f},a.fn.cleardraw=function(){var a=this.data("_jqs_vcanvas");a&&a.reset()},a.RangeMapClass=q=d({init:function(a){var b,c,d=[];for(b in a)a.hasOwnProperty(b)&&typeof b=="string"&&b.indexOf(":")>-1&&(c=b.split(":"),c[0]=c[0].length===0?-Infinity:parseFloat(c[0]),c[1]=c[1].length===0?Infinity:parseFloat(c[1]),c[2]=a[b],d.push(c));this.map=a,this.rangelist=d||!1},get:function(a){var b=this.rangelist,c,d,e;if((e=this.map[a])!==undefined)return e;if(b)for(c=b.length;c--;){d=b[c];if(d[0]<=a&&d[1]>=a)return d[2]}return undefined}}),a.range_map=function(a){return new q(a)},r=d({init:function(b,c){var d=a(b);this.$el=d,this.options=c,this.currentPageX=0,this.currentPageY=0,this.el=b,this.splist=[],this.tooltip=null,this.over=!1,this.displayTooltips=!c.get("disableTooltips"),this.highlightEnabled=!c.get("disableHighlight")},registerSparkline:function(a){this.splist.push(a),this.over&&this.updateDisplay()},registerCanvas:function(b){var c=a(b.canvas);this.canvas=b,this.$canvas=c,c.mouseenter(a.proxy(this.mouseenter,this)),c.mouseleave(a.proxy(this.mouseleave,this)),c.click(a.proxy(this.mouseclick,this))},reset:function(a){this.splist=[],this.tooltip&&a&&(this.tooltip.remove(),this.tooltip=undefined)},mouseclick:function(b){var c=a.Event("sparklineClick");c.originalEvent=b,c.sparklines=this.splist,this.$el.trigger(c)},mouseenter:function(b){a(document.body).unbind("mousemove.jqs"),a(document.body).bind("mousemove.jqs",a.proxy(this.mousemove,this)),this.over=!0,this.currentPageX=b.pageX,this.currentPageY=b.pageY,this.currentEl=b.target,!this.tooltip&&this.displayTooltips&&(this.tooltip=new s(this.options),this.tooltip.updatePosition(b.pageX,b.pageY)),this.updateDisplay()},mouseleave:function(){a(document.body).unbind("mousemove.jqs");var b=this.splist,c=b.length,d=!1,e,f;this.over=!1,this.currentEl=null,this.tooltip&&(this.tooltip.remove(),this.tooltip=null);for(f=0;f<c;f++)e=b[f],e.clearRegionHighlight()&&(d=!0);d&&this.canvas.render()},mousemove:function(a){this.currentPageX=a.pageX,this.currentPageY=a.pageY,this.currentEl=a.target,this.tooltip&&this.tooltip.updatePosition(a.pageX,a.pageY),this.updateDisplay()},updateDisplay:function(){var b=this.splist,c=b.length,d=!1,e=this.$canvas.offset(),f=this.currentPageX-e.left,g=this.currentPageY-e.top,h,i,j,k,l;if(!this.over)return;for(j=0;j<c;j++)i=b[j],k=i.setRegionHighlight(this.currentEl,f,g),k&&(d=!0);if(d){l=a.Event("sparklineRegionChange"),l.sparklines=this.splist,this.$el.trigger(l);if(this.tooltip){h="";for(j=0;j<c;j++)i=b[j],h+=i.getCurrentRegionTooltip();this.tooltip.setContent(h)}this.disableHighlight||this.canvas.render()}k===null&&this.mouseleave()}}),s=d({sizeStyle:"position: static !important;display: block !important;visibility: hidden !important;float: left !important;",init:function(b){var c=b.get("tooltipClassname","jqstooltip"),d=this.sizeStyle,e;this.container=b.get("tooltipContainer")||document.body,this.tooltipOffsetX=b.get("tooltipOffsetX",10),this.tooltipOffsetY=b.get("tooltipOffsetY",12),a("#jqssizetip").remove(),a("#jqstooltip").remove(),this.sizetip=a("<div/>",{id:"jqssizetip",style:d,"class":c}),this.tooltip=a("<div/>",{id:"jqstooltip","class":c}).appendTo(this.container),e=this.tooltip.offset(),this.offsetLeft=e.left,this.offsetTop=e.top,this.hidden=!0,a(window).unbind("resize.jqs scroll.jqs"),a(window).bind("resize.jqs scroll.jqs",a.proxy(this.updateWindowDims,this)),this.updateWindowDims()},updateWindowDims:function(){this.scrollTop=a(window).scrollTop(),this.scrollLeft=a(window).scrollLeft(),this.scrollRight=this.scrollLeft+a(window).width(),this.updatePosition()},getSize:function(a){this.sizetip.html(a).appendTo(this.container),this.width=this.sizetip.width()+1,this.height=this.sizetip.height(),this.sizetip.remove()},setContent:function(a){if(!a){this.tooltip.css("visibility","hidden"),this.hidden=!0;return}this.getSize(a),this.tooltip.html(a).css({width:this.width,height:this.height,visibility:"visible"}),this.hidden&&(this.hidden=!1,this.updatePosition())},updatePosition:function(a,b){if(a===undefined){if(this.mousex===undefined)return;a=this.mousex-this.offsetLeft,b=this.mousey-this.offsetTop}else this.mousex=a-=this.offsetLeft,this.mousey=b-=this.offsetTop;if(!this.height||!this.width||this.hidden)return;b-=this.height+this.tooltipOffsetY,a+=this.tooltipOffsetX,b<this.scrollTop&&(b=this.scrollTop),a<this.scrollLeft?a=this.scrollLeft:a+this.width>this.scrollRight&&(a=this.scrollRight-this.width),this.tooltip.css({left:a,top:b})},remove:function(){this.tooltip.remove(),this.sizetip.remove(),this.sizetip=this.tooltip=undefined,a(window).unbind("resize.jqs scroll.jqs")}}),C=function(){n(B)},a(C),H=[],a.fn.sparkline=function(b,c){return this.each(function(){var d=new a.fn.sparkline.options(this,c),e=a(this),f,g;f=function(){var c,f,g,h,i,j,k;if(b==="html"||b===undefined){k=this.getAttribute(d.get("tagValuesAttribute"));if(k===undefined||k===null)k=e.html();c=k.replace(/(^\s*<!--)|(-->\s*$)|\s+/g,"").split(",")}else c=b;f=d.get("width")==="auto"?c.length*d.get("defaultPixelsPerValue"):d.get("width");if(d.get("height")==="auto"){if(!d.get("composite")||!a.data(this,"_jqs_vcanvas"))h=document.createElement("span"),h.innerHTML="a",e.html(h),g=a(h).innerHeight()||a(h).height(),a(h).remove(),h=null}else g=d.get("height");d.get("disableInteraction")?i=!1:(i=a.data(this,"_jqs_mhandler"),i?d.get("composite")||i.reset():(i=new r(this,d),a.data(this,"_jqs_mhandler",i)));if(d.get("composite")&&!a.data(this,"_jqs_vcanvas")){a.data(this,"_jqs_errnotify")||(alert("Attempted to attach a composite sparkline to an element with no existing sparkline"),a.data(this,"_jqs_errnotify",!0));return}j=new(a.fn.sparkline[d.get("type")])(this,c,d,f,g),j.render(),i&&i.registerSparkline(j)};if(a(this).html()&&!d.get("disableHiddenCheck")&&a(this).is(":hidden")||a.fn.jquery<"1.3.0"&&a(this).parents().is(":hidden")||!a(this).parents("body").length){if(!d.get("composite")&&a.data(this,"_jqs_pending"))for(g=H.length;g;g--)H[g-1][0]==this&&H.splice(g-1,1);H.push([this,f]),a.data(this,"_jqs_pending",!0)}else f.call(this)})},a.fn.sparkline.defaults=c(),a.sparkline_display_visible=function(){var b,c,d,e=[];for(c=0,d=H.length;c<d;c++)b=H[c][0],a(b).is(":visible")&&!a(b).parents().is(":hidden")?(H[c][1].call(b),a.data(H[c][0],"_jqs_pending",!1),e.push(c)):!a(b).closest("html").length&&!a.data(b,"_jqs_pending")&&(a.data(H[c][0],"_jqs_pending",!1),e.push(c));for(c=e.length;c;c--)H.splice(e[c-1],1)},a.fn.sparkline.options=d({init:function(c,d){var e,f,g,h;this.userOptions=d=d||{},this.tag=c,this.tagValCache={},f=a.fn.sparkline.defaults,g=f.common,this.tagOptionsPrefix=d.enableTagOptions&&(d.tagOptionsPrefix||g.tagOptionsPrefix),h=this.getTagSetting("type"),h===b?e=f[d.type||g.type]:e=f[h],this.mergedOptions=a.extend({},g,e,d)},getTagSetting:function(a){var c=this.tagOptionsPrefix,d,e,f,g;if(c===!1||c===undefined)return b;if(this.tagValCache.hasOwnProperty(a))d=this.tagValCache.key;else{d=this.tag.getAttribute(c+a);if(d===undefined||d===null)d=b;else if(d.substr(0,1)==="["){d=d.substr(1,d.length-2).split(",");for(e=d.length;e--;)d[e]=h(d[e].replace(/(^\s*)|(\s*$)/g,""))}else if(d.substr(0,1)==="{"){f=d.substr(1,d.length-2).split(","),d={};for(e=f.length;e--;)g=f[e].split(":",2),d[g[0].replace(/(^\s*)|(\s*$)/g,"")]=h(g[1].replace(/(^\s*)|(\s*$)/g,""))}else d=h(d);this.tagValCache.key=d}return d},get:function(a,c){var d=this.getTagSetting(a),e;return d!==b?d:(e=this.mergedOptions[a])===undefined?c:e}}),a.fn.sparkline._base=d({disabled:!1,init:function(b,c,d,e,f){this.el=b,this.$el=a(b),this.values=c,this.options=d,this.width=e,this.height=f,this.currentRegion=undefined},initTarget:function(){var a=!this.options.get("disableInteraction");(this.target=this.$el.simpledraw(this.width,this.height,this.options.get("composite"),a))?(this.canvasWidth=this.target.pixelWidth,this.canvasHeight=this.target.pixelHeight):this.disabled=!0},render:function(){return this.disabled?(this.el.innerHTML="",!1):!0},getRegion:function(a,b){},setRegionHighlight:function(a,b,c){var d=this.currentRegion,e=!this.options.get("disableHighlight"),f;return b>this.canvasWidth||c>this.canvasHeight||b<0||c<0?null:(f=this.getRegion(a,b,c),d!==f?(d!==undefined&&e&&this.removeHighlight(),this.currentRegion=f,f!==undefined&&e&&this.renderHighlight(),!0):!1)},clearRegionHighlight:function(){return this.currentRegion!==undefined?(this.removeHighlight(),this.currentRegion=undefined,!0):!1},renderHighlight:function(){this.changeHighlight(!0)},removeHighlight:function(){this.changeHighlight(!1)},changeHighlight:function(a){},getCurrentRegionTooltip:function(){var b=this.options,c="",d=[],f,g,h,i,j,k,l,m,n,o,p,q,r,s;if(this.currentRegion===undefined)return"";f=this.getCurrentRegionFields(),p=b.get("tooltipFormatter");if(p)return p(this,b,f);b.get("tooltipChartTitle")&&(c+='<div class="jqs jqstitle">'+b.get("tooltipChartTitle")+"</div>\n"),g=this.options.get("tooltipFormat");if(!g)return"";a.isArray(g)||(g=[g]),a.isArray(f)||(f=[f]),l=this.options.get("tooltipFormatFieldlist"),m=this.options.get("tooltipFormatFieldlistKey");if(l&&m){n=[];for(k=f.length;k--;)o=f[k][m],(s=a.inArray(o,l))!=-1&&(n[s]=f[k]);f=n}h=g.length,r=f.length;for(k=0;k<h;k++){q=g[k],typeof q=="string"&&(q=new e(q)),i=q.fclass||"jqsfield";for(s=0;s<r;s++)if(!f[s].isNull||!b.get("tooltipSkipNull"))a.extend(f[s],{prefix:b.get("tooltipPrefix"),suffix:b.get("tooltipSuffix")}),j=q.render(f[s],b.get("tooltipValueLookups"),b),d.push('<div class="'+i+'">'+j+"</div>")}return d.length?c+d.join("\n"):""},getCurrentRegionFields:function(){},calcHighlightColor:function(a,b){var c=b.get("highlightColor"),d=b.get("highlightLighten"),e,g,h,i;if(c)return c;if(d){e=/^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(a)||/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(a);if(e){h=[],g=a.length===4?16:1;for(i=0;i<3;i++)h[i]=f(Math.round(parseInt(e[i+1],16)*g*d),0,255);return"rgb("+h.join(",")+")"}}return a}}),t={changeHighlight:function(b){var c=this.currentRegion,d=this.target,e=this.regionShapes[c],f;e&&(f=this.renderRegion(c,b),a.isArray(f)||a.isArray(e)?(d.replaceWithShapes(e,f),this.regionShapes[c]=a.map(f,function(a){return a.id})):(d.replaceWithShape(e,f),this.regionShapes[c]=f.id))},render:function(){var b=this.values,c=this.target,d=this.regionShapes,e,f,g,h;if(!this.cls._super.render.call(this))return;for(g=b.length;g--;){e=this.renderRegion(g);if(e)if(a.isArray(e)){f=[];for(h=e.length;h--;)e[h].append(),f.push(e[h].id);d[g]=f}else e.append(),d[g]=e.id;else d[g]=null}c.render()}},a.fn.sparkline.line=u=d(a.fn.sparkline._base,{type:"line",init:function(a,b,c,d,e){u._super.init.call(this,a,b,c,d,e),this.vertices=[],this.regionMap=[],this.xvalues=[],this.yvalues=[],this.yminmax=[],this.hightlightSpotId=null,this.lastShapeId=null,this.initTarget()},getRegion:function(a,b,c){var d,e=this.regionMap;for(d=e.length;d--;)if(e[d]!==null&&b>=e[d][0]&&b<=e[d][1])return e[d][2];return undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.yvalues[a]===null,x:this.xvalues[a],y:this.yvalues[a],color:this.options.get("lineColor"),fillColor:this.options.get("fillColor"),offset:a}},renderHighlight:function(){var a=this.currentRegion,b=this.target,c=this.vertices[a],d=this.options,e=d.get("spotRadius"),f=d.get("highlightSpotColor"),g=d.get("highlightLineColor"),h,i;if(!c)return;e&&f&&(h=b.drawCircle(c[0],c[1],e,undefined,f),this.highlightSpotId=h.id,b.insertAfterShape(this.lastShapeId,h)),g&&(i=b.drawLine(c[0],this.canvasTop,c[0],this.canvasTop+this.canvasHeight,g),this.highlightLineId=i.id,b.insertAfterShape(this.lastShapeId,i))},removeHighlight:function(){var a=this.target;this.highlightSpotId&&(a.removeShapeId(this.highlightSpotId),this.highlightSpotId=null),this.highlightLineId&&(a.removeShapeId(this.highlightLineId),this.highlightLineId=null)},scanValues:function(){var a=this.values,b=a.length,c=this.xvalues,d=this.yvalues,e=this.yminmax,f,g,h,i,j;for(f=0;f<b;f++)g=a[f],h=typeof a[f]=="string",i=typeof a[f]=="object"&&a[f]instanceof Array,j=h&&a[f].split(":"),h&&j.length===2?(c.push(Number(j[0])),d.push(Number(j[1])),e.push(Number(j[1]))):i?(c.push(g[0]),d.push(g[1]),e.push(g[1])):(c.push(f),a[f]===null||a[f]==="null"?d.push(null):(d.push(Number(g)),e.push(Number(g))));this.options.get("xvalues")&&(c=this.options.get("xvalues")),this.maxy=this.maxyorg=Math.max.apply(Math,e),this.miny=this.minyorg=Math.min.apply(Math,e),this.maxx=Math.max.apply(Math,c),this.minx=Math.min.apply(Math,c),this.xvalues=c,this.yvalues=d,this.yminmax=e},processRangeOptions:function(){var a=this.options,b=a.get("normalRangeMin"),c=a.get("normalRangeMax");b!==undefined&&(b<this.miny&&(this.miny=b),c>this.maxy&&(this.maxy=c)),a.get("chartRangeMin")!==undefined&&(a.get("chartRangeClip")||a.get("chartRangeMin")<this.miny)&&(this.miny=a.get("chartRangeMin")),a.get("chartRangeMax")!==undefined&&(a.get("chartRangeClip")||a.get("chartRangeMax")>this.maxy)&&(this.maxy=a.get("chartRangeMax")),a.get("chartRangeMinX")!==undefined&&(a.get("chartRangeClipX")||a.get("chartRangeMinX")<this.minx)&&(this.minx=a.get("chartRangeMinX")),a.get("chartRangeMaxX")!==undefined&&(a.get("chartRangeClipX")||a.get("chartRangeMaxX")>this.maxx)&&(this.maxx=a.get("chartRangeMaxX"))},drawNormalRange:function(a,b,c,d,e){var f=this.options.get("normalRangeMin"),g=this.options.get("normalRangeMax"),h=b+Math.round(c-c*((g-this.miny)/e)),i=Math.round(c*(g-f)/e);this.target.drawRect(a,h,d,i,undefined,this.options.get("normalRangeColor")).append()},render:function(){var b=this.options,c=this.target,d=this.canvasWidth,e=this.canvasHeight,f=this.vertices,g=b.get("spotRadius"),h=this.regionMap,i,j,k,l,m,n,o,p,r,s,t,v,w,x,y,z,A,B,C,D,E,F,G,H,I;if(!u._super.render.call(this))return;this.scanValues(),this.processRangeOptions(),G=this.xvalues,H=this.yvalues;if(!this.yminmax.length||this.yvalues.length<2)return;l=m=0,i=this.maxx-this.minx===0?1:this.maxx-this.minx,j=this.maxy-this.miny===0?1:this.maxy-this.miny,k=this.yvalues.length-1,g&&(d<g*4||e<g*4)&&(g=0);if(g){E=b.get("highlightSpotColor")&&!b.get("disableInteraction");if(E||b.get("minSpotColor")||b.get("spotColor")&&H[k]===this.miny)e-=Math.ceil(g);if(E||b.get("maxSpotColor")||b.get("spotColor")&&H[k]===this.maxy)e-=Math.ceil(g),l+=Math.ceil(g);if(E||(b.get("minSpotColor")||b.get("maxSpotColor"))&&(H[0]===this.miny||H[0]===this.maxy))m+=Math.ceil(g),d-=Math.ceil(g);if(E||b.get("spotColor")||b.get("minSpotColor")||b.get("maxSpotColor")&&(H[k]===this.miny||H[k]===this.maxy))d-=Math.ceil(g)}e--,b.get("normalRangeMin")!==undefined&&!b.get("drawNormalOnTop")&&this.drawNormalRange(m,l,e,d,j),o=[],p=[o],x=y=null,z=H.length;for(I=0;I<z;I++)r=G[I],t=G[I+1],s=H[I],v=m+Math.round((r-this.minx)*(d/i)),w=I<z-1?m+Math.round((t-this.minx)*(d/i)):d,y=v+(w-v)/2,h[I]=[x||0,y,I],x=y,s===null?I&&(H[I-1]!==null&&(o=[],p.push(o)),f.push(null)):(s<this.miny&&(s=this.miny),s>this.maxy&&(s=this.maxy),o.length||o.push([v,l+e]),n=[v,l+Math.round(e-e*((s-this.miny)/j))],o.push(n),f.push(n));A=[],B=[],C=p.length;for(I=0;I<C;I++)o=p[I],o.length&&(b.get("fillColor")&&(o.push([o[o.length-1][0],l+e]),B.push(o.slice(0)),o.pop()),o.length>2&&(o[0]=[o[0][0],o[1][1]]),A.push(o));C=B.length;for(I=0;I<C;I++)c.drawShape(B[I],b.get("fillColor"),b.get("fillColor")).append();b.get("normalRangeMin")!==undefined&&b.get("drawNormalOnTop")&&this.drawNormalRange(m,l,e,d,j),C=A.length;for(I=0;I<C;I++)c.drawShape(A[I],b.get("lineColor"),undefined,b.get("lineWidth")).append();if(g&&b.get("valueSpots")){D=b.get("valueSpots"),D.get===undefined&&(D=new q(D));for(I=0;I<z;I++)F=D.get(H[I]),F&&c.drawCircle(m+Math.round((G[I]-this.minx)*(d/i)),l+Math.round(e-e*((H[I]-this.miny)/j)),g,undefined,F).append()}g&&b.get("spotColor")&&H[k]!==null&&c.drawCircle(m+Math.round((G[G.length-1]-this.minx)*(d/i)),l+Math.round(e-e*((H[k]-this.miny)/j)),g,undefined,b.get("spotColor")).append(),this.maxy!==this.minyorg&&(g&&b.get("minSpotColor")&&(r=G[a.inArray(this.minyorg,H)],c.drawCircle(m+Math.round((r-this.minx)*(d/i)),l+Math.round(e-e*((this.minyorg-this.miny)/j)),g,undefined,b.get("minSpotColor")).append()),g&&b.get("maxSpotColor")&&(r=G[a.inArray(this.maxyorg,H)],c.drawCircle(m+Math.round((r-this.minx)*(d/i)),l+Math.round(e-e*((this.maxyorg-this.miny)/j)),g,undefined,b.get("maxSpotColor")).append())),this.lastShapeId=c.getLastShapeId(),this.canvasTop=l,c.render()}}),a.fn.sparkline.bar=v=d(a.fn.sparkline._base,t,{type:"bar",init:function(b,c,d,e,g){var k=parseInt(d.get("barWidth"),10),l=parseInt(d.get("barSpacing"),10),m=d.get("chartRangeMin"),n=d.get("chartRangeMax"),o=d.get("chartRangeClip"),p=Infinity,r=-Infinity,s,t,u,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P;v._super.init.call(this,b,c,d,e,g);for(y=0,z=c.length;y<z;y++){M=c[y],s=typeof M=="string"&&M.indexOf(":")>-1;if(s||a.isArray(M))H=!0,s&&(M=c[y]=i(M.split(":"))),M=j(M,null),t=Math.min.apply(Math,M),u=Math.max.apply(Math,M),t<p&&(p=t),u>r&&(r=u)}this.stacked=H,this.regionShapes={},this.barWidth=k,this.barSpacing=l,this.totalBarWidth=k+l,this.width=e=c.length*k+(c.length-1)*l,this.initTarget(),o&&(F=m===undefined?-Infinity:m,G=n===undefined?Infinity:n),x=[],w=H?[]:x;var Q=[],R=[];for(y=0,z=c.length;y<z;y++)if(H){I=c[y],c[y]=L=[],Q[y]=0,w[y]=R[y]=0;for(J=0,K=I.length;J<K;J++)M=L[J]=o?f(I[J],F,G):I[J],M!==null&&(M>0&&(Q[y]+=M),p<0&&r>0?M<0?R[y]+=Math.abs(M):w[y]+=M:w[y]+=Math.abs(M-(M<0?r:p)),x.push(M))}else M=o?f(c[y],F,G):c[y],M=c[y]=h(M),M!==null&&x.push(M);this.max=E=Math.max.apply(Math,x),this.min=D=Math.min.apply(Math,x),this.stackMax=r=H?Math.max.apply(Math,Q):E,this.stackMin=p=H?Math.min.apply(Math,x):D,d.get("chartRangeMin")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMin")<D)&&(D=d.get("chartRangeMin")),d.get("chartRangeMax")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMax")>E)&&(E=d.get("chartRangeMax")),this.zeroAxis=B=d.get("zeroAxis",!0),D<=0&&E>=0&&B?C=0:B==0?C=D:D>0?C=D:C=E,this.xaxisOffset=C,A=H?Math.max.apply(Math,w)+Math.max.apply(Math,R):E-D,this.canvasHeightEf=B&&D<0?this.canvasHeight-2:this.canvasHeight-1,D<C?(O=H&&E>=0?r:E,N=(O-C)/A*this.canvasHeight,N!==Math.ceil(N)&&(this.canvasHeightEf-=2,N=Math.ceil(N))):N=this.canvasHeight,this.yoffset=N,a.isArray(d.get("colorMap"))?(this.colorMapByIndex=d.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=d.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===undefined&&(this.colorMapByValue=new q(this.colorMapByValue))),this.range=A},getRegion:function(a,b,c){var d=Math.floor(b/this.totalBarWidth);return d<0||d>=this.values.length?undefined:d},getCurrentRegionFields:function(){var a=this.currentRegion,b=o(this.values[a]),c=[],d,e;for(e=b.length;e--;)d=b[e],c.push({isNull:d===null,value:d,color:this.calcColor(e,d,a),offset:a});return c},calcColor:function(b,c,d){var e=this.colorMapByIndex,f=this.colorMapByValue,g=this.options,h,i;return this.stacked?h=g.get("stackedBarColor"):h=c<0?g.get("negBarColor"):g.get("barColor"),c===0&&g.get("zeroColor")!==undefined&&(h=g.get("zeroColor")),f&&(i=f.get(c))?h=i:e&&e.length>d&&(h=e[d]),a.isArray(h)?h[b%h.length]:h},renderRegion:function(b,c){var d=this.values[b],e=this.options,f=this.xaxisOffset,g=[],h=this.range,i=this.stacked,j=this.target,k=b*this.totalBarWidth,m=this.canvasHeightEf,n=this.yoffset,o,p,q,r,s,t,u,v,w,x;d=a.isArray(d)?d:[d],u=d.length,v=d[0],r=l(null,d),x=l(f,d,!0);if(r)return e.get("nullColor")?(q=c?e.get("nullColor"):this.calcHighlightColor(e.get("nullColor"),e),o=n>0?n-1:n,j.drawRect(k,o,this.barWidth-1,0,q,q)):undefined;s=n;for(t=0;t<u;t++){v=d[t];if(i&&v===f){if(!x||w)continue;w=!0}h>0?p=Math.floor(m*(Math.abs(v-f)/h))+1:p=1,v<f||v===f&&n===0?(o=s,s+=p):(o=n-p,n-=p),q=this.calcColor(t,v,b),c&&(q=this.calcHighlightColor(q,e)),g.push(j.drawRect(k,o,this.barWidth-1,p-1,q,q))}return g.length===1?g[0]:g}}),a.fn.sparkline.tristate=w=d(a.fn.sparkline._base,t,{type:"tristate",init:function(b,c,d,e,f){var g=parseInt(d.get("barWidth"),10),h=parseInt(d.get("barSpacing"),10);w._super.init.call(this,b,c,d,e,f),this.regionShapes={},this.barWidth=g,this.barSpacing=h,this.totalBarWidth=g+h,this.values=a.map(c,Number),this.width=e=c.length*g+(c.length-1)*h,a.isArray(d.get("colorMap"))?(this.colorMapByIndex=d.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=d.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===undefined&&(this.colorMapByValue=new q(this.colorMapByValue))),this.initTarget()},getRegion:function(a,b,c){return Math.floor(b/this.totalBarWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],color:this.calcColor(this.values[a],a),offset:a}},calcColor:function(a,b){var c=this.values,d=this.options,e=this.colorMapByIndex,f=this.colorMapByValue,g,h;return f&&(h=f.get(a))?g=h:e&&e.length>b?g=e[b]:c[b]<0?g=d.get("negBarColor"):c[b]>0?g=d.get("posBarColor"):g=d.get("zeroBarColor"),g},renderRegion:function(a,b){var c=this.values,d=this.options,e=this.target,f,g,h,i,j,k;f=e.pixelHeight,h=Math.round(f/2),i=a*this.totalBarWidth,c[a]<0?(j=h,g=h-1):c[a]>0?(j=0,g=h-1):(j=h-1,g=2),k=this.calcColor(c[a],a);if(k===null)return;return b&&(k=this.calcHighlightColor(k,d)),e.drawRect(i,j,this.barWidth-1,g-1,k,k)}}),a.fn.sparkline.discrete=x=d(a.fn.sparkline._base,t,{type:"discrete",init:function(b,c,d,e,f){x._super.init.call(this,b,c,d,e,f),this.regionShapes={},this.values=c=a.map(c,Number),this.min=Math.min.apply(Math,c),this.max=Math.max.apply(Math,c),this.range=this.max-this.min,this.width=e=d.get("width")==="auto"?c.length*2:this.width,this.interval=Math.floor(e/c.length),this.itemWidth=e/c.length,d.get("chartRangeMin")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMin")<this.min)&&(this.min=d.get("chartRangeMin")),d.get("chartRangeMax")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMax")>this.max)&&(this.max=d.get("chartRangeMax")),this.initTarget(),this.target&&(this.lineHeight=d.get("lineHeight")==="auto"?Math.round(this.canvasHeight*.3):d.get("lineHeight"))},getRegion:function(a,b,c){return Math.floor(b/this.itemWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],offset:a}},renderRegion:function(a,b){var c=this.values,d=this.options,e=this.min,g=this.max,h=this.range,i=this.interval,j=this.target,k=this.canvasHeight,l=this.lineHeight,m=k-l,n,o,p,q;return o=f(c[a],e,g),q=a*i,n=Math.round(m-m*((o-e)/h)),p=d.get("thresholdColor")&&o<d.get("thresholdValue")?d.get("thresholdColor"):d.get("lineColor"),b&&(p=this.calcHighlightColor(p,d)),j.drawLine(q,n,q,n+l,p)}}),a.fn.sparkline.bullet=y=d(a.fn.sparkline._base,{type:"bullet",init:function(a,b,c,d,e){var f,g,h;y._super.init.call(this,a,b,c,d,e),this.values=b=i(b),h=b.slice(),h[0]=h[0]===null?h[2]:h[0],h[1]=b[1]===null?h[2]:h[1],f=Math.min.apply(Math,b),g=Math.max.apply(Math,b),c.get("base")===undefined?f=f<0?f:0:f=c.get("base"),this.min=f,this.max=g,this.range=g-f,this.shapes={},this.valueShapes={},this.regiondata={},this.width=d=c.get("width")==="auto"?"4.0em":d,this.target=this.$el.simpledraw(d,e,c.get("composite")),b.length||(this.disabled=!0),this.initTarget()},getRegion:function(a,b,c){var d=this.target.getShapeAt(a,b,c);return d!==undefined&&this.shapes[d]!==undefined?this.shapes[d]:undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{fieldkey:a.substr(0,1),value:this.values[a.substr(1)],region:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.valueShapes[b],d;delete this.shapes[c];switch(b.substr(0,1)){case"r":d=this.renderRange(b.substr(1),a);break;case"p":d=this.renderPerformance(a);break;case"t":d=this.renderTarget(a)}this.valueShapes[b]=d.id,this.shapes[d.id]=b,this.target.replaceWithShape(c,d)},renderRange:function(a,b){var c=this.values[a],d=Math.round(this.canvasWidth*((c-this.min)/this.range)),e=this.options.get("rangeColors")[a-2];return b&&(e=this.calcHighlightColor(e,this.options)),this.target.drawRect(0,0,d-1,this.canvasHeight-1,e,e)},renderPerformance:function(a){var b=this.values[1],c=Math.round(this.canvasWidth*((b-this.min)/this.range)),d=this.options.get("performanceColor");return a&&(d=this.calcHighlightColor(d,this.options)),this.target.drawRect(0,Math.round(this.canvasHeight*.3),c-1,Math.round(this.canvasHeight*.4)-1,d,d)},renderTarget:function(a){var b=this.values[0],c=Math.round(this.canvasWidth*((b-this.min)/this.range)-this.options.get("targetWidth")/2),d=Math.round(this.canvasHeight*.1),e=this.canvasHeight-d*2,f=this.options.get("targetColor");return a&&(f=this.calcHighlightColor(f,this.options)),this.target.drawRect(c,d,this.options.get("targetWidth")-1,e-1,f,f)},render:function(){var a=this.values.length,b=this.target,c,d;if(!y._super.render.call(this))return;for(c=2;c<a;c++)d=this.renderRange(c).append(),this.shapes[d.id]="r"+c,this.valueShapes["r"+c]=d.id;this.values[1]!==null&&(d=this.renderPerformance().append(),this.shapes[d.id]="p1",this.valueShapes.p1=d.id),this.values[0]!==null&&(d=this.renderTarget().append(),this.shapes[d.id]="t0",this.valueShapes.t0=d.id),b.render()}}),a.fn.sparkline.pie=z=d(a.fn.sparkline._base,{type:"pie",init:function(b,c,d,e,f){var g=0,h;z._super.init.call(this,b,c,d,e,f),this.shapes={},this.valueShapes={},this.values=c=a.map(c,Number),d.get("width")==="auto"&&(this.width=this.height);if(c.length>0)for(h=c.length;h--;)g+=c[h];this.total=g,this.initTarget(),this.radius=Math.floor(Math.min(this.canvasWidth,this.canvasHeight)/2)},getRegion:function(a,b,c){var d=this.target.getShapeAt(a,b,c);return d!==undefined&&this.shapes[d]!==undefined?this.shapes[d]:undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],percent:this.values[a]/this.total*100,color:this.options.get("sliceColors")[a%this.options.get("sliceColors").length],offset:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.renderSlice(b,a),d=this.valueShapes[b];delete this.shapes[d],this.target.replaceWithShape(d,c),this.valueShapes[b]=c.id,this.shapes[c.id]=b},renderSlice:function(a,b){var c=this.target,d=this.options,e=this.radius,f=d.get("borderWidth"),g=d.get("offset"),h=2*Math.PI,i=this.values,j=this.total,k=g?2*Math.PI*(g/360):0,l,m,n,o,p;o=i.length;for(n=0;n<o;n++){l=k,m=k,j>0&&(m=k+h*(i[n]/j));if(a===n)return p=d.get("sliceColors")[n%d.get("sliceColors").length],b&&(p=this.calcHighlightColor(p,d)),c.drawPieSlice(e,e,e-f,l,m,undefined,p);k=m}},render:function(){var a=this.target,b=this.values,c=this.options,d=this.radius,e=c.get("borderWidth"),f,g;if(!z._super.
-render.call(this))return;e&&a.drawCircle(d,d,Math.floor(d-e/2),c.get("borderColor"),undefined,e).append();for(g=b.length;g--;)b[g]&&(f=this.renderSlice(g).append(),this.valueShapes[g]=f.id,this.shapes[f.id]=g);a.render()}}),a.fn.sparkline.box=A=d(a.fn.sparkline._base,{type:"box",init:function(b,c,d,e,f){A._super.init.call(this,b,c,d,e,f),this.values=a.map(c,Number),this.width=d.get("width")==="auto"?"4.0em":e,this.initTarget(),this.values.length||(this.disabled=1)},getRegion:function(){return 1},getCurrentRegionFields:function(){var a=[{field:"lq",value:this.quartiles[0]},{field:"med",value:this.quartiles[1]},{field:"uq",value:this.quartiles[2]}];return this.loutlier!==undefined&&a.push({field:"lo",value:this.loutlier}),this.routlier!==undefined&&a.push({field:"ro",value:this.routlier}),this.lwhisker!==undefined&&a.push({field:"lw",value:this.lwhisker}),this.rwhisker!==undefined&&a.push({field:"rw",value:this.rwhisker}),a},render:function(){var a=this.target,b=this.values,c=b.length,d=this.options,e=this.canvasWidth,f=this.canvasHeight,h=d.get("chartRangeMin")===undefined?Math.min.apply(Math,b):d.get("chartRangeMin"),i=d.get("chartRangeMax")===undefined?Math.max.apply(Math,b):d.get("chartRangeMax"),j=0,k,l,m,n,o,p,q,r,s,t,u;if(!A._super.render.call(this))return;if(d.get("raw"))d.get("showOutliers")&&b.length>5?(l=b[0],k=b[1],n=b[2],o=b[3],p=b[4],q=b[5],r=b[6]):(k=b[0],n=b[1],o=b[2],p=b[3],q=b[4]);else{b.sort(function(a,b){return a-b}),n=g(b,1),o=g(b,2),p=g(b,3),m=p-n;if(d.get("showOutliers")){k=q=undefined;for(s=0;s<c;s++)k===undefined&&b[s]>n-m*d.get("outlierIQR")&&(k=b[s]),b[s]<p+m*d.get("outlierIQR")&&(q=b[s]);l=b[0],r=b[c-1]}else k=b[0],q=b[c-1]}this.quartiles=[n,o,p],this.lwhisker=k,this.rwhisker=q,this.loutlier=l,this.routlier=r,u=e/(i-h+1),d.get("showOutliers")&&(j=Math.ceil(d.get("spotRadius")),e-=2*Math.ceil(d.get("spotRadius")),u=e/(i-h+1),l<k&&a.drawCircle((l-h)*u+j,f/2,d.get("spotRadius"),d.get("outlierLineColor"),d.get("outlierFillColor")).append(),r>q&&a.drawCircle((r-h)*u+j,f/2,d.get("spotRadius"),d.get("outlierLineColor"),d.get("outlierFillColor")).append()),a.drawRect(Math.round((n-h)*u+j),Math.round(f*.1),Math.round((p-n)*u),Math.round(f*.8),d.get("boxLineColor"),d.get("boxFillColor")).append(),a.drawLine(Math.round((k-h)*u+j),Math.round(f/2),Math.round((n-h)*u+j),Math.round(f/2),d.get("lineColor")).append(),a.drawLine(Math.round((k-h)*u+j),Math.round(f/4),Math.round((k-h)*u+j),Math.round(f-f/4),d.get("whiskerColor")).append(),a.drawLine(Math.round((q-h)*u+j),Math.round(f/2),Math.round((p-h)*u+j),Math.round(f/2),d.get("lineColor")).append(),a.drawLine(Math.round((q-h)*u+j),Math.round(f/4),Math.round((q-h)*u+j),Math.round(f-f/4),d.get("whiskerColor")).append(),a.drawLine(Math.round((o-h)*u+j),Math.round(f*.1),Math.round((o-h)*u+j),Math.round(f*.9),d.get("medianColor")).append(),d.get("target")&&(t=Math.ceil(d.get("spotRadius")),a.drawLine(Math.round((d.get("target")-h)*u+j),Math.round(f/2-t),Math.round((d.get("target")-h)*u+j),Math.round(f/2+t),d.get("targetColor")).append(),a.drawLine(Math.round((d.get("target")-h)*u+j-t),Math.round(f/2),Math.round((d.get("target")-h)*u+j+t),Math.round(f/2),d.get("targetColor")).append()),a.render()}}),function(){document.namespaces&&!document.namespaces.v?(a.fn.sparkline.hasVML=!0,document.namespaces.add("v","urn:schemas-microsoft-com:vml","#default#VML")):a.fn.sparkline.hasVML=!1;var b=document.createElement("canvas");a.fn.sparkline.hasCanvas=!!b.getContext&&!!b.getContext("2d")}(),D=d({init:function(a,b,c,d){this.target=a,this.id=b,this.type=c,this.args=d},append:function(){return this.target.appendShape(this),this}}),E=d({_pxregex:/(\d+)(px)?\s*$/i,init:function(b,c,d){if(!b)return;this.width=b,this.height=c,this.target=d,this.lastShapeId=null,d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this)},drawLine:function(a,b,c,d,e,f){return this.drawShape([[a,b],[c,d]],e,f)},drawShape:function(a,b,c,d){return this._genShape("Shape",[a,b,c,d])},drawCircle:function(a,b,c,d,e,f){return this._genShape("Circle",[a,b,c,d,e,f])},drawPieSlice:function(a,b,c,d,e,f,g){return this._genShape("PieSlice",[a,b,c,d,e,f,g])},drawRect:function(a,b,c,d,e,f){return this._genShape("Rect",[a,b,c,d,e,f])},getElement:function(){return this.canvas},getLastShapeId:function(){return this.lastShapeId},reset:function(){alert("reset not implemented")},_insert:function(b,c){a(c).html(b)},_calculatePixelDims:function(b,c,d){var e;e=this._pxregex.exec(c),e?this.pixelHeight=e[1]:this.pixelHeight=a(d).height(),e=this._pxregex.exec(b),e?this.pixelWidth=e[1]:this.pixelWidth=a(d).width()},_genShape:function(a,b){var c=I++;return b.unshift(c),new D(this,c,a,b)},appendShape:function(a){alert("appendShape not implemented")},replaceWithShape:function(a,b){alert("replaceWithShape not implemented")},insertAfterShape:function(a,b){alert("insertAfterShape not implemented")},removeShapeId:function(a){alert("removeShapeId not implemented")},getShapeAt:function(a,b,c){alert("getShapeAt not implemented")},render:function(){alert("render not implemented")}}),F=d(E,{init:function(b,c,d,e){F._super.init.call(this,b,c,d),this.canvas=document.createElement("canvas"),d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this),a(this.canvas).css({display:"inline-block",width:b,height:c,verticalAlign:"top"}),this._insert(this.canvas,d),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,this.interact=e,this.shapes={},this.shapeseq=[],this.currentTargetShapeId=undefined,a(this.canvas).css({width:this.pixelWidth,height:this.pixelHeight})},_getContext:function(a,b,c){var d=this.canvas.getContext("2d");return a!==undefined&&(d.strokeStyle=a),d.lineWidth=c===undefined?1:c,b!==undefined&&(d.fillStyle=b),d},reset:function(){var a=this._getContext();a.clearRect(0,0,this.pixelWidth,this.pixelHeight),this.shapes={},this.shapeseq=[],this.currentTargetShapeId=undefined},_drawShape:function(a,b,c,d,e){var f=this._getContext(c,d,e),g,h;f.beginPath(),f.moveTo(b[0][0]+.5,b[0][1]+.5);for(g=1,h=b.length;g<h;g++)f.lineTo(b[g][0]+.5,b[g][1]+.5);c!==undefined&&f.stroke(),d!==undefined&&f.fill(),this.targetX!==undefined&&this.targetY!==undefined&&f.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawCircle:function(a,b,c,d,e,f,g){var h=this._getContext(e,f,g);h.beginPath(),h.arc(b,c,d,0,2*Math.PI,!1),this.targetX!==undefined&&this.targetY!==undefined&&h.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a),e!==undefined&&h.stroke(),f!==undefined&&h.fill()},_drawPieSlice:function(a,b,c,d,e,f,g,h){var i=this._getContext(g,h);i.beginPath(),i.moveTo(b,c),i.arc(b,c,d,e,f,!1),i.lineTo(b,c),i.closePath(),g!==undefined&&i.stroke(),h&&i.fill(),this.targetX!==undefined&&this.targetY!==undefined&&i.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b+d,c],[b+d,c+e],[b,c+e],[b,c]],f,g)},appendShape:function(a){return this.shapes[a.id]=a,this.shapeseq.push(a.id),this.lastShapeId=a.id,a.id},replaceWithShape:function(a,b){var c=this.shapeseq,d;this.shapes[b.id]=b;for(d=c.length;d--;)c[d]==a&&(c[d]=b.id);delete this.shapes[a]},replaceWithShapes:function(a,b){var c=this.shapeseq,d={},e,f,g;for(f=a.length;f--;)d[a[f]]=!0;for(f=c.length;f--;)e=c[f],d[e]&&(c.splice(f,1),delete this.shapes[e],g=f);for(f=b.length;f--;)c.splice(g,0,b[f].id),this.shapes[b[f].id]=b[f]},insertAfterShape:function(a,b){var c=this.shapeseq,d;for(d=c.length;d--;)if(c[d]===a){c.splice(d+1,0,b.id),this.shapes[b.id]=b;return}},removeShapeId:function(a){var b=this.shapeseq,c;for(c=b.length;c--;)if(b[c]===a){b.splice(c,1);break}delete this.shapes[a]},getShapeAt:function(a,b,c){return this.targetX=b,this.targetY=c,this.render(),this.currentTargetShapeId},render:function(){var a=this.shapeseq,b=this.shapes,c=a.length,d=this._getContext(),e,f,g;d.clearRect(0,0,this.pixelWidth,this.pixelHeight);for(g=0;g<c;g++)e=a[g],f=b[e],this["_draw"+f.type].apply(this,f.args);this.interact||(this.shapes={},this.shapeseq=[])}}),G=d(E,{init:function(b,c,d){var e;G._super.init.call(this,b,c,d),d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this),this.canvas=document.createElement("span"),a(this.canvas).css({display:"inline-block",position:"relative",overflow:"hidden",width:b,height:c,margin:"0px",padding:"0px",verticalAlign:"top"}),this._insert(this.canvas,d),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,e='<v:group coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'"'+' style="position:absolute;top:0;left:0;width:'+this.pixelWidth+"px;height="+this.pixelHeight+'px;"></v:group>',this.canvas.insertAdjacentHTML("beforeEnd",e),this.group=a(this.canvas).children()[0],this.rendered=!1,this.prerender=""},_drawShape:function(a,b,c,d,e){var f=[],g,h,i,j,k,l,m;for(m=0,l=b.length;m<l;m++)f[m]=""+b[m][0]+","+b[m][1];return g=f.splice(0,1),e=e===undefined?1:e,h=c===undefined?' stroked="false" ':' strokeWeight="'+e+'px" strokeColor="'+c+'" ',i=d===undefined?' filled="false"':' fillColor="'+d+'" filled="true" ',j=f[0]===f[f.length-1]?"x ":"",k='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+h+i+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;" '+' path="m '+g+" l "+f.join(", ")+" "+j+'e">'+" </v:shape>",k},_drawCircle:function(a,b,c,d,e,f,g){var h,i,j;return b-=d,c-=d,h=e===undefined?' stroked="false" ':' strokeWeight="'+g+'px" strokeColor="'+e+'" ',i=f===undefined?' filled="false"':' fillColor="'+f+'" filled="true" ',j='<v:oval  id="jqsshape'+a+'" '+h+i+' style="position:absolute;top:'+c+"px; left:"+b+"px; width:"+d*2+"px; height:"+d*2+'px"></v:oval>',j},_drawPieSlice:function(a,b,c,d,e,f,g,h){var i,j,k,l,m,n,o,p;if(e===f)return"";f-e===2*Math.PI&&(e=0,f=2*Math.PI),j=b+Math.round(Math.cos(e)*d),k=c+Math.round(Math.sin(e)*d),l=b+Math.round(Math.cos(f)*d),m=c+Math.round(Math.sin(f)*d);if(j===l&&k===m){if(f-e<Math.PI)return"";j=l=b+d,k=m=c}return j===l&&k===m&&f-e<Math.PI?"":(i=[b-d,c-d,b+d,c+d,j,k,l,m],n=g===undefined?' stroked="false" ':' strokeWeight="1px" strokeColor="'+g+'" ',o=h===undefined?' filled="false"':' fillColor="'+h+'" filled="true" ',p='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+n+o+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;" '+' path="m '+b+","+c+" wa "+i.join(", ")+' x e">'+" </v:shape>",p)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b,c+e],[b+d,c+e],[b+d,c],[b,c]],f,g)},reset:function(){this.group.innerHTML=""},appendShape:function(a){var b=this["_draw"+a.type].apply(this,a.args);return this.rendered?this.group.insertAdjacentHTML("beforeEnd",b):this.prerender+=b,this.lastShapeId=a.id,a.id},replaceWithShape:function(b,c){var d=a("#jqsshape"+b),e=this["_draw"+c.type].apply(this,c.args);d[0].outerHTML=e},replaceWithShapes:function(b,c){var d=a("#jqsshape"+b[0]),e="",f=c.length,g;for(g=0;g<f;g++)e+=this["_draw"+c[g].type].apply(this,c[g].args);d[0].outerHTML=e;for(g=1;g<b.length;g++)a("#jqsshape"+b[g]).remove()},insertAfterShape:function(b,c){var d=a("#jqsshape"+b),e=this["_draw"+c.type].apply(this,c.args);d[0].insertAdjacentHTML("afterEnd",e)},removeShapeId:function(b){var c=a("#jqsshape"+b);this.group.removeChild(c[0])},getShapeAt:function(a,b,c){var d=a.id.substr(8);return d},render:function(){this.rendered||(this.group.innerHTML=this.prerender,this.rendered=!0)}})});
\ No newline at end of file
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index c83862af829..65643e1c219 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,8 +6,14 @@
     <t t-name="gamification.goal_list_to_do">
         <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
-            <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-            <h4><t t-esc="plan.name" /></h4>
+            <div class="oe_clear">
+                <div class="oe_left">
+                    <h4><t t-esc="plan.name" /></h4>
+                </div>
+                <div class="oe_left">
+                    <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
+                </div>
+            </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <div class="oe_goals_list">
@@ -41,11 +47,12 @@
                     <thead>
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <strong><t t-esc="planline.type_name"/></strong><br/>
-                            (Goal: max <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
+                            <strong><t t-esc="planline.type_name"/></strong>
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
+                            <br/>
+                            (Goal: max <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                         </th>
                     </tr>
                     </thead>
@@ -54,7 +61,7 @@
                         <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
                             <td><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col1" style="width:180px;">
+                            <td class="col1">
                                 <div class="oe_goal_outer_box" t-attf-style="width: #{goal.completeness}%;">
                                 <div class="oe_goal_inner_box">
                                     <t t-esc="goal.user_name"/><br/>
@@ -72,8 +79,7 @@
 
     <t t-name="gamification.challenge_suggestions">
         <h3>Suggestions</h3>
-        <em>You have been invited to the following challenges:</em>
-        <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
+        <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
             <li>
                 <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>
             </li>

From 021c8de63fad862b2d792ee9a8f52680024a6003 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 16:28:11 +0200
Subject: [PATCH 303/547] [ADD] action to create new users

bzr revid: mat@openerp.com-20130422142811-yle27izd3zhre2c0
---
 addons/gamification/goal.py                       |  1 +
 addons/gamification/goal_base_data.xml            | 13 +++++++++++++
 addons/gamification/static/src/js/gamification.js |  1 -
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 2377f5843c9..f64635d5f60 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -385,6 +385,7 @@ class gamification_goal(osv.Model):
                 for (view_id, mode) in action['views']:
                     if mode == "form":
                         views = [(view_id, mode)]
+                        break
                 action['views'] = views
                 action['target'] = 'new'
             return action
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index b1958475ce8..99603f917b7 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -46,6 +46,18 @@
             <field name="res_id_field">company_id.id</field>
         </record>
 
+
+        <record id="action_new_simplified_res_users" model="ir.actions.act_window">
+            <field name="name">New User</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.users</field>
+            <field name="view_type">form</field>
+            <field name="target">new</field>
+            <field name="view_id" ref="base.view_users_simple_form"/>
+            <field name="context">{'default_groups_ref': ['base.group_user']}</field>
+            <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>
+        </record>
+
         <record model="gamification.goal.type" id="type_base_invite">
             <field name="name">Invite new Users</field>
             <field name="description">Create at least another user</field>
@@ -53,6 +65,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id', '!=', user_id)]</field>
+            <field name="action_id" eval="ref('action_new_simplified_res_users')" />
         </record>
 
 
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index edfc304f83f..6965020e73d 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -50,7 +50,6 @@ openerp.gamification = function(instance) {
                 $.when(plan_action).done(function() {
                     var action_manager = new instance.web.ActionManager(this);
                     action_manager.do_action(plan_action.action).done(function () {
-                        console.log(plan_action.action);
                         self.get_goal_todo_info();
                     });
                 });

From c1d645e2cd0ecf6d7ce1e653ec524bb91596c9f5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 17:41:22 +0200
Subject: [PATCH 304/547] [FIX] css tweak

bzr revid: mat@openerp.com-20130422154122-yv99mjhpcrn7dwd4
---
 addons/gamification/static/src/css/goal.css         |  4 ++--
 addons/gamification/static/src/xml/gamification.xml | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index fa6c9e096ab..f4b064ef074 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -78,7 +78,7 @@
     text-transform: capitalize;
     line-height: 1em;
 }
-/* mark goal as completed */
+
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached {
     text-decoration: line-through;
     color: rgb(138, 137, 137);
@@ -150,7 +150,7 @@
     visibility: hidden;
     font-size: 25px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_clear:hover .oe_update_plan,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan,
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action {
     visibility: visible;
 }
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 65643e1c219..93f81247151 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,16 +6,13 @@
     <t t-name="gamification.goal_list_to_do">
         <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
-            <div class="oe_clear">
-                <div class="oe_left">
-                    <h4><t t-esc="plan.name" /></h4>
-                </div>
-                <div class="oe_left">
-                    <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-                </div>
+            <div>
+                <h4 style="display:inline-block;"><t t-esc="plan.name" /></h4>
+                <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
             </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
+
                 <div class="oe_goals_list">
                     <div t-attf-class="#{goal.type_display == 'progress' ? 'oe_goal_outer_box' : ''}" t-foreach="plan.goals" t-as="goal" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : ''}">
                     <div class="oe_goal_inner_box">

From e78cf61df39022e328394f44c0c68d8ef024a999 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 10:25:04 +0200
Subject: [PATCH 305/547] [IMP] better mail message

bzr revid: mat@openerp.com-20130423082504-b89coxnaf8y7hdhe
---
 addons/gamification/plan.py | 51 ++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 5f75d8ecda4..3a84819476b 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -612,21 +612,20 @@ class gamification_goal_plan(osv.Model):
         """Actions for the end of a challenge
 
         If a reward was selected, grant it to the correct users.
-        The TOP 3 reward should be granted at:
+        Rewards granted at:
             - the end date for a challenge with no periodicity
             - the end of a period for challenge with periodicity
             - when a challenge is manually closed
-        The every success reward should be granted at:
-            - the end date for a challenge with no periodicity
-            - the end of a period for challenge with periodicity
-            - as soon as a user reach every goal of a plan
-        (can not reward TOP 3 for challenge/goals with no end date)
+        (if no end date, a running challenge is never rewarded)
         """
         for plan in self.browse(cr, uid, plan_ids, context=context):
             (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
             yesterday = date.today() - timedelta(days=1)
             if end_date == yesterday.isoformat() or force:
-                # reward everybody
+                # open chatter message
+                message_body = "The challenge %s is finished." % plan.name
+
+                # reward for everybody succeeding
                 rewarded_users = []
                 if plan.reward_id:
                     for user in plan.user_ids:
@@ -641,29 +640,28 @@ class gamification_goal_plan(osv.Model):
                             self.reward_user(cr, uid, user.id, plan.reward_id.id, context)
                             rewarded_users.append(user)
 
+                    if rewarded_users:
+                        message_body += "<br/>Reward (badge %s) for every succeeding user was sent to %s." % (plan.reward_id.name, ", ".join([user.name for user in rewarded_users]))
+                    else:
+                        message_body += "<br/>Nobody succeeded every goal, no reward is then sent for this challenge."
+
                 # reward bests
-                best_users = []
                 if plan.reward_first_id:
                     (first_user, second_user, third_user) = self.get_top3_users(cr, uid, plan, context)
                     if first_user:
                         self.reward_user(cr, uid, first_user.id, plan.reward_first_id.id, context)
-                        best_users.append(first_user)
+                        message_body += "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
+                        message_body += "<br/> 1. %s - %s" % (first_user.name, plan.reward_first_id.name)
+                    else:
+                        message_body += "Nobody reached the required conditions to receive special rewards."
+
                     if second_user and plan.reward_second_id:
                         self.reward_user(cr, uid, second_user.id, plan.reward_second_id.id, context)
-                        best_users.append(second_user)
+                        message_body += "<br/> 2. %s - %s" % (second_user.name, plan.reward_second_id.name)
                     if third_user and plan.reward_third_id:
                         self.reward_user(cr, uid, third_user.id, plan.reward_second_id.id, context)
-                        best_users.append(third_user)
+                        message_body += "<br/> 3. %s - %s" % (third_user.name, plan.reward_third_id.name)
 
-                print(end_date, force)
-                # open chatter message
-                message_body = "The challenge %s is finished." % plan.name
-                if rewarded_users:
-                    message_body += " Badge rewards were sent to %s." % ", ".join([user.name for user in rewarded_users])
-                if best_users:
-                    message_body += " Specials badges were sent to %s." % ", ".join([user.name for user in best_users])
-                if not rewarded_users and not best_users and (plan.reward_id or plan.reward_first_id):
-                    message_body += " No badge was granted as nobody reached the required conditions."
                 self.message_post(cr, uid, plan.id, body=message_body, context=context)
         return True
 
@@ -671,8 +669,15 @@ class gamification_goal_plan(osv.Model):
         """Get the top 3 users for a defined plan
 
         Ranking criterias:
-            - succeed every goal of the challenge
-            - total completeness of each goal (can be over 100)
+            1. succeed every goal of the challenge
+            2. total completeness of each goal (can be over 100)
+        Top 3 is computed only for users succeeding every goal of the challenge,
+        except if reward_failure is True, in which case every user is
+        considered.
+        :return: ('first', 'second', 'third'), tuple containing the res.users
+        objects of the top 3 users. If no user meets the criterias for a rank,
+        it is set to False. Nobody can receive a rank is noone receives the
+        higher one (eg: if 'second' == False, 'third' will be False)
         """
         goal_obj = self.pool.get('gamification.goal')
         (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
@@ -699,7 +704,7 @@ class gamification_goal_plan(osv.Model):
 
             challengers.append({'user': user, 'all_reached': all_reached, 'total_completness': total_completness})
         sorted_challengers = sorted(challengers, key=lambda k: (k['all_reached'], k['total_completness']), reverse=True)
-        print(sorted_challengers)
+
         if len(sorted_challengers) == 0 or (not plan.reward_failure and not sorted_challengers[0]['all_reached']):
             # nobody succeeded
             return (False, False, False)

From 7a2fd09518fd97c34d39df1976576c24abba4692 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 10:27:04 +0200
Subject: [PATCH 306/547] [FIX] correct domain for logged call

bzr revid: mat@openerp.com-20130423082704-mf02y1yopnr0jjmc
---
 addons/gamification_sale_crm/sale_crm_goals.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 1977ed80c33..2afedbad2a8 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -56,7 +56,7 @@
             <field name="unit">calls</field>
             <field name="model_id" eval="ref('crm.model_crm_phonecall')" />
             <field name="field_date_id" eval="ref('crm.field_crm_phonecall_date_closed')" />
-            <field name="domain">[('user_id','=',user_id),('type','='),('state','=','done')]</field>
+            <field name="domain">[('user_id','=',user_id),('state','=','done')]</field>
         </record> 
 
         <record model="gamification.goal.type" id="type_crm_nbr_new_opportunities">

From 4e205c37514bf788a8fb51bacf86e16935cdf062 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 11:41:43 +0200
Subject: [PATCH 307/547] [IMP] users follow goal plan

bzr revid: mat@openerp.com-20130423094143-8tc0xrca53n2h0gt
---
 addons/gamification/plan.py | 52 ++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 3a84819476b..18c7dd9d4b0 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -208,14 +208,37 @@ class gamification_goal_plan(osv.Model):
         if not ids:
             return True
 
+        # unsubscribe removed users from the plan
+        # users are not able to manually unsubscribe to challenges so should
+        # do it for them when not concerned anymore
+        if 'user_ids' in vals:
+            for action_tuple in vals['user_ids']:
+                if action_tuple[0] == 3:
+                    # form (3, ID), remove one
+                    self.message_unsubscribe_users(cr, uid, ids, [action_tuple[1]], context=context)
+                if action_tuple[0] == 5:
+                    # form (5,), remove all
+                    for plan in self.browse(cr, uid, ids, context=context):
+                        self.message_unsubscribe_users(cr, uid, [plan.id], [user.id for user in plan.user_ids], context=context)
+                if action_tuple[0] == 6:
+                    # form (6, False, [IDS]), replace by IDS
+                    for plan in self.browse(cr, uid, ids, context=context):
+                        removed_users = set([user.id for user in plan.user_ids]) - set(action_tuple[2])
+                        self.message_unsubscribe_users(cr, uid, [plan.id], list(removed_users), context=context)
+
         write_res = super(gamification_goal_plan, self).write(cr, uid, ids, vals, context=context)
 
         # add users when change the group auto-subscription
         if 'autojoin_group_id' in vals:
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
-            if new_group:
-                self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
+            group_user_ids = [user.id for user in new_group.users]
+            for plan in self.browse(cr, uid, ids, context=context):
+                self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in group_user_ids]}, context=context)
 
+        # subscribe new users to the plan
+        if 'user_ids' in vals:
+            for plan in self.browse(cr, uid, ids, context=context):
+                self.message_subscribe_users(cr, uid, ids, [user.id for user in plan.user_ids], context=context)
         return write_res
 
     ##### Update #####
@@ -272,7 +295,8 @@ class gamification_goal_plan(osv.Model):
 
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
-                self.plan_subscribe_users(cr, uid, [plan.id], [user.id for user in plan.autojoin_group_id.users], context=context)
+                # check in case of new users in plan, this happens if manager removed users in plan manually
+                self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in plan.autojoin_group_id.users]}, context=context)
             self.generate_goals_from_plan(cr, uid, [plan.id], context=context)
 
             # goals closed but still opened at the last report date
@@ -310,7 +334,7 @@ class gamification_goal_plan(osv.Model):
         # subscribe users if autojoin group
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
-                self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
+                self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in plan.autojoin_group_id.users]}, context=context)
 
             self.write(cr, uid, plan.id, {'state': 'inprogress'}, context=context)
             self.message_post(cr, uid, plan.id, body="New challenge started.", context=context)
@@ -415,21 +439,6 @@ class gamification_goal_plan(osv.Model):
 
         return True
 
-    def plan_subscribe_users(self, cr, uid, ids, new_user_ids, context=None):
-        """ Add the following users to plans
-
-        :param ids: ids of plans to which the users will be added
-        :param new_user_ids: ids of the users to add"""
-
-        for plan in self.browse(cr, uid, ids, context):
-            subscription = [user.id for user in plan.user_ids]
-            subscription.extend(new_user_ids)
-            # remove duplicates
-            unified_subscription = list(set(subscription))
-
-            self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in unified_subscription]}, context=context)
-        return True
-
     ##### JS utilities #####
 
     def get_board_goal_info(self, cr, uid, plan, subset_goal_ids=False, context=None):
@@ -542,9 +551,9 @@ class gamification_goal_plan(osv.Model):
 
             body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards})
 
+            # send to every follower of the plan
             self.message_post(cr, uid, plan.id,
                 body=body_html,
-                partner_ids=[(6, 0, [user.partner_id.id for user in plan.user_ids])],
                 context=context,
                 subtype='mail.mt_comment')
             if plan.report_message_group_id:
@@ -565,7 +574,8 @@ class gamification_goal_plan(osv.Model):
 
                 body_html = template_env.get_template('personal_progress.mako').render(values)
 
-                self.message_post(cr, uid, plan.id,
+                # send message only to user
+                self.message_post(cr, uid, 0,
                                   body=body_html,
                                   partner_ids=[(4, user.partner_id.id)],
                                   context=context,

From e9004f9a8151105c0004fdb831d54c013e4efa93 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 11:51:34 +0200
Subject: [PATCH 308/547] [FIX] remove plan_subscribe_users calls

bzr revid: mat@openerp.com-20130423095134-0to2b206786b2fdl
---
 addons/gamification/res_users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 8592b3f7338..4e8346c66c3 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -19,7 +19,7 @@ class res_users_gamification_group(osv.Model):
             goal_plan_obj = self.pool.get('gamification.goal.plan')
             plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
 
-            goal_plan_obj.plan_subscribe_users(cr, uid, plan_ids, ids, context=context)
+            self.write(cr, uid, [plan.id], {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
 
         if vals.get('image'):
             self.pool.get('gamification.goal').changed_users_avatar(cr, uid, ids, context)
@@ -141,5 +141,5 @@ class res_groups_gamification_group(osv.Model):
             goal_plan_obj = self.pool.get('gamification.goal.plan')
             plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', ids)], context=context)
 
-            goal_plan_obj.plan_subscribe_users(cr, uid, plan_ids, user_ids, context=context)
+            self.write(cr, uid, [plan.id], {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
         return write_res

From 53020169a6c942a94f14c333682cdc7b6252c68d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 12:15:12 +0200
Subject: [PATCH 309/547] [FIX] auto-add users when added to groups

bzr revid: mat@openerp.com-20130423101512-e8gs9eqcql8i5jzp
---
 addons/gamification/plan.py      | 2 +-
 addons/gamification/res_users.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 18c7dd9d4b0..c24bca968ab 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -211,7 +211,7 @@ class gamification_goal_plan(osv.Model):
         # unsubscribe removed users from the plan
         # users are not able to manually unsubscribe to challenges so should
         # do it for them when not concerned anymore
-        if 'user_ids' in vals:
+        if vals.get('user_ids'):
             for action_tuple in vals['user_ids']:
                 if action_tuple[0] == 3:
                     # form (3, ID), remove one
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 4e8346c66c3..18034880d68 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -18,8 +18,8 @@ class res_users_gamification_group(osv.Model):
 
             goal_plan_obj = self.pool.get('gamification.goal.plan')
             plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
-
-            self.write(cr, uid, [plan.id], {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
+            if plan_ids:
+                goal_plan_obj.write(cr, uid, plan_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
 
         if vals.get('image'):
             self.pool.get('gamification.goal').changed_users_avatar(cr, uid, ids, context)
@@ -140,6 +140,6 @@ class res_groups_gamification_group(osv.Model):
 
             goal_plan_obj = self.pool.get('gamification.goal.plan')
             plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', ids)], context=context)
-
-            self.write(cr, uid, [plan.id], {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
+            if plan_ids:
+                goal_plan_obj.write(cr, uid, plan_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
         return write_res

From abc8e81c7030913872c0741b8e8922e929453889 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 14:23:25 +0200
Subject: [PATCH 310/547] [FIX] user id in list and better test

bzr revid: mat@openerp.com-20130423122325-tt89rw7674lgmxyp
---
 addons/gamification/badge.py           |  1 +
 addons/gamification/plan.py            |  5 +++--
 addons/gamification/test/goal_demo.yml | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 56dff256402..2b681dca91e 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -239,6 +239,7 @@ class gamification_badge(osv.Model):
         :param badge_user_ids: list(int) of badge users that will receive the badge
         :param user_from: res.users object that has sent the badge
         """
+        context = context or {}
         badge = self.browse(cr, uid, badge_id, context=context)
         template_env = TemplateHelper()
 
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index c24bca968ab..80867675bda 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -296,7 +296,7 @@ class gamification_goal_plan(osv.Model):
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
                 # check in case of new users in plan, this happens if manager removed users in plan manually
-                self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in plan.autojoin_group_id.users]}, context=context)
+                self.write(cr, uid, [plan.id], {'user_ids': [(4, user.id) for user in plan.autojoin_group_id.users]}, context=context)
             self.generate_goals_from_plan(cr, uid, [plan.id], context=context)
 
             # goals closed but still opened at the last report date
@@ -334,7 +334,7 @@ class gamification_goal_plan(osv.Model):
         # subscribe users if autojoin group
         for plan in self.browse(cr, uid, ids, context=context):
             if plan.autojoin_group_id:
-                self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in plan.autojoin_group_id.users]}, context=context)
+                self.write(cr, uid, [plan.id], {'user_ids': [(4, user.id) for user in plan.autojoin_group_id.users]}, context=context)
 
             self.write(cr, uid, plan.id, {'state': 'inprogress'}, context=context)
             self.message_post(cr, uid, plan.id, body="New challenge started.", context=context)
@@ -628,6 +628,7 @@ class gamification_goal_plan(osv.Model):
             - when a challenge is manually closed
         (if no end date, a running challenge is never rewarded)
         """
+        context = context or {}
         for plan in self.browse(cr, uid, plan_ids, context=context):
             (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
             yesterday = date.today() - timedelta(days=1)
diff --git a/addons/gamification/test/goal_demo.yml b/addons/gamification/test/goal_demo.yml
index e30acf450c3..bfa8240fb50 100644
--- a/addons/gamification/test/goal_demo.yml
+++ b/addons/gamification/test/goal_demo.yml
@@ -36,4 +36,18 @@
     goal_ids = self.search(cr, uid, [('user_id', '=', ref('base.user_demo')),('type_id','=',ref('type_base_timezone'))])
     self.update(cr, uid, goal_ids, context=context)
     for goal in self.browse(cr, uid, goal_ids, context=context):
-      assert goal.state == "reached", "Goal not successful %s" % goal.state
\ No newline at end of file
+      assert goal.state == "reached", "Goal not successful %s" % goal.state
+-
+  I add a reward to the challenge
+-
+  !record {model: gamification.goal.plan, id: plan_base_discover}:
+    reward_first_id: gamification.badge_good_job
+    reward_failure: True
+-
+  I check the demo user received the badge
+-
+  !python {model: gamification.goal.plan}: |
+    plan = self.browse(cr, uid, ref('plan_base_discover'), context=context)
+    self.action_close(cr, uid, [plan.id])
+    badge_ids = self.pool.get('gamification.badge.user').search(cr, uid, [('badge_id', '=', ref('badge_good_job')), ('user_id', '=', ref('base.user_demo'))])
+    assert badge_ids, "Demo users didn't received the badge"
\ No newline at end of file

From 1419b2fa974e4fbad7294f87be03ab01a9417122 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 15:03:51 +0200
Subject: [PATCH 311/547] [IMP] users follow goal plan

bzr revid: mat@openerp.com-20130423130351-pq3tepnmx2u74au5
---
 addons/gamification/goal.py                   | 19 ++++++++++---------
 addons/gamification/plan_view.xml             |  5 ++---
 .../static/src/js/gamification.js             | 11 +++--------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index f64635d5f60..5d7bddd4a3f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.safe_eval import safe_eval
+from openerp.tools.translate import _
 
 from templates import TemplateHelper
 
@@ -138,17 +139,17 @@ class gamification_goal(osv.Model):
         """Return the percentage of completeness of the goal, between 0 and 100"""
         res = {}
         for goal in self.browse(cr, uid, ids, context):
-            # if goal.computation_mode == 'higher':
+            if goal.type_condition == 'higher':
                 if goal.current > 0:
                     res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
                 else:
                     res[goal.id] = 0.0
-            # else:
-            #     # a goal 'lower than' has only two values possible: 0 or 100%
-            #     if goal.current < goal.target_goal:
-            #         res[goal.id] = 100.0
-            #     else:
-            #         res[goal.id] = 0.0
+            else:
+                # a goal 'lower than' has only two values possible: 0 or 100%
+                if goal.current < goal.target_goal:
+                    res[goal.id] = 100.0
+                else:
+                    res[goal.id] = 0.0
         return res
 
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
@@ -342,8 +343,8 @@ class gamification_goal(osv.Model):
         """Overwrite the write method to update the last_update field to today
 
         If the current value is changed and the report frequency is set to On
-        change, a report is generated"""
-
+        change, a report is generated
+        """
         vals['last_update'] = fields.date.today()
         result = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         for goal in self.browse(cr, uid, ids, context=context):
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index b1e79fa8ba5..f41e54c0599 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -35,7 +35,7 @@
                 <form string="Goal types" version="7.0">
                     <header>
                         <button string="Start Now" type="object" name="action_start" states="draft" class="oe_highlight"/>
-                        <button string="Check Challenge" type="object" name="action_check" states="inprogress"/>
+                        <button string="Refresh Challenge" type="object" name="action_check" states="inprogress"/>
                         <button string="Close Challenge" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Reset to Draft" type="object" name="action_cancel" states="inprogress"/>
                         <button string="Reset Completion" type="object" name="action_reset" states="done"/>
@@ -92,8 +92,7 @@
                                     <field name="reward_failure" attrs="{'invisible': [('reward_first_id','=', False)]}" />
                                 </group>
                                 <div class="oe_grey">
-                                    <p>Badges are granted when a challenge is finished. This is either when at the end of a running period (eg: end of the month for a monthly challenge) or at the end date of a challenge (if no periodicity is set).</p>
-                                    <p>Ranking is done on the number of succeeded goals and the percentage of each one.</p>
+                                    <p>Badges are granted when a challenge is finished. This is either at the end of a running period (eg: end of the month for a monthly challenge), at the end date of a challenge (if no periodicity is set) or when the challenge is manually closed.</p>
                                 </div>
                             </page>
                             <page string="Advanced Options">
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 6965020e73d..21f7a7ef2a8 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -12,14 +12,7 @@ openerp.gamification = function(instance) {
             this.challenge_suggestions = {};
         },
         events: {
-            'click a.oe_update_goal': function(event) {
-                var self = this;
-                var goal_id = parseInt(event.currentTarget.id, 10);
-                var goal_updated = new instance.web.Model('gamification.goal').call('update', [[goal_id]]);
-                $.when(goal_updated).done(function() {
-                    self.get_goal_todo_info();
-                });
-            },
+            // update a plan and related goals
             'click a.oe_update_plan': function(event) {
                 var self = this;
                 var plan_id = parseInt(event.currentTarget.id, 10);
@@ -28,6 +21,7 @@ openerp.gamification = function(instance) {
                     self.get_goal_todo_info();
                 });
             },
+            // action to modify a goal
             'click a.oe_goal_action': function(event) {
                 var self = this;
                 var goal_id = parseInt(event.currentTarget.id, 10);
@@ -41,6 +35,7 @@ openerp.gamification = function(instance) {
                     });
                 });
             },
+            // get more info about a challenge request
             'click a.oe_challenge_reply': function(event) {
                 var self = this;
                 var plan_id = parseInt(event.currentTarget.id, 10);

From 99505e351d8f3b38e2adc3bdfa5f09f0e58fb896 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 15:20:34 +0200
Subject: [PATCH 312/547] [IMP] better kanban view

bzr revid: mat@openerp.com-20130423132034-fgblz5f4658n2i8g
---
 addons/gamification/badge_view.xml          | 18 ++++++++++--------
 addons/gamification/static/src/css/goal.css |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 6b7b4f2628b..8d4db8dff8e 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -140,16 +140,10 @@
                             <div t-attf-class="#{record.stat_my.raw_value ? 'oe_kanban_color_5' : 'oe_kanban_color_white'} oe_kanban_card oe_kanban_global_click oe_kanban_badge">
                                 <div class="oe_kanban_content">
                                     <div class="oe_kanban_left">
-                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="110" height="110" /></a>
+                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="90" height="90" /></a>
                                     </div>
-                                    <div>
+                                    <div class="oe_no_overflow">
                                         <h4><field name="name"/></h4>
-                                        <t t-if="record.description.value">
-                                            <em><field name="description"/></em>
-                                        </t>
-                                        <p>
-                                            Total: <t t-esc="record.stat_count.raw_value"/> (<t t-esc="record.stat_this_month.raw_value"/> this month)
-                                        </p>
                                         <t t-if="record.remaining_sending.value != 0">
                                             <button type="action" name="%(action_grant_wizard)d" class="oe_highlight">Grant</button>
                                             <span class="oe_grey">
@@ -164,8 +158,16 @@
                                         <t t-if="record.remaining_sending.value == 0">
                                             <div class="oe_grey">Can not grant</div>
                                         </t>
+                                        <p>
+                                            <strong>Stats</strong><br/>
+                                            Total: <t t-esc="record.stat_count.raw_value"/><br/>
+                                            This month: <t t-esc="record.stat_this_month.raw_value"/>
+                                        </p>
                                     </div>
                                     <div class="oe_kanban_badge_avatars">
+                                        <t t-if="record.description.value">
+                                            <p><em><field name="description"/></em></p>
+                                        </t>
                                         <a type="object" name="get_granted_employees">
                                             <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
                                                 <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index f4b064ef074..bf73a0273de 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -42,7 +42,9 @@
 .oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg {
     margin-top: -20px;
 }
-
+.openerp .oe_no_overflow {
+    overflow: hidden;
+}
 .openerp .oe_red {
     color: red;
 }

From 006a2663966ff0c6edde19d7635cc7a89ce6e71f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 17:55:32 +0200
Subject: [PATCH 313/547] [IMP] on change, doc and catergory

bzr revid: mat@openerp.com-20130423155532-yxqq2nchuaeyxste
---
 addons/gamification/__openerp__.py            |  2 +-
 .../doc/gamification_plan_howto.rst           | 26 +++++++++----------
 addons/gamification/goal.py                   |  2 +-
 addons/gamification/goal_view.xml             |  2 +-
 addons/gamification/plan.py                   | 10 +++++++
 addons/gamification/plan_view.xml             |  2 +-
 addons/gamification_sale_crm/__openerp__.py   |  2 +-
 addons/hr_gamification/__openerp__.py         |  2 +-
 8 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 5946e81224f..eb0ce297fa2 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -22,7 +22,7 @@
     'name': 'Gamification',
     'version': '1.0',
     'author': 'OpenERP SA',
-    'category': 'Human Resources',
+    'category': 'Human Ressources',
     'depends': ['mail'],
     'description': """
 Gamification process
diff --git a/addons/gamification/doc/gamification_plan_howto.rst b/addons/gamification/doc/gamification_plan_howto.rst
index a0b6eefb7da..5669c0408db 100644
--- a/addons/gamification/doc/gamification_plan_howto.rst
+++ b/addons/gamification/doc/gamification_plan_howto.rst
@@ -1,15 +1,15 @@
-How to create new goal plan for my addon
+How to create new challenge for my addon
 ========================================
 
 Running example
 +++++++++++++++
 
-A module to create and manage groceries lists has been developped. To motivate users to use it, a goal plan is developped. This how to will explain the creation of a dedicated module and the XML file for the required data.
+A module to create and manage groceries lists has been developped. To motivate users to use it, a challenge (gamification.goal.plan) is developped. This how to will explain the creation of a dedicated module and the XML file for the required data.
 
 Module
 ++++++
 
-The goal plan for my addon will consist of an auto-installed module containing only the definition of goals. Goal type are quite technical to create and should not be seen or modified through the web interface.
+The challenge for my addon will consist of an auto-installed module containing only the definition of goals. Goal type are quite technical to create and should not be seen or modified through the web interface.
 
 If our groceries module is called ``groceries``, the structure will be consisted of three addons :
 
@@ -58,13 +58,13 @@ To be able to compute the number of lines, the model containing groceries is req
     <field name="field_date_id" eval="ref('groceries.field_groceries_item_shopping_day')" />
   </record>
 
-As we do not want to count every recorded item, we will use a domain to restrict the selection on the user (display the count only for the items the users will be buying) and the state (only the items whose list is confirmed are included). The user restriction is made with the keyword ``user_id`` in the domain. During the evaluation, it is replaced by the user ID of the linked goal.
+As we do not want to count every recorded item, we will use a domain to restrict the selection on the user (display the count only for the items the users has bought) and the state (only the items whose list is confirmed are included). The user restriction is made with the keyword ``user_id`` in the domain and should correspond to a many2one field with the relation ``res.users``. During the evaluation, it is replaced by the user ID of the linked goal.
 
 ::
 
   <record model="gamification.goal.type" id="type_groceries_nbr_items">
     ...
-    <field name="domain">[('shopper_id', '=' ,user_id), ('list_id.state', '=', 'confirmed')]</field>
+    <field name="domain">[('shopper_id', '=', user_id), ('list_id.state', '=', 'confirmed')]</field>
   </record>
 
 An action can also be defined to help users to quickly reach the screen where they will be able to modify their current value. This is done by adding the XML ID of the ir.action we want to call. In our example, we would like to open the grocery list form view owned by the user.
@@ -83,14 +83,10 @@ If we do not specify a res_id to the action, only the list of records can be dis
 Plan definition
 ++++++++++++++++
 
-Once all the goal types are defined, a goal plan can be created. In our example, we would like to create a plan "Discover the Groceries Module" with simple tasks applied to every new user in the group ``groceries.shoppers_group``. This goal plan should only be applied once by user so no recurring date is selected.
+Once all the goal types are defined, a challenge (or goal plan) can be created. In our example, we would like to create a plan "Discover the Groceries Module" with simple tasks applied to every new user in the group ``groceries.shoppers_group``. This goal plan should only be applied once by user and with no ending period, no dates or peridocity is then selected. The goal will be started manually but specifying a value to ``start_date`` can make it start automatically.
 
 ::
-  <record model="gamification.goal.planline" id="planline_groceries_discover1">
-    <field name="type_id" eval="ref('type_groceries_nbr_items')" />
-    <field name="target_goal">3</field>
-  </record>
-  
+
   <record model="gamification.goal.plan" id="plan_groceries_discover">
     <field name="name">Discover the Groceries Module</field>
     <field name="period">once</field>
@@ -98,10 +94,14 @@ Once all the goal types are defined, a goal plan can be created. In our example,
     <field name="report_message_frequency">never</field>
     <field name="planline_ids" eval="[(4, ref('planline_groceries_discover1'))]"/>
     <field name="autojoin_group_id" eval="ref('groceries.shoppers_group')" />
-    <field name="start_date" eval="(DateTime.today() - timedelta(days=1)).strftime('%Y-%m-%d')"/>
-    <!-- setting start date to yesterday allows automatic start at module installation -->
   </record>
 
+To add goal types to a plan, planlines must be created. The value to reach is defined for a planline, this will be the ``target_goal`` for each goal generated.
+
+::
+
   <record model="gamification.goal.planline" id="planline_groceries_discover1">
+    <field name="type_id" eval="ref('type_groceries_nbr_items')" />
+    <field name="target_goal">3</field>
     <field name="plan_id" eval="ref('plan_groceries_discover')" />
   </record>
\ No newline at end of file
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 5d7bddd4a3f..3c788abc22e 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -157,7 +157,7 @@ class gamification_goal(osv.Model):
         if not type_id:
             return {'value': {'type_id': False}}
         goal_type = goal_type.browse(cr, uid, type_id, context=context)
-        ret = {'value': {'computation_mode': goal_type.computation_mode}}
+        ret = {'value': {'computation_mode': goal_type.computation_mode, 'type_condition': goal_type.condition}}
         return ret
 
     _columns = {
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index fc1fdbab4ee..9a913863455 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -79,7 +79,7 @@
                                 <div>
                                     <field name="current" class="oe_inline"/>
                                     <button string="refresh" type="object" name="update" class="oe_link" attrs="{'invisible':['|',('computation_mode', '=', 'manually'),('state', '=', 'draft')]}" />
-                                    <div class="oe_grey">
+                                    <div class="oe_grey" attrs="{'invisible':[('type_id', '=', False)]}">
                                         Reached when current value is <strong><field name="type_condition" class="oe_inline"/></strong> than the target.
                                     </div>
                                 </div>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 80867675bda..3917b9c11ae 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -757,6 +757,16 @@ class gamification_goal_planline(osv.Model):
                 result[p_id] = True
         return result.keys()
 
+    def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
+        goal_type = self.pool.get('gamification.goal.type')
+        if not type_id:
+            return {'value': {'type_id': False}}
+        goal_type = goal_type.browse(cr, uid, type_id, context=context)
+        ret = {'value': {
+            'type_condition': goal_type.condition,
+            'type_full_suffix': goal_type.full_suffix}}
+        return ret
+
     _columns = {
         'name': fields.related('type_id', 'name', string="Name"),
         'plan_id': fields.many2one('gamification.goal.plan',
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml
index f41e54c0599..1f0a872acf5 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/plan_view.xml
@@ -75,7 +75,7 @@
                                 <field name="planline_ids" nolabel="1" colspan="4">
                                     <tree string="Planline List" version="7.0" editable="bottom" >
                                         <field name="sequence" widget="handle"/>
-                                        <field name="type_id"/>
+                                        <field name="type_id" on_change="on_change_type_id(type_id)" />
                                         <field name="type_condition"/>
                                         <field name="target_goal"/>
                                         <field name="type_full_suffix"/>
diff --git a/addons/gamification_sale_crm/__openerp__.py b/addons/gamification_sale_crm/__openerp__.py
index 429292e0025..adfb8de08e0 100644
--- a/addons/gamification_sale_crm/__openerp__.py
+++ b/addons/gamification_sale_crm/__openerp__.py
@@ -22,7 +22,7 @@
     'name': 'CRM Gamification',
     'version': '1.0',
     'author': 'OpenERP SA',
-    'category': 'CRM',
+    'category': 'hidden',
     'depends': ['gamification','sale_crm'],
     'description': """Example of goal types and plans that can be used related to the usage of the CRM Sale module.""",
 
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index ed7a18dd3e9..d98e7df3f24 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -22,7 +22,7 @@
     'name': 'HR Gamification',
     'version': '1.0',
     'author': 'OpenERP SA',
-    'category': 'HR',
+    'category': 'hidden',
     'depends': ['gamification', 'hr'],
     'description': """Use the HR ressources for the gamification process.
 

From fbe0c21a9720fa9b1f5c17a030eb39f58890826f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 23 Apr 2013 18:06:48 +0200
Subject: [PATCH 314/547] [IMP] limit to data

bzr revid: mat@openerp.com-20130423160648-gq5hv2j4tdda8ovj
---
 addons/gamification/badge_data.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index d77a409d711..8bd60d72dec 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -620,6 +620,8 @@
             <field name="name">Brilliant</field>
             <field name="description">With your brilliant ideas, you are an inspiration to others.</field>
             <field name="rule_auth">everyone</field>
+            <field name="rule_max">True</field>
+            <field name="rule_max_number">2</field>
             <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QAvQBcABUZb0TlAAAACXBI
                                 WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMdCTAQSodN2wAAIABJREFUeNrsvXmUbVd93/nZe5/x
                                 zlPN9eZRehqRkBACZGywmWwwNnjAcXDbTsftOEknbnevtnt5OXHshHjICrEhcRaJzdDGYIyZBEgI

From 01784af22c65c9dec8c425dce949f795ac7baaf6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 10:12:16 +0200
Subject: [PATCH 315/547] [IMP] better security rules

bzr revid: mat@openerp.com-20130424081216-cjyq0edrht6r0j1v
---
 .../security/gamification_security.xml        | 20 -------------------
 .../gamification/security/ir.model.access.csv | 15 +++++++-------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index d68181c1e0c..d7a9b01bb13 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -13,7 +13,6 @@
         </record>
 
         <record id="goal_user_visibility" model="ir.rule">
-            <!-- TODO fix private for board -->
             <field name="name">User can only see his/her goals or goal from the same plan in board visibility</field>
             <field name="model_id" ref="model_gamification_goal"/>
             <field name="groups" eval="[(4, ref('base.group_user'))]"/>
@@ -28,24 +27,5 @@
                         ('plan_id.user_ids','in',user.id),
                         ('plan_id.visibility_mode','=','board')]</field>
         </record>
-        <record id="goal_manager_visibility" model="ir.rule">
-            <field name="name">Manager has all rights on user's goals</field>
-            <field name="model_id" ref="model_gamification_goal"/>
-            <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-        <record id="goal_plan_manager_visibility" model="ir.rule">
-            <field name="name">Manager has all rights on goal plans</field>
-            <field name="model_id" ref="model_gamification_goal_plan"/>
-            <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 223aeb9ac0e..5144e26d2bb 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -1,21 +1,20 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 
-goal_user,"Goal User",model_gamification_goal,base.group_user,1,1,0,0
+goal_anybody,"Goal Anybody",model_gamification_goal,,1,1,0,0
 goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
 
-goal_type_user,"Goal Type User",model_gamification_goal_type,base.group_user,1,0,0,0
+goal_type_anybody,"Goal Type Anybody",model_gamification_goal_type,,1,0,0,0
 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
 
-plan_user,"Goal Plan User",model_gamification_goal_plan,,1,0,0,0
+plan_anybody,"Goal Plan Anybody",model_gamification_goal_plan,,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
 
+planline_anybody,"Goal Planline Anybody",model_gamification_goal_planline,,1,0,0,0
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
-planline_user,"Goal Planline Anybody",model_gamification_goal_planline,base.group_user,1,0,0,0
 
-badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
-badge_user,"Badge User",model_gamification_badge,base.group_user,1,0,0,0
 badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0
+badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
 
-badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1
-badge_user_user,"Badge-user User",model_gamification_badge_user,base.group_user,1,1,1,0
 badge_user_anybody,"Badge-user Anybody",model_gamification_badge_user,,1,0,0,0
+badge_user_user,"Badge-user User",model_gamification_badge_user,base.group_user,1,1,1,0
+badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1

From 8182600868879445ce1a96349c545e07a07a3a0f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 10:36:32 +0200
Subject: [PATCH 316/547] [IMP] use github version of justgage

bzr revid: mat@openerp.com-20130424083632-c68tdeg79wcns9hj
---
 .../static/src/js/gamification.js             |  12 +-
 addons/gamification/static/src/js/justgage.js | 361 ++++++++++--------
 2 files changed, 218 insertions(+), 155 deletions(-)

diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 21f7a7ef2a8..b004d88f1b9 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -30,8 +30,11 @@ openerp.gamification = function(instance) {
                 });
                 $.when(goal_action).done(function() {
                     var action_manager = new instance.web.ActionManager(this);
-                    action_manager.do_action(goal_action.action).done(function () {
-                        self.get_goal_todo_info();
+                    var action = action_manager.do_action(goal_action.action);
+                    $.when(action).done(function () {
+                        new instance.web.Model('gamification.goal').call('update', [[goal_id]]).then(function(res) {
+                            self.get_goal_todo_info();
+                        });
                     });
                 });
             },
@@ -140,11 +143,8 @@ openerp.gamification = function(instance) {
             // add gauge in goal kanban views
             $.when(rendering).done(function() {
                 if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
-                    var unique_id = _.uniqueId("goal_gauge_");
-                    self.$el.find('.oe_goal_gauge').attr('id', unique_id);
                     var g = new JustGage({
-                        id: unique_id,
-                        node: self.$('.oe_goal_gauge').empty().get(0),
+                        parentNode: self.$('.oe_goal_gauge').empty().get(0),
                         value: self.record.current.raw_value,
                         min: 0,
                         max: self.record.target_goal.raw_value,
diff --git a/addons/gamification/static/src/js/justgage.js b/addons/gamification/static/src/js/justgage.js
index 52b5c6ea0c3..865a04054a4 100644
--- a/addons/gamification/static/src/js/justgage.js
+++ b/addons/gamification/static/src/js/justgage.js
@@ -6,6 +6,18 @@
  *
  * LATEST UPDATES
 
+ * -----------------------------
+ * April 18, 2013.
+ * -----------------------------
+     * parentNode - use this instead of id, to attach gauge to node which is outside of DOM tree - https://github.com/toorshia/justgage/issues/48
+     * width - force gauge width
+     * height - force gauge height
+
+ * -----------------------------
+ * April 17, 2013.
+ * -----------------------------
+     * fix - https://github.com/toorshia/justgage/issues/49
+
  * -----------------------------
  * April 01, 2013.
  * -----------------------------
@@ -68,11 +80,8 @@
 
  JustGage = function(config) {
 
-  if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
-  if (!config.node) {
-    if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
-    config.node = document.getElementById(config.id);
-  }
+  // if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
+  // if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
 
   var obj = this;
 
@@ -83,9 +92,17 @@
     // this is container element id
     id : config.id,
 
-    // node : string
-    // the node to use instead of DOM
-    node : config.node,
+    // parentNode : node object
+    // this is container element
+    parentNode : (config.parentNode) ? config.parentNode : null,
+
+    // width : int
+    // gauge width
+    width : (config.width) ? config.width : null,
+
+    // height : int
+    // gauge height
+    height : (config.height) ? config.height : null,
 
     // title : string
     // gauge title
@@ -99,7 +116,6 @@
     // value gauge is showing
     value : (config.value) ? config.value : 0,
 
-
     // valueFontColor : string
     // color of label showing current value
     valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
@@ -267,27 +283,39 @@
   maxY;
 
   // overflow values
-  if (this.config.value > this.config.max) this.config.value = this.config.max;
-  if (this.config.value < this.config.min) this.config.value = this.config.min;
-  this.originalValue = config.value;
+  if (obj.config.value > obj.config.max) obj.config.value = obj.config.max;
+  if (obj.config.value < obj.config.min) obj.config.value = obj.config.min;
+  obj.originalValue = config.value;
 
-  // canvas
-  this.canvas = Raphael(this.config.node, "100%", "100%");
-  if (this.config.relativeGaugeSize === true) {
-    this.canvas.setViewBox(0, 0, 200, 150, true);
+  // create canvas
+  if (obj.config.id !== null && (document.getElementById(obj.config.id)) !== null) {
+    obj.canvas = Raphael(obj.config.id, "100%", "100%");
+  } else if (obj.config.parentNode !== null) {
+    obj.canvas = Raphael(obj.config.parentNode, "100%", "100%");
+  }
+
+  if (obj.config.relativeGaugeSize === true) {
+    obj.canvas.setViewBox(0, 0, 200, 150, true);
   }
 
   // canvas dimensions
-  if (this.config.relativeGaugeSize === true) {
+  if (obj.config.relativeGaugeSize === true) {
+    canvasW = 200;
+    canvasH = 150;
+  } else if (obj.config.width !== null && obj.config.height !== null) {
+    canvasW = obj.config.width;
+    canvasH = obj.config.height;
+  } else if (obj.config.parentNode !== null) {
+    obj.canvas.setViewBox(0, 0, 200, 150, true);
     canvasW = 200;
     canvasH = 150;
   } else {
-    canvasW = getStyle(this.config.node, "width").slice(0, -2) * 1;
-    canvasH = getStyle(this.config.node, "height").slice(0, -2) * 1;
+    canvasW = getStyle(document.getElementById(obj.config.id), "width").slice(0, -2) * 1;
+    canvasH = getStyle(document.getElementById(obj.config.id), "height").slice(0, -2) * 1;
   }
 
   // widget dimensions
-  if (this.config.donut === true) {
+  if (obj.config.donut === true) {
 
     // DONUT *******************************
 
@@ -323,7 +351,7 @@
     // value
     valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
     valueX = dx + widgetW / 2;
-    if(this.config.label !== '') {
+    if(obj.config.label !== '') {
       valueY = dy + widgetH / 1.85;
     } else {
       valueY = dy + widgetH / 1.7;
@@ -336,12 +364,12 @@
 
     // min
     minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
     minY = labelY;
 
     // max
     maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
     maxY = labelY;
 
   } else {
@@ -378,33 +406,33 @@
     dy = (canvasH - widgetH)/2;
 
     // title
-    titleFontSize = ((widgetH / 8) > this.config.titleMinFontSize) ? (widgetH / 10) : this.config.titleMinFontSize;
+    titleFontSize = ((widgetH / 8) > obj.config.titleMinFontSize) ? (widgetH / 10) : obj.config.titleMinFontSize;
     titleX = dx + widgetW / 2;
     titleY = dy + widgetH / 6.4;
 
     // value
-    valueFontSize = ((widgetH / 6.5) > this.config.valueMinFontSize) ? (widgetH / 6.5) : this.config.valueMinFontSize;
+    valueFontSize = ((widgetH / 6.5) > obj.config.valueMinFontSize) ? (widgetH / 6.5) : obj.config.valueMinFontSize;
     valueX = dx + widgetW / 2;
     valueY = dy + widgetH / 1.275;
 
     // label
-    labelFontSize = ((widgetH / 16) > this.config.labelMinFontSize) ? (widgetH / 16) : this.config.labelMinFontSize;
+    labelFontSize = ((widgetH / 16) > obj.config.labelMinFontSize) ? (widgetH / 16) : obj.config.labelMinFontSize;
     labelX = dx + widgetW / 2;
     labelY = valueY + valueFontSize / 2 + 5;
 
     // min
-    minFontSize = ((widgetH / 16) > this.config.minLabelMinFontSize) ? (widgetH / 16) : this.config.minLabelMinFontSize;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minFontSize = ((widgetH / 16) > obj.config.minLabelMinFontSize) ? (widgetH / 16) : obj.config.minLabelMinFontSize;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
     minY = labelY;
 
     // max
-    maxFontSize = ((widgetH / 16) > this.config.maxLabelMinFontSize) ? (widgetH / 16) : this.config.maxLabelMinFontSize;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxFontSize = ((widgetH / 16) > obj.config.maxLabelMinFontSize) ? (widgetH / 16) : obj.config.maxLabelMinFontSize;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
     maxY = labelY;
   }
 
   // parameters
-  this.params  = {
+  obj.params  = {
     canvasW : canvasW,
     canvasH : canvasH,
     widgetW : widgetW,
@@ -432,7 +460,7 @@
   canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
 
   // pki - custom attribute for generating gauge paths
-  this.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
+  obj.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
 
     var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
 
@@ -492,212 +520,247 @@
   };
 
   // gauge
-  this.gauge = this.canvas.path().attr({
-    "stroke": "none",
-    "fill": this.config.gaugeColor,
-    pki: [this.config.max, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+  obj.gauge = obj.canvas.path().attr({
+      "stroke": "none",
+      "fill": obj.config.gaugeColor,
+      pki: [
+        obj.config.max,
+        obj.config.min,
+        obj.config.max,
+        obj.params.widgetW,
+        obj.params.widgetH,
+        obj.params.dx,
+        obj.params.dy,
+        obj.config.gaugeWidthScale,
+        obj.config.donut
+      ]
   });
-  this.gauge.id = this.config.id+"-gauge";
 
   // level
-  this.level = this.canvas.path().attr({
+  obj.level = obj.canvas.path().attr({
     "stroke": "none",
-    "fill": getColor(this.config.value, (this.config.value - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors),
-    pki: [this.config.min, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+    "fill": getColor(obj.config.value, (obj.config.value - obj.config.min) / (obj.config.max - obj.config.min), obj.config.levelColors, obj.config.noGradient, obj.config.customSectors),
+    pki: [
+      obj.config.min,
+      obj.config.min,
+      obj.config.max,
+      obj.params.widgetW,
+      obj.params.widgetH,
+      obj.params.dx,
+      obj.params.dy,
+      obj.config.gaugeWidthScale,
+      obj.config.donut
+    ]
   });
-  if(this.config.donut) {
-    this.level.transform("r" + this.config.donutStartAngle + ", " + (this.params.widgetW/2 + this.params.dx) + ", " + (this.params.widgetH/1.95 + this.params.dy));
+  if(obj.config.donut) {
+    obj.level.transform("r" + obj.config.donutStartAngle + ", " + (obj.params.widgetW/2 + obj.params.dx) + ", " + (obj.params.widgetH/1.95 + obj.params.dy));
   }
-  this.level.id = this.config.id+"-level";
 
   // title
-  this.txtTitle = this.canvas.text(this.params.titleX, this.params.titleY, this.config.title);
-  this.txtTitle.attr({
-    "font-size":this.params.titleFontSize,
+  obj.txtTitle = obj.canvas.text(obj.params.titleX, obj.params.titleY, obj.config.title);
+  obj.txtTitle.attr({
+    "font-size":obj.params.titleFontSize,
     "font-weight":"bold",
     "font-family":"Arial",
-    "fill":this.config.titleFontColor,
+    "fill":obj.config.titleFontColor,
     "fill-opacity":"1"
   });
-  setDy(this.txtTitle, this.params.titleFontSize, this.params.titleY);
-  this.txtTitle.id = this.config.id+"-txttitle";
+  setDy(obj.txtTitle, obj.params.titleFontSize, obj.params.titleY);
 
   // value
-  this.txtValue = this.canvas.text(this.params.valueX, this.params.valueY, 0);
-  this.txtValue.attr({
-    "font-size":this.params.valueFontSize,
+  obj.txtValue = obj.canvas.text(obj.params.valueX, obj.params.valueY, 0);
+  obj.txtValue.attr({
+    "font-size":obj.params.valueFontSize,
     "font-weight":"bold",
     "font-family":"Arial",
-    "fill":this.config.valueFontColor,
+    "fill":obj.config.valueFontColor,
     "fill-opacity":"0"
   });
-  setDy(this.txtValue, this.params.valueFontSize, this.params.valueY);
-  this.txtValue.id = this.config.id+"-txtvalue";
+  setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
 
   // label
-  this.txtLabel = this.canvas.text(this.params.labelX, this.params.labelY, this.config.label);
-  this.txtLabel.attr({
-    "font-size":this.params.labelFontSize,
+  obj.txtLabel = obj.canvas.text(obj.params.labelX, obj.params.labelY, obj.config.label);
+  obj.txtLabel.attr({
+    "font-size":obj.params.labelFontSize,
     "font-weight":"normal",
     "font-family":"Arial",
-    "fill":this.config.labelFontColor,
+    "fill":obj.config.labelFontColor,
     "fill-opacity":"0"
   });
-  setDy(this.txtLabel, this.params.labelFontSize, this.params.labelY);
-  this.txtLabel.id = this.config.id+"-txtlabel";
+  setDy(obj.txtLabel, obj.params.labelFontSize, obj.params.labelY);
 
   // min
-  this.txtMinimum = this.config.min;
-  if( this.config.humanFriendly ) this.txtMinimum = humanFriendlyNumber( this.config.min, this.config.humanFriendlyDecimal );
-  this.txtMin = this.canvas.text(this.params.minX, this.params.minY, this.txtMinimum);
-  this.txtMin.attr({
-    "font-size":this.params.minFontSize,
+  obj.txtMinimum = obj.config.min;
+  if( obj.config.humanFriendly ) obj.txtMinimum = humanFriendlyNumber( obj.config.min, obj.config.humanFriendlyDecimal );
+  obj.txtMin = obj.canvas.text(obj.params.minX, obj.params.minY, obj.txtMinimum);
+  obj.txtMin.attr({
+    "font-size":obj.params.minFontSize,
     "font-weight":"normal",
     "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+    "fill":obj.config.labelFontColor,
+    "fill-opacity": (obj.config.hideMinMax || obj.config.donut)? "0" : "1"
   });
-  setDy(this.txtMin, this.params.minFontSize, this.params.minY);
-  this.txtMin.id = this.config.id+"-txtmin";
+  setDy(obj.txtMin, obj.params.minFontSize, obj.params.minY);
 
   // max
-  this.txtMaximum = this.config.max;
-  if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
-  this.txtMax = this.canvas.text(this.params.maxX, this.params.maxY, this.txtMaximum);
-  this.txtMax.attr({
-    "font-size":this.params.maxFontSize,
+  obj.txtMaximum = obj.config.max;
+  if( obj.config.humanFriendly ) obj.txtMaximum = humanFriendlyNumber( obj.config.max, obj.config.humanFriendlyDecimal );
+  obj.txtMax = obj.canvas.text(obj.params.maxX, obj.params.maxY, obj.txtMaximum);
+  obj.txtMax.attr({
+    "font-size":obj.params.maxFontSize,
     "font-weight":"normal",
     "font-family":"Arial",
-    "fill":this.config.labelFontColor,
-    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+    "fill":obj.config.labelFontColor,
+    "fill-opacity": (obj.config.hideMinMax || obj.config.donut)? "0" : "1"
   });
-  setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
-  this.txtMax.id = this.config.id+"-txtmax";
+  setDy(obj.txtMax, obj.params.maxFontSize, obj.params.maxY);
 
-  var defs = this.canvas.canvas.childNodes[1];
+  var defs = obj.canvas.canvas.childNodes[1];
   var svg = "http://www.w3.org/2000/svg";
 
   if (ie < 9) {
     onCreateElementNsReady(function() {
-      this.generateShadow(svg, defs);
+      obj.generateShadow(svg, defs);
     });
   } else {
-    this.generateShadow(svg, defs);
+    obj.generateShadow(svg, defs);
   }
 
   // var clear
   defs, svg = null;
 
-  // execute on each animation frame
-  function onAnimate() {
-    if (obj.config.counter) {
-      var currentValue = obj.level.attr("pki");
+  // set value to display
+  if(obj.config.textRenderer) {
+    obj.originalValue = obj.config.textRenderer(obj.originalValue);
+  } else if(obj.config.humanFriendly) {
+    obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
+  } else {
+    obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
+  }
 
+  if(obj.config.counter === true) {
+    //on each animation frame
+    eve.on("raphael.anim.frame." + (obj.level.id), function() {
+      var currentValue = obj.level.attr("pki");
       if(obj.config.textRenderer) {
-        // this.originalValue = this.config.textRenderer(this.originalValue);
         obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
       } else if(obj.config.humanFriendly) {
-        // this.originalValue = humanFriendlyNumber( this.originalValue, this.config.humanFriendlyDecimal ) + this.config.symbol;
         obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
       } else {
-        // this.originalValue += this.config.symbol;
         obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
       }
-
       setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
       currentValue = null;
-    }
+    });
+    //on animation end
+    eve.on("raphael.anim.finish." + (obj.level.id), function() {
+      obj.txtValue.attr({"text" : obj.originalValue});
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+    });
+  } else {
+    //on animation start
+    eve.on("raphael.anim.start." + (obj.level.id), function() {
+      obj.txtValue.attr({"text" : obj.originalValue});
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+    });
   }
 
-  if(!obj.config.counter) {
-    if(obj.config.textRenderer) {
-      obj.originalValue = obj.config.textRenderer(obj.originalValue);
-    } else if(obj.config.humanFriendly) {
-      obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
-    } else {
-      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
-    }
-
-    obj.txtValue.attr("text", obj.originalValue);
-    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-  }
-
-  //event fired on each animation frame
-  eve.on("raphael.anim.frame.*", onAnimate);
-
-  // animate gauge level
-  this.level.animate({pki: [this.config.value, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]},  this.config.startAnimationTime, this.config.startAnimationType);
-
-  // animate value
-  this.txtValue.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
-
-  // animate label
-  this.txtLabel.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+  // animate gauge level, value & label
+  obj.level.animate({
+    pki: [
+      obj.config.value,
+      obj.config.min,
+      obj.config.max,
+      obj.params.widgetW,
+      obj.params.widgetH,
+      obj.params.dx,
+      obj.params.dy,
+      obj.config.gaugeWidthScale,
+      obj.config.donut
+    ]
+  }, obj.config.startAnimationTime, obj.config.startAnimationType);
+  obj.txtValue.animate({"fill-opacity":(obj.config.hideValue)?"0":"1"}, obj.config.startAnimationTime, obj.config.startAnimationType);
+  obj.txtLabel.animate({"fill-opacity":"1"}, obj.config.startAnimationTime, obj.config.startAnimationType);
 };
 
 /** Refresh gauge level */
 JustGage.prototype.refresh = function(val, max) {
 
-  var originalVal, displayVal, color, max = max || null;
+  var obj = this;
+  var displayVal, color, max = max || null;
 
   // set new max
   if(max !== null) {
-    this.config.max = max;
+    obj.config.max = max;
 
-    this.txtMaximum = this.config.max;
-    if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
-    this.txtMax.attr({"text" : this.config.max});
-    setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+    obj.txtMaximum = obj.config.max;
+    if( obj.config.humanFriendly ) obj.txtMaximum = humanFriendlyNumber( obj.config.max, obj.config.humanFriendlyDecimal );
+    obj.txtMax.attr({"text" : obj.txtMaximum});
+    setDy(obj.txtMax, obj.params.maxFontSize, obj.params.maxY);
   }
 
   // overflow values
-  originalVal = val;
   displayVal = val;
-  if ((val * 1) > (this.config.max * 1)) {val = (this.config.max * 1);}
-  if ((val * 1) < (this.config.min * 1)) {val = (this.config.min * 1);}
+  if ((val * 1) > (obj.config.max * 1)) {val = (obj.config.max * 1);}
+  if ((val * 1) < (obj.config.min * 1)) {val = (obj.config.min * 1);}
 
-  color = getColor(val, (val - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors);
+  color = getColor(val, (val - obj.config.min) / (obj.config.max - obj.config.min), obj.config.levelColors, obj.config.noGradient, obj.config.customSectors);
 
-  if(this.config.textRenderer) {
-    displayVal = this.config.textRenderer(displayVal);
-  } else if( this.config.humanFriendly ) {
-    displayVal = humanFriendlyNumber( displayVal, this.config.humanFriendlyDecimal ) + this.config.symbol;
+  if(obj.config.textRenderer) {
+    displayVal = obj.config.textRenderer(displayVal);
+  } else if( obj.config.humanFriendly ) {
+    displayVal = humanFriendlyNumber( displayVal, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
   } else {
-    displayVal = (displayVal * 1).toFixed(this.config.decimals) + this.config.symbol;
+    displayVal = (displayVal * 1).toFixed(obj.config.decimals) + obj.config.symbol;
+  }
+  obj.originalValue = displayVal;
+  obj.config.value = val * 1;
+
+  if(!obj.config.counter) {
+    obj.txtValue.attr({"text":displayVal});
+    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
   }
 
-  if(!this.config.counter) {
-    this.canvas.getById(this.config.id+"-txtvalue").attr({"text":displayVal});
-    setDy(this.canvas.getById(this.config.id+"-txtvalue"), this.params.valueFontSize, this.params.valueY);
-  }
-
-  this.canvas.getById(this.config.id+"-level").animate({pki: [val, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut], "fill":color},  this.config.refreshAnimationTime, this.config.refreshAnimationType);
-  this.config.value = val * 1;
+  obj.level.animate({
+    pki: [
+      obj.config.value,
+      obj.config.min,
+      obj.config.max,
+      obj.params.widgetW,
+      obj.params.widgetH,
+      obj.params.dx,
+      obj.params.dy,
+      obj.config.gaugeWidthScale,
+      obj.config.donut
+    ],
+    "fill":color
+  },  obj.config.refreshAnimationTime, obj.config.refreshAnimationType);
 
   // var clear
-  originalVal, displayVal, color, max = null;
+  obj, displayVal, color, max = null;
 };
 
 /** Generate shadow */
 JustGage.prototype.generateShadow = function(svg, defs) {
 
+  var obj = this;
   var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
 
   // FILTER
-  gaussFilter=document.createElementNS(svg,"filter");
-  gaussFilter.setAttribute("id", this.config.id + "-inner-shadow");
+  gaussFilter = document.createElementNS(svg,"filter");
+  gaussFilter.setAttribute("id","inner-shadow");
   defs.appendChild(gaussFilter);
 
   // offset
   feOffset = document.createElementNS(svg,"feOffset");
   feOffset.setAttribute("dx", 0);
-  feOffset.setAttribute("dy", this.config.shadowVerticalOffset);
+  feOffset.setAttribute("dy", obj.config.shadowVerticalOffset);
   gaussFilter.appendChild(feOffset);
 
   // blur
   feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
   feGaussianBlur.setAttribute("result","offset-blur");
-  feGaussianBlur.setAttribute("stdDeviation", this.config.shadowSize);
+  feGaussianBlur.setAttribute("stdDeviation", obj.config.shadowSize);
   gaussFilter.appendChild(feGaussianBlur);
 
   // composite 1
@@ -711,7 +774,7 @@ JustGage.prototype.generateShadow = function(svg, defs) {
   // flood
   feFlood = document.createElementNS(svg,"feFlood");
   feFlood.setAttribute("flood-color","black");
-  feFlood.setAttribute("flood-opacity", this.config.shadowOpacity);
+  feFlood.setAttribute("flood-opacity", obj.config.shadowOpacity);
   feFlood.setAttribute("result","color");
   gaussFilter.appendChild(feFlood);
 
@@ -731,9 +794,9 @@ JustGage.prototype.generateShadow = function(svg, defs) {
   gaussFilter.appendChild(feComposite3);
 
   // set shadow
-  if (!this.config.hideInnerShadow) {
-    this.canvas.canvas.childNodes[2].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
-    this.canvas.canvas.childNodes[3].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+  if (!obj.config.hideInnerShadow) {
+    obj.canvas.canvas.childNodes[2].setAttribute("filter", "url(#inner-shadow)");
+    obj.canvas.canvas.childNodes[3].setAttribute("filter", "url(#inner-shadow)");
   }
 
   // var clear
@@ -796,7 +859,7 @@ function getColor(val, pct, col, noGradient, custSec) {
 
 /** Fix Raphael display:none tspan dy attribute bug */
 function setDy(elem, fontSize, txtYpos) {
-  if ((!ie || ie > 9) && (elem.node.firstChild.attributes.dy)) {
+  if (!ie || ie > 9) {
     elem.node.firstChild.attributes.dy.value = 0;
   }
 }
@@ -831,7 +894,7 @@ function humanFriendlyNumber( n, d ) {
 function getStyle(oElm, strCssRule){
   var strValue = "";
   if(document.defaultView && document.defaultView.getComputedStyle){
-    strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
+    strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
   }
   else if(oElm.currentStyle){
     strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
@@ -880,4 +943,4 @@ var ie = (function(){
     all[0]
     );
     return v > 4 ? v : undef;
-}());
\ No newline at end of file
+}());

From a92cc45cc3c1058bc16946cce90e84d04c65c43f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 10:52:38 +0200
Subject: [PATCH 317/547] [IMP] order and domain

bzr revid: mat@openerp.com-20130424085238-k8q6uess92xl2q5u
---
 addons/gamification/goal.py                  | 2 +-
 addons/hr_gamification/gamification_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 3c788abc22e..d836bcc82c1 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -222,7 +222,7 @@ class gamification_goal(osv.Model):
         'state': 'draft',
         'start_date': fields.date.today,
     }
-    _order = 'create_date, end_date desc, type_id, id'
+    _order = 'create_date desc, end_date desc, type_id, id'
 
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
diff --git a/addons/hr_gamification/gamification_view.xml b/addons/hr_gamification/gamification_view.xml
index fa43895e618..08064526460 100644
--- a/addons/hr_gamification/gamification_view.xml
+++ b/addons/hr_gamification/gamification_view.xml
@@ -11,7 +11,7 @@
                 <form string="Grant Badge To" version="7.0">
                     Who would you like to reward?
                     <group>
-                        <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False)]" />
+                        <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False),('user_id', '!=', uid)]" />
                         <field name="badge_id" invisible="1"/>
                         <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding"/>
                     </group>

From b6f78b34011447567d25a4cca0a066e80e318162 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 11:14:11 +0200
Subject: [PATCH 318/547] [FIX] make hr_gamification removable

bzr revid: mat@openerp.com-20130424091411-qo45cw3nkby195pc
---
 addons/hr_gamification/gamification_view.xml | 22 +++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/addons/hr_gamification/gamification_view.xml b/addons/hr_gamification/gamification_view.xml
index 08064526460..57e77dc22eb 100644
--- a/addons/hr_gamification/gamification_view.xml
+++ b/addons/hr_gamification/gamification_view.xml
@@ -4,26 +4,20 @@
 
         <!-- Wizard -->
 
-        <record id="gamification.view_badge_wizard_grant" model="ir.ui.view">
+        <record id="view_badge_wizard_grant_employee" model="ir.ui.view">
             <field name="name">Grant Badge Employee Form</field>
             <field name="model">gamification.badge.user.wizard</field>
+            <field name="inherit_id" ref="gamification.view_badge_wizard_grant" />
             <field name="arch" type="xml">
-                <form string="Grant Badge To" version="7.0">
-                    Who would you like to reward?
-                    <group>
+                <data>
+                    <xpath expr="//field[@name='user_id']" position="replace">
                         <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False),('user_id', '!=', uid)]" />
-                        <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding"/>
-                    </group>
-                    <footer>
-                        <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </footer>
-                </form>
+                    </xpath>
+                </data>
             </field>
         </record>
 
-        <record id="gamification.view_badge_wizard_reward" model="ir.ui.view">
+        <record id="view_badge_wizard_reward" model="ir.ui.view">
             <field name="name">Reward Employee Badge Form</field>
             <field name="model">gamification.badge.user.wizard</field>
             <field name="arch" type="xml">
@@ -48,7 +42,7 @@
             res_model="gamification.badge.user.wizard"
             context="{'default_employee_id': active_id, 'employee_id': active_id}"
             view_type="form" view_mode="form"
-            view_id="gamification.view_badge_wizard_reward"/>
+            view_id="view_badge_wizard_reward"/>
 
         <record id="hr_badge_form_view" model="ir.ui.view">
             <field name="name">Badge Form</field>

From cd23075ff694dfe4c50f5af2b9c9545b920d560e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 12:31:07 +0200
Subject: [PATCH 319/547] [IMP] better report, show only first 3 in boards

bzr revid: mat@openerp.com-20130424103107-4rgs89hzk7bhgpqt
---
 addons/gamification/plan.py                   | 13 ++++++-----
 .../templates/group_progress.mako             | 22 ++++++++++---------
 .../templates/personal_progress.mako          | 10 ++++++---
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 3917b9c11ae..c2547f4c79b 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -30,7 +30,7 @@ import logging
 _logger = logging.getLogger(__name__)
 
 
-def start_end_date_for_period(period, global_start_date=False, global_end_date=False):
+def start_end_date_for_period(period, default_start_date=False, default_end_date=False):
     """Return the start and end date for a goal period based on today
 
     :return: (start_date, end_date), datetime.date objects, False if the period is
@@ -51,8 +51,8 @@ def start_end_date_for_period(period, global_start_date=False, global_end_date=F
         start_date = today.replace(month=1, day=1)
         end_date = today.replace(month=12, day=31)
     else:  # period == 'once':
-        start_date = global_start_date  # for manual goal, start each time
-        end_date = global_end_date
+        start_date = default_start_date  # for manual goal, start each time
+        end_date = default_end_date
 
     if start_date and end_date:
         return (start_date.isoformat(), end_date.isoformat())
@@ -95,7 +95,8 @@ class gamification_goal_plan(osv.Model):
                 res[plan.id] = next.isoformat()
             elif plan.report_message_frequency == 'yearly':
                 res[plan.id] = last.replace(year=last.year + 1).isoformat()
-            else:  # frequency == 'once':
+            # frequency == 'once', reported when closed only
+            else:
                 res[plan.id] = False
 
         return res
@@ -549,7 +550,7 @@ class gamification_goal_plan(osv.Model):
         if plan.visibility_mode == 'board':
             planlines_boards = self.get_board_goal_info(cr, uid, plan, subset_goal_ids, context)
 
-            body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards})
+            body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards, 'uid': uid})
 
             # send to every follower of the plan
             self.message_post(cr, uid, plan.id,
@@ -574,7 +575,7 @@ class gamification_goal_plan(osv.Model):
 
                 body_html = template_env.get_template('personal_progress.mako').render(values)
 
-                # send message only to user
+                # send message only to users
                 self.message_post(cr, uid, 0,
                                   body=body_html,
                                   partner_ids=[(4, user.partner_id.id)],
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index f2c7c28e3fd..6f4b7d5d747 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -13,16 +13,18 @@
 	            <th>Current</th>
 	        </tr>
 	        % for idx, goal in planline.board_goals:
-	            <tr
-	                % if goal.completeness >= 100:
-	                    style="font-weight:bold;"
-	                % endif
-	                >
-	                <td>${idx+1}</td>
-	                <td>${goal.user_id.name}</td>
-	                <td>${goal.completeness}%</td>
-	                <td>${goal.current}/${goal.target_goal}</td>
-	            </tr>
+                % if idx < 3 or goal.user_id.id == uid:
+    	            <tr
+    	                % if goal.completeness >= 100:
+    	                    style="font-weight:bold;"
+    	                % endif
+    	                >
+    	                <td>${idx+1}</td>
+    	                <td>${goal.user_id.name}</td>
+    	                <td>${goal.completeness}%</td>
+    	                <td>${goal.current}/${goal.target_goal} ${goal.type_suffix}</td>
+    	            </tr>
+                % endif
 	        % endfor
         </table>
 
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
index 642d0aa9fc8..e5cfbc3137c 100644
--- a/addons/gamification/templates/personal_progress.mako
+++ b/addons/gamification/templates/personal_progress.mako
@@ -8,10 +8,14 @@
         <th>Completeness</th>
     </tr>
     % for goal in goals:
-        <tr>
+        <tr
+            % if goal.completeness >= 100:
+                style="font-weight:bold;"
+            % endif
+            >
             <td>${goal.type_id.name}</td>
-            <td>${goal.target_goal}</td>
-            <td>${goal.current}</td>
+            <td>${goal.target_goal} ${goal.type_suffix}</td>
+            <td>${goal.current} ${goal.type_suffix}</td>
             <td>${goal.completeness} %</td>
         </tr>
     % endfor

From cc8d4ae4d49cb3102fd6ef069d8d82a02fad9403 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 14:23:34 +0200
Subject: [PATCH 320/547] [ADD] goal type example

bzr revid: mat@openerp.com-20130424122334-9wyfq4ns2d1c4c50
---
 addons/gamification/__init__.py                |  1 +
 addons/gamification/goal.py                    |  2 +-
 addons/gamification/goal_base_data.xml         |  7 +++++++
 addons/gamification/goal_type_data.py          | 18 +++++++++++++-----
 addons/gamification/goal_view.xml              |  2 +-
 .../gamification/templates/group_progress.mako |  6 +++++-
 .../templates/personal_progress.mako           | 12 ++++++++++--
 7 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index b7f7efeac07..3c4211df081 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -1,4 +1,5 @@
 import goal
+import goal_type_data
 import plan
 import res_users
 import badge
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index d836bcc82c1..ce830e93f06 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -258,7 +258,7 @@ class gamification_goal(osv.Model):
                             subtype='mail.mt_comment')
 
             elif goal.type_id.computation_mode == 'python':
-                values = {'cr': cr, 'uid': uid, 'context': context, 'self': self.pool.get('gamification.goal.type')}
+                values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.type')}
                 result = safe_eval(goal.type_id.compute_code, values, {})
 
                 if type(result) == float or type(result) == int:
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 99603f917b7..76408c92e85 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -68,6 +68,13 @@
             <field name="action_id" eval="ref('action_new_simplified_res_users')" />
         </record>
 
+        <record model="gamification.goal.type" id="type_nbr_following">
+            <field name="name"># Mail Group Following</field>
+            <field name="description">Follow mail groups to receive news</field>
+            <field name="computation_mode">python</field>
+            <field name="compute_code">self.number_following(cr, uid, 'mail.group')</field>
+            <field name="action_id" eval="ref('mail.action_view_groups')" />
+        </record>
 
 
         <!-- plans -->
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/goal_type_data.py
index 37976a45742..40df5f6a88c 100644
--- a/addons/gamification/goal_type_data.py
+++ b/addons/gamification/goal_type_data.py
@@ -50,10 +50,18 @@ class gamification_goal_type_data(osv.Model):
         delta = relativedelta(years=user.create_date.year - today.year, months=user.create_date.month - today.month)
         return delta.years*12 + delta.months
 
-    def number_mail_groups(self, cr, uid, context=None):
-        """Return the number of mail group the user has joined
-        For example purpose, similar goal could be done with a 'count' goal.
+    def number_following(self, cr, uid, xml_id="mail.thread", context=None):
+        """Return the number of 'xml_id' objects the user is following
+
+        'message_is_follower' is a non-stored field so could not be in a search
+        domain with a 'count' goal type
+        The object must inherit from mail.thread
         """
         if context is None: context = {}
-        mail_group_ids = self.pool.get('mail.group').search(cr, uid, [('message_is_follower', '=', True)], context=context)
-        return len(mail_group_ids)
+        ref_obj = self.pool.get(xml_id)
+        obj_ids = ref_obj.search(cr, uid, [], context=context)
+        following_count = 0
+        for obj in ref_obj.browse(cr, uid, obj_ids, context=context):
+            if obj.message_is_follower:
+                following_count += 1
+        return following_count
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 9a913863455..6982ba0731a 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -244,7 +244,7 @@
                                 <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]"  class="oe_inline"/>
                                 <field name="field_date_id" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]" class="oe_inline"/>
                                 <field name="domain" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))], 'required':[('computation_mode','in',('sum', 'count'))]}" class="oe_inline"/>
-                                <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}"/>
+                                <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}" placeholder="e.g. self.my_method(cr, uid)"/>
                                 <field name="condition" widget="radio"/>
                             </group>
                             <group string="Formating Options">
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index 6f4b7d5d747..00751f98134 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -22,7 +22,11 @@
     	                <td>${idx+1}</td>
     	                <td>${goal.user_id.name}</td>
     	                <td>${goal.completeness}%</td>
-    	                <td>${goal.current}/${goal.target_goal} ${goal.type_suffix}</td>
+    	                <td>${goal.current}/${goal.target_goal}
+                        % if goal.type_suffix:
+                            ${goal.type_suffix}
+                        % endif
+                        </td>
     	            </tr>
                 % endif
 	        % endfor
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
index e5cfbc3137c..bd744bb63a5 100644
--- a/addons/gamification/templates/personal_progress.mako
+++ b/addons/gamification/templates/personal_progress.mako
@@ -14,8 +14,16 @@
             % endif
             >
             <td>${goal.type_id.name}</td>
-            <td>${goal.target_goal} ${goal.type_suffix}</td>
-            <td>${goal.current} ${goal.type_suffix}</td>
+            <td>${goal.target_goal}
+            % if goal.type_suffix:
+                ${goal.type_suffix}
+            % endif
+            </td>
+            <td>${goal.current}
+            % if goal.type_suffix:
+                ${goal.type_suffix}
+            % endif
+            </td>
             <td>${goal.completeness} %</td>
         </tr>
     % endfor

From 4bcaa718bd1f45c79a688c1a47d0a69cae0348ae Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 14:33:50 +0200
Subject: [PATCH 321/547] [IMP] display actions

bzr revid: mat@openerp.com-20130424123350-cgx663vd31vvnw7w
---
 addons/gamification/goal.py                         | 3 ++-
 addons/gamification/static/src/css/goal.css         | 3 ++-
 addons/gamification/static/src/xml/gamification.xml | 8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index ce830e93f06..3398f094a37 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -388,7 +388,8 @@ class gamification_goal(osv.Model):
                         views = [(view_id, mode)]
                         break
                 action['views'] = views
-                action['target'] = 'new'
+            # doesn't seem to work if not in popup
+            action['target'] = 'new'
             return action
 
         if goal.computation_mode == 'manually':
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index bf73a0273de..1d9aee31500 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -153,7 +153,8 @@
     font-size: 25px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action {
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action {
     visibility: visible;
 }
 .openerp .oe_mail_wall .oe_mail {
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 93f81247151..6d6edfbd49a 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -49,7 +49,13 @@
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
                             <br/>
-                            (Goal: max <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
+                            <t t-if="planline.type_condition == 'higher'">
+                                (Goal: max
+                            </t>
+                            <t t-if="planline.type_condition == 'lower'">
+                                (Goal: min
+                            </t>
+                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                         </th>
                     </tr>
                     </thead>

From 5794e60f148fc0a3500be3d7082eff4fa8366854 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 25 Apr 2013 10:52:17 +0200
Subject: [PATCH 322/547] [IMP] better design

bzr revid: mat@openerp.com-20130425085217-bmt8tsdbtrfn7j7d
---
 addons/gamification/__openerp__.py            |  2 +-
 .../src/css/{goal.css => gamification.css}    | 94 +++++++++++++------
 .../static/src/xml/gamification.xml           | 74 ++++++++-------
 3 files changed, 109 insertions(+), 61 deletions(-)
 rename addons/gamification/static/src/css/{goal.css => gamification.css} (69%)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index eb0ce297fa2..34ee3e7189f 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -53,7 +53,7 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
     'installable': True,
     'application': True,
     'auto_install': True,
-    'css': ['static/src/css/goal.css'],
+    'css': ['static/src/css/gamification.css'],
     'js': [
         'static/src/js/gamification.js',
         'static/src/js/justgage.js',
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/gamification.css
similarity index 69%
rename from addons/gamification/static/src/css/goal.css
rename to addons/gamification/static/src/css/gamification.css
index 1d9aee31500..c5c5a3be6dd 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -80,49 +80,82 @@
     text-transform: capitalize;
     line-height: 1em;
 }
-
-.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached {
-    text-decoration: line-through;
-    color: rgb(138, 137, 137);
+.openerp .oe_mail_wall_aside .oe_goal {
+    width: 95%;
 }
+.openerp .oe_mail_wall_aside ul.oe_goals_list {
 
+}
 .openerp .oe_mail_wall_aside .oe_goals_list {
-    list-style-type: none; 
-    padding-left: 15px;
+    list-style-type: none;
+    /*list-style-type: disc;*/
+    padding-left: 0;
+    /*margin-left: 15px;*/
+    margin-top: 0;
     margin-bottom: 15px;
-    width: 200px;
 }
+.openerp .oe_mail_wall_aside table.oe_goals_list {
+    /*width: 95%;*/
+    border: 1px dotted rgb(221, 221, 221);
+    border-color: rgba(133, 133, 133, 0.3);
+}
+.openerp .oe_mail_wall_aside .oe_goals_list > li::before {
+    content: "\0BB \020";
+    width: 15px;
+}
+.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before {
+    color: rgb(27, 70, 7);
+    content: "✓";
+    font-size: 65%; /* reduce font to have the same size as "\0BB \020" */
+}
+.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box {
+    text-decoration: line-through;
+}
+
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box {
-    background: rgb(213, 213, 213);
-    min-height: 32px;
+    display: inline-block;
+    position: relative;
+    height: 100%;
+    min-height: 12px;
+    width: 94%;
+    z-index: 0;
+    vertical-align: top;
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box {
+    border: 1px dotted rgb(221, 221, 221);
+    border-color: rgba(133, 133, 133, 0.3);
+}
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
+    background: rgb(183, 231, 179);
+    background: rgba(183, 231, 179, 0.5);
+    display: inline-block;
+    position: absolute;
+    height: 100%;
+    width: 0;
+    z-index: -1;
+    top: 0; left: 0;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box {
     display: inline-block;
-    width: 200px;
-    min-height: 32px;
-    vertical-align: middle;
-    border: solid 1px white;
-}
-.openerp .oe_mail_wall_aside table.oe_goals_list .oe_goal_inner_box {
-    border: none;
+    /*position: absolute;*/
+    /*width: 200px;*/
+    /*min-height: 32px;*/
+    /*vertical-align: middle;*/
+    z-index: 2;
+    /*top: 0; left: 0;*/
+    height: 100%;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong {
     padding-left: 5px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside table.oe_goals_list {
-    margin: 10px 0;
-    border: solid 1px white;
-}
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list thead {
     font-weight: normal;
-}
-.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
-    background-color: #fff;
+    background: none;
 }
 .openerp .oe_mail_wall_aside td,
 .openerp .oe_mail_wall_aside th {
     vertical-align: middle;
-    border: none;
+    /*border: none;*/
 }
 .openerp .oe_mail_wall_aside .oe_goals_list thead th {
     font-weight: normal;
@@ -131,6 +164,9 @@
 .openerp .oe_mail_wall_aside .oe_goals_list tbody tr {
     height: 32px;
 }
+.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
+    background-color: #fff;
+}
 .openerp .oe_mail_wall_aside .oe_goals_list tbody th {
     padding-left: 5px;
     height: 32px;
@@ -138,19 +174,23 @@
 .openerp .oe_mail_wall_aside table.oe_goals_list .col0 {
     font-size: 160%;
     font-weight: bold;
-    width: 24px;
 }
 .openerp .oe_mail_wall_aside table.oe_goals_list .col1 {
+    padding: 0 5px;
+}
+.openerp .oe_mail_wall_aside table.oe_goals_list .col2 {
     width: 200px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar {
     width: 32px;
     padding-right: 5px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action {
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan.oe_e,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action.oe_e {
     visibility: hidden;
     font-size: 25px;
+    float: right;
+    position: relative;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan,
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action,
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 6d6edfbd49a..9e35b2d51bf 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,7 +4,6 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
-        <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
             <div>
                 <h4 style="display:inline-block;"><t t-esc="plan.name" /></h4>
@@ -13,31 +12,39 @@
 
             <t t-if="plan.visibility_mode == 'progressbar'">
 
-                <div class="oe_goals_list">
-                    <div t-attf-class="#{goal.type_display == 'progress' ? 'oe_goal_outer_box' : ''}" t-foreach="plan.goals" t-as="goal" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : ''}">
-                    <div class="oe_goal_inner_box">
-                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
-                        <t t-if="goal.computation_mode == 'manually' or goal.type_action">
-                            <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
-                        </t><br/>
-
-                        <t t-if="goal.type_display == 'progress'">
-                            <t t-if="goal.type_condition == 'higher'">
-                                    <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            </t>
-                            <t t-if="goal.type_condition == 'lower'">
-                                
-                                    <t t-esc="goal.current" /> (less than 
-                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                                    )
-                                
-                            </t>
-                        </t>
-                    </div>
-                    </div>
-                </div>
+                <ul class="oe_goals_list">
+                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
+                        <div class="oe_goal_outer_box">
+                            <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                            <div class="oe_goal_inner_box">
+                                <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
+                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
+                                </t>
+                                <t t-if="goal.type_action">
+                                    <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
+                                </t>
+                                <t t-if="goal.computation_mode == 'manually' and !goal.type_action">
+                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
+                                    <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
+                                </t>
+                                <t t-if="goal.type_display == 'progress'">
+                                    <t t-if="goal.type_condition == 'higher'">
+                                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                    </t>
+                                    <t t-if="goal.type_condition == 'lower'">
+                                        
+                                            <t t-esc="goal.current" /> (less than 
+                                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                            )
+                                        
+                                    </t>
+                                </t>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
                 <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
@@ -63,13 +70,14 @@
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
-                            <td><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col1">
-                                <div class="oe_goal_outer_box" t-attf-style="width: #{goal.completeness}%;">
-                                <div class="oe_goal_inner_box">
-                                    <t t-esc="goal.user_name"/><br/>
-                                    <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
-                                </div>
+                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
+                            <td class="col2">
+                                <div class="oe_goal_outer_box">
+                                    <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                    <div class="oe_goal_inner_box">
+                                        <t t-esc="goal.user_name"/><br/>
+                                        <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                    </div>
                                 </div>
                             </td>
                         </div>

From e920347b012d0e88cf59ae34d5f3ba1d347863f9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 25 Apr 2013 12:17:59 +0200
Subject: [PATCH 323/547] [IMP] make it beautiful

bzr revid: mat@openerp.com-20130425101759-y3cwymvey8i9mwie
---
 .../static/src/css/gamification.css           | 77 +++++++++++--------
 .../static/src/xml/gamification.xml           | 24 ++++--
 2 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
index c5c5a3be6dd..62b7e2c8091 100644
--- a/addons/gamification/static/src/css/gamification.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -66,11 +66,12 @@
     display: inline-block;
     vertical-align: top;
     width: 280px;
-    background: #EDEDF6;
+    /*background: #EDEDF6;*/
+    background-color: #f8f8f8;
+    border: solid 1px rgba(0,0,0,0.03);
     border-radius: 2px;
 }
 .openerp .oe_mail_wall_aside > div {
-    background: #EDEDF6;
     padding: 5px 5px 0 15px;
 }
 .openerp .oe_mail_wall_aside h3 {
@@ -81,32 +82,31 @@
     line-height: 1em;
 }
 .openerp .oe_mail_wall_aside .oe_goal {
-    width: 95%;
-}
-.openerp .oe_mail_wall_aside ul.oe_goals_list {
-
+    width: 100%;
 }
+/*.openerp .oe_mail_wall_aside .oe_goal a {
+    color: #4c4c4c;;
+}*/
 .openerp .oe_mail_wall_aside .oe_goals_list {
     list-style-type: none;
-    /*list-style-type: disc;*/
     padding-left: 0;
-    /*margin-left: 15px;*/
-    margin-top: 0;
+    margin-top: 5px;
     margin-bottom: 15px;
 }
 .openerp .oe_mail_wall_aside table.oe_goals_list {
-    /*width: 95%;*/
-    border: 1px dotted rgb(221, 221, 221);
-    border-color: rgba(133, 133, 133, 0.3);
+    width: 95%;
+    /*border: 1px dotted rgb(221, 221, 221);
+    border-color: rgba(133, 133, 133, 0.3);*/
+    border: solid 1px rgba(0,0,0,0.05);
 }
 .openerp .oe_mail_wall_aside .oe_goals_list > li::before {
     content: "\0BB \020";
-    width: 15px;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before {
     color: rgb(27, 70, 7);
     content: "✓";
-    font-size: 65%; /* reduce font to have the same size as "\0BB \020" */
+    /*font-size: 65%;*/ /* reduce font to have the same size as "\0BB \020" */
+    margin-right: -4px;
 }
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box {
     text-decoration: line-through;
@@ -116,34 +116,42 @@
     display: inline-block;
     position: relative;
     height: 100%;
-    min-height: 12px;
-    width: 94%;
+    width: 90%;
     z-index: 0;
     vertical-align: top;
+    padding-bottom: 5px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box {
+.openerp .oe_mail_wall .oe_mail_wall_aside table .oe_goal_outer_box {
+    width: 100%;
+}
+/*.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box {
     border: 1px dotted rgb(221, 221, 221);
     border-color: rgba(133, 133, 133, 0.3);
+}*/
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress_background {
+    background-color: rgb(231, 190, 190);
+    position: absolute;
+    height: 4px;
+    width: 100%;
+    z-index: -2;
+    top: 0; left: 0;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
-    background: rgb(183, 231, 179);
-    background: rgba(183, 231, 179, 0.5);
-    display: inline-block;
+    /*background: rgb(183, 231, 179);*/
+    /*background: rgba(183, 231, 179, 0.5);*/
+    /*background-color: #7c7bad;*/
+    background-color: rgb(88, 155, 91);
     position: absolute;
-    height: 100%;
+    height: 3px;
     width: 0;
     z-index: -1;
     top: 0; left: 0;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box {
     display: inline-block;
-    /*position: absolute;*/
-    /*width: 200px;*/
-    /*min-height: 32px;*/
-    /*vertical-align: middle;*/
-    z-index: 2;
-    /*top: 0; left: 0;*/
     height: 100%;
+    padding-top: 3px;
+    line-height: 1em;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong {
     padding-left: 5px;
@@ -162,14 +170,18 @@
     padding: 5px;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list tbody tr {
-    height: 32px;
+    height: 24px;
 }
-.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
+/*.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
     background-color: #fff;
 }
+*/
+.openerp .oe_mail_wall_aside .oe_goals_list tbody td {
+    padding-bottom: 5px;
+}
 .openerp .oe_mail_wall_aside .oe_goals_list tbody th {
     padding-left: 5px;
-    height: 32px;
+    height: 24px;
 }
 .openerp .oe_mail_wall_aside table.oe_goals_list .col0 {
     font-size: 160%;
@@ -179,10 +191,10 @@
     padding: 0 5px;
 }
 .openerp .oe_mail_wall_aside table.oe_goals_list .col2 {
-    width: 200px;
+    width: 100%;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar {
-    width: 32px;
+    width: 24px;
     padding-right: 5px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan.oe_e,
@@ -190,6 +202,7 @@
     visibility: hidden;
     font-size: 25px;
     float: right;
+    margin-right: 15px;
     position: relative;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan,
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 9e35b2d51bf..1f9649a9198 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -15,7 +15,10 @@
                 <ul class="oe_goals_list">
                     <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
                         <div class="oe_goal_outer_box">
-                            <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                            <t t-if="goal.type_display == 'progress'">
+                                <div class="oe_goal_progress_background"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                            </t>
                             <div class="oe_goal_inner_box">
                                 <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
                                     <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
@@ -50,9 +53,15 @@
                 <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
                     <thead>
                     <tr>
-                        <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <strong><t t-esc="planline.type_name"/></strong>
-                            <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
+                        <th colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
+                            <t t-if="planline.computation_mode != 'manually' and !planline.type_action">
+                                <strong><t t-esc="planline.type_name"/></strong>
+                            </t>
+                            <t t-if="planline.type_action">
+                                <strong><a class="oe_goal_action" t-att-id="planline.own_goal_id"><t t-esc="planline.type_name"/></a></strong>
+                            </t>
+                            <t t-if="planline.computation_mode == 'manually' and !planline.type_action">
+                                <strong><t t-esc="planline.type_name"/></strong>
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
                             <br/>
@@ -68,12 +77,15 @@
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div style="background: #fff;">
+                        <div>
                             <th class="col0"><t t-esc="goal.rank" /></th>
                             <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
                             <td class="col2">
                                 <div class="oe_goal_outer_box">
-                                    <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                    <t t-if="planline.type_display == 'progress'">
+                                        <div class="oe_goal_progress_background"></div>
+                                        <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                    </t>
                                     <div class="oe_goal_inner_box">
                                         <t t-esc="goal.user_name"/><br/>
                                         <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>

From d14496e578149f76ad612add11b623dfcc2bd195 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 25 Apr 2013 17:40:28 +0200
Subject: [PATCH 324/547] [IMP] tweak css

bzr revid: mat@openerp.com-20130425154028-rt3uv8mtykl9ff2g
---
 addons/gamification/goal_base_data.xml        |  8 +--
 addons/gamification/plan.py                   |  2 +-
 .../static/src/css/gamification.css           | 68 +++++++++++++------
 .../static/src/xml/gamification.xml           | 61 ++++++++---------
 .../gamification_sale_crm/sale_crm_goals.xml  | 12 ++--
 5 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 76408c92e85..a4790a1c692 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -27,7 +27,7 @@
 
         <record model="gamification.goal.type" id="type_base_company_data">
             <field name="name">Set your Company Data</field>
-            <field name="description">Specify at least a website</field>
+            <field name="description">Write some information about your company (specify at least a name)</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
@@ -69,7 +69,7 @@
         </record>
 
         <record model="gamification.goal.type" id="type_nbr_following">
-            <field name="name"># Mail Group Following</field>
+            <field name="name">Mail Group Following</field>
             <field name="description">Follow mail groups to receive news</field>
             <field name="computation_mode">python</field>
             <field name="compute_code">self.number_following(cr, uid, 'mail.group')</field>
@@ -79,7 +79,7 @@
 
         <!-- plans -->
         <record model="gamification.goal.plan" id="plan_base_discover">
-            <field name="name">Set up your Profile</field>
+            <field name="name">Manage your Personal Profile</field>
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
@@ -89,7 +89,7 @@
         </record>
 
         <record model="gamification.goal.plan" id="plan_base_configure">
-            <field name="name">Configure OpenERP</field>
+            <field name="name">Manage your Company Profile</field>
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
             <field name="report_message_frequency">never</field>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index c2547f4c79b..01471fe7238 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -201,7 +201,7 @@ class gamification_goal_plan(osv.Model):
         'reward_failure': False,
     }
 
-    _sort = 'end_date start_date name'
+    _sort = 'end_date, start_date, name'
 
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
index 62b7e2c8091..6a8869dd466 100644
--- a/addons/gamification/static/src/css/gamification.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -1,7 +1,7 @@
 /* Kanban views */
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
-  width: 230px;
-  min-height: 200px;
+    width: 230px;
+    min-height: 200px;
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
     width: 250px;
@@ -59,30 +59,42 @@
     margin-left: -6px;
 }
 
-/* Mail Sidebar */
+
+/*
+   ============
+   Mail Sidebar 
+   ============
+*/
 .openerp .oe_mail_wall .oe_mail_wall_aside {
     margin-top: 15px;
     position: relative;
     display: inline-block;
     vertical-align: top;
     width: 280px;
-    /*background: #EDEDF6;*/
     background-color: #f8f8f8;
-    border: solid 1px rgba(0,0,0,0.03);
+    background-color: #EDEDF6;
+    /*border: solid 1px rgba(0,0,0,0.03);*/
     border-radius: 2px;
 }
+
 .openerp .oe_mail_wall_aside > div {
-    padding: 5px 5px 0 15px;
+    border-bottom: solid 3px white;
+    border-radius: 2px;
+}
+.openerp .oe_mail_wall_aside .oe_goal {
+    border-bottom: solid 3px white;
 }
 .openerp .oe_mail_wall_aside h3 {
     font-size: 1.3em;
-    margin-left: -7px;
-    font-variant: small-caps;
-    text-transform: capitalize;
+    /*font-variant: small-caps;
+    text-transform: capitalize;*/
     line-height: 1em;
 }
 .openerp .oe_mail_wall_aside .oe_goal {
-    width: 100%;
+    padding: 5px 5px 0 15px;
+}
+.openerp .oe_mail_wall_aside .oe_goal h4 {
+    font-size: 110%;
 }
 /*.openerp .oe_mail_wall_aside .oe_goal a {
     color: #4c4c4c;;
@@ -91,23 +103,34 @@
     list-style-type: none;
     padding-left: 0;
     margin-top: 5px;
-    margin-bottom: 15px;
+    margin-bottom: 10px;
 }
 .openerp .oe_mail_wall_aside table.oe_goals_list {
     width: 95%;
     /*border: 1px dotted rgb(221, 221, 221);
     border-color: rgba(133, 133, 133, 0.3);*/
-    border: solid 1px rgba(0,0,0,0.05);
+    /*border: solid 1px rgba(0,0,0,0.05);*/
+}
+.openerp .oe_mail_wall_aside .oe_goals_list > li {
+    padding-bottom: 8px;
+    vertical-align: middle;
+}
+.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_no_progress {
+    padding-bottom: 2px;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list > li::before {
     content: "\0BB \020";
+    font-size: 175%;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before {
     color: rgb(27, 70, 7);
     content: "✓";
-    /*font-size: 65%;*/ /* reduce font to have the same size as "\0BB \020" */
     margin-right: -4px;
 }
+.openerp .oe_mail_wall_aside .oe_goals_list li .oe_goal_current {
+    font-size: 150%;
+    font-weight: bold;
+}
 .openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box {
     text-decoration: line-through;
 }
@@ -116,10 +139,9 @@
     display: inline-block;
     position: relative;
     height: 100%;
-    width: 90%;
+    width: 80%;
     z-index: 0;
-    vertical-align: top;
-    padding-bottom: 5px;
+    vertical-align: middle;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside table .oe_goal_outer_box {
     width: 100%;
@@ -129,9 +151,10 @@
     border-color: rgba(133, 133, 133, 0.3);
 }*/
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress_background {
-    background-color: rgb(231, 190, 190);
+    /*background-color: rgb(231, 190, 190);*/
+    background-color: white;
     position: absolute;
-    height: 4px;
+    height: 3px;
     width: 100%;
     z-index: -2;
     top: 0; left: 0;
@@ -139,8 +162,8 @@
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
     /*background: rgb(183, 231, 179);*/
     /*background: rgba(183, 231, 179, 0.5);*/
-    /*background-color: #7c7bad;*/
     background-color: rgb(88, 155, 91);
+    background-color: #7c7bad;
     position: absolute;
     height: 3px;
     width: 0;
@@ -150,9 +173,12 @@
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box {
     display: inline-block;
     height: 100%;
-    padding-top: 3px;
+    margin-top: 6px;
     line-height: 1em;
 }
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box.oe_no_progress {
+    margin-top: 0;
+}
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong {
     padding-left: 5px;
 }
@@ -184,7 +210,7 @@
     height: 24px;
 }
 .openerp .oe_mail_wall_aside table.oe_goals_list .col0 {
-    font-size: 160%;
+    font-size: 200%;
     font-weight: bold;
 }
 .openerp .oe_mail_wall_aside table.oe_goals_list .col1 {
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 1f9649a9198..27a4a46108d 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -11,65 +11,53 @@
             </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
-
                 <ul class="oe_goals_list">
-                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
+                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
+                        <t t-if="goal.type_display == 'progress'"><span class="oe_goal_current"><t t-esc="goal.current" /></span></t>
                         <div class="oe_goal_outer_box">
                             <t t-if="goal.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div class="oe_goal_inner_box">
+                            <div t-attf-class="oe_goal_inner_box #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
                                 <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
                                     <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
                                 </t>
-                                <t t-if="goal.type_action">
+                                <t t-if="goal.type_action or goal.computation_mode == 'manually'">
                                     <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
                                 </t>
-                                <t t-if="goal.computation_mode == 'manually' and !goal.type_action">
-                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
-                                    <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
-                                </t>
                                 <t t-if="goal.type_display == 'progress'">
                                     <t t-if="goal.type_condition == 'higher'">
-                                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                            (target:
                                     </t>
                                     <t t-if="goal.type_condition == 'lower'">
-                                        
-                                            <t t-esc="goal.current" /> (less than 
-                                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                                            )
-                                        
+                                            (target less than:
                                     </t>
+                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
                                 </t>
                             </div>
                         </div>
                     </li>
                 </ul>
             </t>
+
             <t t-if="plan.visibility_mode == 'board'">
                 <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
                     <thead>
                     <tr>
                         <th colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <t t-if="planline.computation_mode != 'manually' and !planline.type_action">
-                                <strong><t t-esc="planline.type_name"/></strong>
-                            </t>
-                            <t t-if="planline.type_action">
-                                <strong><a class="oe_goal_action" t-att-id="planline.own_goal_id"><t t-esc="planline.type_name"/></a></strong>
-                            </t>
+                            <strong><t t-esc="planline.type_name"/></strong>
+
                             <t t-if="planline.computation_mode == 'manually' and !planline.type_action">
                                 <strong><t t-esc="planline.type_name"/></strong>
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
-                            <br/>
                             <t t-if="planline.type_condition == 'higher'">
-                                (Goal: max
+                                Target:
                             </t>
                             <t t-if="planline.type_condition == 'lower'">
-                                (Goal: min
+                                Target (less than):
                             </t>
                             <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                         </th>
@@ -88,7 +76,14 @@
                                     </t>
                                     <div class="oe_goal_inner_box">
                                         <t t-esc="goal.user_name"/><br/>
-                                        <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                        <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
+                                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                        </t>
+                                        <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="planline.own_goal_id">
+                                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                            </a>
+                                        </t>
                                     </div>
                                 </div>
                             </td>
@@ -101,12 +96,14 @@
     </t>
 
     <t t-name="gamification.challenge_suggestions">
-        <h3>Suggestions</h3>
-        <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
-            <li>
-                <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>
-            </li>
-        </ul>
+        <div class="oe_goal">
+            <h3>Suggestions</h3>
+            <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
+                <li>
+                    <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>
+                </li>
+            </ul>
+        </div>
     </t>
 
 </templates>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 2afedbad2a8..c5f85ef3273 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -15,7 +15,7 @@
         </record>
 
         <record model="gamification.goal.type" id="type_crm_nbr_new_leads">
-            <field name="name"># New Leads</field>
+            <field name="name">New Leads</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
             <field name="unit">leads</field>
@@ -50,7 +50,7 @@
 
 
         <record model="gamification.goal.type" id="type_crm_nbr_call">
-            <field name="name"># Logged Calls</field>
+            <field name="name">Logged Calls</field>
             <field name="description">Log a certain number of calls to reach this goal</field>
             <field name="computation_mode">count</field>
             <field name="unit">calls</field>
@@ -60,7 +60,7 @@
         </record> 
 
         <record model="gamification.goal.type" id="type_crm_nbr_new_opportunities">
-            <field name="name"># New Opportunities</field>
+            <field name="name">New Opportunities</field>
             <field name="description">Based on the opening date</field>
             <field name="computation_mode">count</field>
             <field name="unit">opportunities</field>
@@ -70,7 +70,7 @@
         </record>
 
         <record model="gamification.goal.type" id="type_crm_nbr_sale_order_created">
-            <field name="name"># New Sales Orders</field>
+            <field name="name">New Sales Orders</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
             <field name="unit">orders</field>
@@ -80,7 +80,7 @@
         </record>
 
         <record model="gamification.goal.type" id="type_crm_nbr_paid_sale_order">
-            <field name="name"># Paid Sales Orders</field>
+            <field name="name">Paid Sales Orders</field>
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
             <field name="unit">orders</field>
@@ -101,7 +101,7 @@
 
 
         <record model="gamification.goal.type" id="type_crm_nbr_customer_refunds">
-            <field name="name"># Customer Refunds</field>
+            <field name="name">Customer Refunds</field>
             <field name="description">Refund the least customers (lower than)</field>
             <field name="computation_mode">count</field>
             <field name="condition">lower</field>

From 9c0936e6582f3aa117f721219f9dff17712245fd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 26 Apr 2013 17:52:42 +0200
Subject: [PATCH 325/547] [IMP] design using display table

bzr revid: mat@openerp.com-20130426155242-1do1w4mrch23lhbm
---
 .../static/src/css/gamification.css           | 168 ++++++++----------
 .../static/src/xml/gamification.xml           | 113 ++++++------
 2 files changed, 127 insertions(+), 154 deletions(-)

diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
index 6a8869dd466..15a6daa48d2 100644
--- a/addons/gamification/static/src/css/gamification.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -71,14 +71,19 @@
     display: inline-block;
     vertical-align: top;
     width: 280px;
-    background-color: #f8f8f8;
-    background-color: #EDEDF6;
-    /*border: solid 1px rgba(0,0,0,0.03);*/
     border-radius: 2px;
 }
-
+.openerp .oe_mail_wall .oe_mail_wall_aside > .oe_gamification_goal {
+    background-color: #EDEDF6;
+}
+.openerp .oe_mail_wall_aside .oe_gamification_suggestion {
+    background-color: rgb(211, 222, 241);
+}
+.openerp .oe_mail_wall_aside .oe_gamification_suggestion ul {
+    padding-left: 15px;
+}
 .openerp .oe_mail_wall_aside > div {
-    border-bottom: solid 3px white;
+    border-bottom: solid 5px white;
     border-radius: 2px;
 }
 .openerp .oe_mail_wall_aside .oe_goal {
@@ -86,138 +91,101 @@
 }
 .openerp .oe_mail_wall_aside h3 {
     font-size: 1.3em;
-    /*font-variant: small-caps;
-    text-transform: capitalize;*/
     line-height: 1em;
 }
 .openerp .oe_mail_wall_aside .oe_goal {
-    padding: 5px 5px 0 15px;
+    /*padding: 5px 5px 0 15px;*/
+    padding: 5px 10px;
 }
-.openerp .oe_mail_wall_aside .oe_goal h4 {
-    font-size: 110%;
+.openerp .oe_mail_wall_aside .oe_goal h4,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list .oe_thead {
+    text-align: center;
+    padding-bottom: 15px;
 }
-/*.openerp .oe_mail_wall_aside .oe_goal a {
-    color: #4c4c4c;;
-}*/
-.openerp .oe_mail_wall_aside .oe_goals_list {
-    list-style-type: none;
-    padding-left: 0;
-    margin-top: 5px;
-    margin-bottom: 10px;
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress div {
+    display: inline-block;
 }
-.openerp .oe_mail_wall_aside table.oe_goals_list {
-    width: 95%;
-    /*border: 1px dotted rgb(221, 221, 221);
-    border-color: rgba(133, 133, 133, 0.3);*/
-    /*border: solid 1px rgba(0,0,0,0.05);*/
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress::before {
+    content: "•";
+    padding-right: 4px;
+    /*font-size: 175%;*/
 }
-.openerp .oe_mail_wall_aside .oe_goals_list > li {
-    padding-bottom: 8px;
-    vertical-align: middle;
-}
-.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_no_progress {
-    padding-bottom: 2px;
-}
-.openerp .oe_mail_wall_aside .oe_goals_list > li::before {
-    content: "\0BB \020";
-    font-size: 175%;
-}
-.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before {
-    color: rgb(27, 70, 7);
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached::before {
+    /*color: rgb(27, 70, 7);*/
     content: "✓";
-    margin-right: -4px;
+    padding-right: 0;
+    margin-left: -2px;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list li .oe_goal_current {
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current {
     font-size: 150%;
     font-weight: bold;
+    min-width: 20px;
+    padding: 0 5px;
 }
-.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box {
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell {
     text-decoration: line-through;
 }
 
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_outer_box {
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box {
     display: inline-block;
     position: relative;
-    height: 100%;
-    width: 80%;
     z-index: 0;
     vertical-align: middle;
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside table .oe_goal_outer_box {
     width: 100%;
+    border: solid 1px rgba(0,0,0,0.03);
+    border-radius: 2px;
 }
-/*.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box {
-    border: 1px dotted rgb(221, 221, 221);
-    border-color: rgba(133, 133, 133, 0.3);
-}*/
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress_background {
-    /*background-color: rgb(231, 190, 190);*/
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box.oe_no_progress {
+    border: none;
+}
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress_background {
     background-color: white;
     position: absolute;
-    height: 3px;
+    height: 100%;
     width: 100%;
     z-index: -2;
     top: 0; left: 0;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
-    /*background: rgb(183, 231, 179);*/
-    /*background: rgba(183, 231, 179, 0.5);*/
-    background-color: rgb(88, 155, 91);
-    background-color: #7c7bad;
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress {
+    background-color: rgb(212, 233, 222);
+    /*background-color: #7c7bad;*/
     position: absolute;
-    height: 3px;
+    height: 100%;
     width: 0;
     z-index: -1;
     top: 0; left: 0;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box {
-    display: inline-block;
-    height: 100%;
-    margin-top: 6px;
-    line-height: 1em;
+
+.openerp .oe_mail_wall_aside .oe_goals_list {
+    padding-left: 0;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    width: 95%;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box.oe_no_progress {
-    margin-top: 0;
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_row {
+    margin-bottom: 10px;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong {
-    padding-left: 5px;
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list thead {
-    font-weight: normal;
-    background: none;
-}
-.openerp .oe_mail_wall_aside td,
-.openerp .oe_mail_wall_aside th {
-    vertical-align: middle;
-    /*border: none;*/
-}
-.openerp .oe_mail_wall_aside .oe_goals_list thead th {
+
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_thead {
     font-weight: normal;
     padding: 5px;
+    text-align: center;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list tbody tr {
-    height: 24px;
+
+.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell {
+    padding: 3px 0;
 }
-/*.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
-    background-color: #fff;
-}
-*/
-.openerp .oe_mail_wall_aside .oe_goals_list tbody td {
-    padding-bottom: 5px;
-}
-.openerp .oe_mail_wall_aside .oe_goals_list tbody th {
-    padding-left: 5px;
-    height: 24px;
-}
-.openerp .oe_mail_wall_aside table.oe_goals_list .col0 {
+.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col0 {
     font-size: 200%;
     font-weight: bold;
+    width: 25px;
+    text-align: center;
 }
-.openerp .oe_mail_wall_aside table.oe_goals_list .col1 {
+.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col1 {
     padding: 0 5px;
 }
-.openerp .oe_mail_wall_aside table.oe_goals_list .col2 {
-    width: 100%;
+.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col2 {
+    width: auto;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar {
     width: 24px;
@@ -228,7 +196,7 @@
     visibility: hidden;
     font-size: 25px;
     float: right;
-    margin-right: 15px;
+    /*margin-right: 15px;*/
     position: relative;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan,
@@ -238,4 +206,14 @@
 }
 .openerp .oe_mail_wall .oe_mail {
     display: inline-block;
+}
+.openerp .oe_table {
+    display: table;
+}
+.openerp .oe_row {
+    display: table-row;
+}
+.openerp .oe_cell {
+    display: table-cell;
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 27a4a46108d..62476c9a366 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,75 +6,72 @@
     <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
             <div>
-                <h4 style="display:inline-block;"><t t-esc="plan.name" /></h4>
                 <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
+                <h4><t t-esc="plan.name" /></h4>
             </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
-                <ul class="oe_goals_list">
-                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                        <t t-if="goal.type_display == 'progress'"><span class="oe_goal_current"><t t-esc="goal.current" /></span></t>
-                        <div class="oe_goal_outer_box">
+                <div class="oe_table oe_goals_list">
+                    <div t-foreach="plan.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
                             <t t-if="goal.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div t-attf-class="oe_goal_inner_box #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                                <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
-                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
-                                </t>
-                                <t t-if="goal.type_action or goal.computation_mode == 'manually'">
-                                    <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
-                                </t>
+                            <div t-attf-class="oe_goal_inner_box">
                                 <t t-if="goal.type_display == 'progress'">
-                                    <t t-if="goal.type_condition == 'higher'">
-                                            (target:
-                                    </t>
-                                    <t t-if="goal.type_condition == 'lower'">
-                                            (target less than:
-                                    </t>
-                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
+                                    <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
                                 </t>
+                                <div class="oe_cell">
+                                    <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
+                                        <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
+                                    </t>
+                                    <t t-if="goal.type_action or goal.computation_mode == 'manually'">
+                                        <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
+                                    </t>
+                                    <t t-if="goal.type_display == 'progress'">
+                                        <t t-if="goal.type_condition == 'higher'">
+                                                (target:
+                                        </t>
+                                        <t t-if="goal.type_condition == 'lower'">
+                                                (target less than:
+                                        </t>
+                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
+                                    </t>
+                                </div>
                             </div>
-                        </div>
-                    </li>
-                </ul>
+                    </div>
+                </div>
             </t>
 
             <t t-if="plan.visibility_mode == 'board'">
-                <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
-                    <thead>
-                    <tr>
-                        <th colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
+                <div t-foreach="plan.planlines" t-as="planline" class="oe_goals_list oe_table">
+                    <div class="oe_row">
+                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <strong><t t-esc="planline.type_name"/></strong>
-
-                            <t t-if="planline.computation_mode == 'manually' and !planline.type_action">
-                                <strong><t t-esc="planline.type_name"/></strong>
-                                <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
+                            <br/>
+                            <div class="oe_grey">
+                                <t t-if="planline.type_condition == 'higher'">
+                                    Target:
+                                </t>
+                                <t t-if="planline.type_condition == 'lower'">
+                                    Target (less than):
+                                </t>
+                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                            </div>
+                        </div>
+                    </div>
+                    <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
+                        <div class="oe_row oe_goal_outer_box">
+                            <t t-if="planline.type_display == 'progress'">
+                                <div class="oe_goal_progress_background"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <t t-if="planline.type_condition == 'higher'">
-                                Target:
-                            </t>
-                            <t t-if="planline.type_condition == 'lower'">
-                                Target (less than):
-                            </t>
-                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
-                        </th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div>
-                            <th class="col0"><t t-esc="goal.rank" /></th>
-                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col2">
-                                <div class="oe_goal_outer_box">
-                                    <t t-if="planline.type_display == 'progress'">
-                                        <div class="oe_goal_progress_background"></div>
-                                        <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
-                                    </t>
-                                    <div class="oe_goal_inner_box">
+                            <div class="oe_goal_inner_box">
+                                <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
+                                <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
+                                <div class="oe_cell col2">
+                                    
                                         <t t-esc="goal.user_name"/><br/>
                                         <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
                                             <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
@@ -84,20 +81,18 @@
                                                 <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
                                             </a>
                                         </t>
-                                    </div>
                                 </div>
-                            </td>
+                            </div>
                         </div>
-                    </tr>
-                </tbody>
-                </table>
+                    </div>
+                </div>
             </t>
         </div>
     </t>
 
     <t t-name="gamification.challenge_suggestions">
         <div class="oe_goal">
-            <h3>Suggestions</h3>
+            <h4>Proposed Challenges</h4>
             <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
                 <li>
                     <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>

From 87c1fab873ed246fb5f3152377a82bad49c8a982 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 26 Apr 2013 18:16:13 +0200
Subject: [PATCH 326/547] [IMP] remove inner_box block

bzr revid: mat@openerp.com-20130426161613-4mxh5f25yjc8ogl8
---
 addons/gamification/static/src/xml/gamification.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 62476c9a366..97b69453490 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -17,7 +17,7 @@
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div t-attf-class="oe_goal_inner_box">
+                            
                                 <t t-if="goal.type_display == 'progress'">
                                     <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
                                 </t>
@@ -39,7 +39,6 @@
                                         <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
                                     </t>
                                 </div>
-                            </div>
                     </div>
                 </div>
             </t>
@@ -67,7 +66,7 @@
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div class="oe_goal_inner_box">
+                            
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
                                 <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
@@ -82,7 +81,7 @@
                                             </a>
                                         </t>
                                 </div>
-                            </div>
+                            
                         </div>
                     </div>
                 </div>

From 56afde0c844890936caaa3dc17db87b5f360779d Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Mon, 29 Apr 2013 11:32:31 +0530
Subject: [PATCH 327/547] [FIX]project: if there is no any project manager and
 try to schedule task its give traceback

bzr revid: pna@tinyerp.com-20130429060231-epygcrs2073f23ny
---
 addons/project/project.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index a5e540c8be7..5b8ae2c2044 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -477,12 +477,15 @@ def Project():
   def Project_%d():
     start = \'%s\'
     working_days = %s
-    resource = %s
 """       % (
             project.id,
-            project.date_start or time.strftime('%Y-%m-%d'), working_days,
-            '|'.join(['User_'+str(x) for x in puids])
-        )
+            project.date_start or time.strftime('%Y-%m-%d'), working_days
+            )
+        resource = '|'.join(['User_'+str(x) for x in puids])
+        if resource :
+            result+= """
+    resource = %s
+""" %   ( resource, )
         vacation = calendar_id and tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context)) or False
         if vacation:
             result+= """

From 430b6c07a7f714949d833e7fd0e9b68cc4b2bc86 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 29 Apr 2013 15:48:49 +0530
Subject: [PATCH 328/547] [IMP]HR: Improve Application form some field label
 Improve meeting logs for Application Form Set My Requests instead of My
 Leaves

bzr revid: dbr@tinyerp.com-20130429101849-1iz7d52jvgxwsbfu
---
 addons/hr_holidays/hr_holidays_view.xml |  2 +-
 addons/hr_recruitment/hr_recruitment.py | 26 +++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5828790c152..cc3813b7240 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e41d80fb348..3ec36886edb 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -186,7 +186,7 @@ class hr_applicant(base_stage, osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Subject', size=128, required=True),
+        'name': fields.char('Application Name', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
@@ -219,7 +219,7 @@ class hr_applicant(base_stage, osv.Model):
         'salary_expected_extra': fields.char('Expected Salary Extra', size=100, help="Salary Expected by Applicant, extra advantages"),
         'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
         'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"),
-        'availability': fields.integer('Availability'),
+        'availability': fields.integer('Availability', help="The number of days in which the applicant will be available to start working"),
         'partner_name': fields.char("Applicant's Name", size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
@@ -306,6 +306,14 @@ class hr_applicant(base_stage, osv.Model):
             return stage_ids[0]
         return False
 
+    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
+         if not duration:
+             duration = _('unknown')
+         else:
+             duration = str(duration)
+         message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
+         return self.message_post(cr, uid, ids, body=message,context=context)
+
     def action_makeMeeting(self, cr, uid, ids, context=None):
         """ This opens Meeting's calendar view to schedule meeting on current applicant
             @return: Dictionary value for created Meeting view
@@ -314,6 +322,7 @@ class hr_applicant(base_stage, osv.Model):
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {
+            'default_applicant_id':applicant.id,
             'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
             'default_user_id': uid,
             'default_name': applicant.name,
@@ -562,4 +571,17 @@ class applicant_category(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
 
+class crm_meeting(osv.Model):
+    _inherit = 'crm.meeting'
+    _columns = {
+    'applicant_id': fields.many2one ('hr.applicant', 'Recruitment')
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj = self.browse(cr, uid, res, context=context)
+        if obj.applicant_id:
+            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj.applicant_id.id] , obj.name, obj.date,obj.duration, context=context)
+        return res
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f99ce17ecf8234542914458b5b2ba1f101781f22 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 29 Apr 2013 13:43:05 +0200
Subject: [PATCH 329/547] Removed KanbanRecord hack to use kanban fields
 registry

bzr revid: nicolas.vanhoren@openerp.com-20130429114305-3b24eixyj4xts9lv
---
 addons/gamification/goal_view.xml             |  2 +-
 .../static/src/js/gamification.js             | 56 +++++++++++--------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 6982ba0731a..42907747887 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -162,7 +162,7 @@
                                         </t>
                                         <t t-if="record.type_display.raw_value == 'progress'">
                                             <t t-if="record.type_condition.raw_value =='higher'">
-                                                <div class="oe_goal_gauge"></div>
+                                                <field name="current" widget="goal" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}"/>
                                             </t>
                                             <t t-if="record.type_condition.raw_value != 'higher'">
                                                 <div t-attf-class="oe_goal_state #{record.current.raw_value == record.target_goal.raw_value+1 ? 'oe_orange' : record.current.raw_value &gt; record.target_goal.raw_value ? 'oe_red' : 'oe_green'}">
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index b004d88f1b9..610e74b5d0e 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -136,30 +136,6 @@ openerp.gamification = function(instance) {
     });
 
     instance.web_kanban.KanbanRecord.include({
-        start: function () {
-            var rendering = this._super();
-            var self = this;
-
-            // add gauge in goal kanban views
-            $.when(rendering).done(function() {
-                if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
-                    var g = new JustGage({
-                        parentNode: self.$('.oe_goal_gauge').empty().get(0),
-                        value: self.record.current.raw_value,
-                        min: 0,
-                        max: self.record.target_goal.raw_value,
-                        relativeGaugeSize: true,
-                        humanFriendly: true,
-                        label: self.record.type_suffix.raw_value,
-                        levelColors: [
-                            "#ff0000",
-                            "#f9c802",
-                            "#a9d70b"
-                        ]
-                    });
-                }
-            });
-        },
         // open related goals when clicking on challenge kanban view
         on_card_clicked: function() {
             if (this.view.dataset.model === 'gamification.goal.plan') {
@@ -169,4 +145,36 @@ openerp.gamification = function(instance) {
             }
         }
     });
+
+    instance.gamification.GoalWidget = instance.web_kanban.AbstractField.extend({
+        className: "oe_goal_gauge",
+        start: function() {
+            var self = this;
+            var max = 100;
+            if (this.options.max_field) {
+                max = self.getParent().record[this.options.max_field].raw_value;
+            }
+            var label = "";
+            if (this.options.label_field) {
+                label = self.getParent().record[this.options.label_field].raw_value;
+            }
+            this.g = new JustGage({
+                parentNode: self.$el[0],
+                value: self.get("value"),
+                min: 0,
+                max: max,
+                relativeGaugeSize: true,
+                humanFriendly: true,
+                label: label,
+                levelColors: [
+                    "#ff0000",
+                    "#f9c802",
+                    "#a9d70b"
+                ]
+            });
+        },
+    });
+    instance.web_kanban.fields_registry.add("goal", "instance.gamification.GoalWidget");
+
+    
 };

From 3ee9aa428b1cd29834ee6ed5e8c3adc760c24ade Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 15:20:00 +0200
Subject: [PATCH 330/547] [FIX]gamification: design issues

bzr revid: mat@openerp.com-20130429132000-kibmf1u17h24j92c
---
 addons/gamification/static/src/css/gamification.css | 2 +-
 addons/gamification/static/src/xml/gamification.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
index cc20afede80..fd12ea8966f 100644
--- a/addons/gamification/static/src/css/gamification.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -119,7 +119,7 @@
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current {
     font-size: 150%;
     font-weight: bold;
-    min-width: 50px;
+    min-width: 0px;
     padding: 0 5px;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell {
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 1c655afbb64..9b02005db0f 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -60,7 +60,7 @@
                         </div>
                     </div>
                     <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
                             <t t-if="planline.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>

From 7a242c991ad1973cfc461cadf4a5f7544cc78d74 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 17:29:44 +0200
Subject: [PATCH 331/547] [FIX] python goal checking

bzr revid: mat@openerp.com-20130429152944-e0p6n7q7iw3ok4d8
---
 addons/gamification/goal.py           |  3 ++-
 addons/gamification/goal_type_data.py | 33 ++++-----------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index cb0e554370c..924025da05c 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -261,9 +261,10 @@ class gamification_goal(osv.Model):
                 values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.type')}
                 result = safe_eval(goal.type_id.compute_code, values, {})
 
-                if type(result) == float or type(result) == int:
+                if type(result) == float or type(result) == int or type(result) == long:
                     towrite = {'current': result}
                 else:
+                    towrite = {'current': goal.current}
                     _logger.exception(_('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
                     # raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
 
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/goal_type_data.py
index 40df5f6a88c..6a04d39fdd3 100644
--- a/addons/gamification/goal_type_data.py
+++ b/addons/gamification/goal_type_data.py
@@ -20,11 +20,6 @@
 ##############################################################################
 
 from openerp.osv import osv
-from openerp import SUPERUSER_ID
-
-from datetime import date
-from dateutil.relativedelta import relativedelta
-
 
 class gamification_goal_type_data(osv.Model):
     """Goal type data
@@ -35,33 +30,13 @@ class gamification_goal_type_data(osv.Model):
     """
     _inherit = 'gamification.goal.type'
 
-    def last_connection(self, cr, uid, context=None):
-        """Return the number of days since the last connection"""
-        if context is None: context = {}
-        user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
-        delta = date.today() - user.login_date
-        return delta.days
-
-    def months_since_created(self, cr, uid, context=None):
-        """Return the number of months since the user was created"""
-        if context is None: context = {}
-        user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
-        today = date.today()
-        delta = relativedelta(years=user.create_date.year - today.year, months=user.create_date.month - today.month)
-        return delta.years*12 + delta.months
-
     def number_following(self, cr, uid, xml_id="mail.thread", context=None):
         """Return the number of 'xml_id' objects the user is following
 
-        'message_is_follower' is a non-stored field so could not be in a search
-        domain with a 'count' goal type
-        The object must inherit from mail.thread
+        The model specified in 'xml_id' must inherit from mail.thread
         """
         if context is None: context = {}
         ref_obj = self.pool.get(xml_id)
-        obj_ids = ref_obj.search(cr, uid, [], context=context)
-        following_count = 0
-        for obj in ref_obj.browse(cr, uid, obj_ids, context=context):
-            if obj.message_is_follower:
-                following_count += 1
-        return following_count
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        count = ref_obj.search(cr, uid, [('message_follower_ids', '=', user.partner_id.id)], count=True, context=context)
+        return count

From 0ea12d6d918b8bcecb9125272ae7fd31f94b7827 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 17:30:07 +0200
Subject: [PATCH 332/547] [IMP] design tweaks

bzr revid: mat@openerp.com-20130429153007-tha1wmcvbtp89dz2
---
 addons/gamification/static/src/css/gamification.css | 2 +-
 addons/gamification/static/src/js/gamification.js   | 4 ----
 addons/gamification/static/src/xml/gamification.xml | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
index fd12ea8966f..cc20afede80 100644
--- a/addons/gamification/static/src/css/gamification.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -119,7 +119,7 @@
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current {
     font-size: 150%;
     font-weight: bold;
-    min-width: 0px;
+    min-width: 50px;
     padding: 0 5px;
 }
 .openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 610e74b5d0e..272fa109e78 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -123,10 +123,6 @@ openerp.gamification = function(instance) {
     });
 
     instance.mail.Widget.include({
-        init: function (parent, action) {
-            var self = this;
-            this._super(parent, action);
-        },
         start: function() {
             this._super();
             var self = this;
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 9b02005db0f..1b47f2918d5 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -60,7 +60,7 @@
                         </div>
                     </div>
                     <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{planline.type_display != 'progress' ? 'oe_no_progress' : ''}">
                             <t t-if="planline.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
@@ -69,9 +69,9 @@
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
                                 <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
-                                    <t t-if="planline.type_display == 'progress'"><br/>
+                                    <t t-if="planline.type_display == 'progress'">
                                         <!-- progress, action on current value -->
-                                        <t t-esc="goal.user_name"/>
+                                        <t t-esc="goal.user_name"/><br/>
                                         <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
                                             <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
                                         </t>

From e396d9f0b6aab19a752ed5ec1e4aecc50689cb25 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 17:47:38 +0200
Subject: [PATCH 333/547] [IMP] tooltip on goal symbols

bzr revid: mat@openerp.com-20130429154738-as56ln2gpv3muvyx
---
 addons/gamification/goal_view.xml                   | 9 +++++----
 addons/gamification/static/src/xml/gamification.xml | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 4e8612e5128..073cbd69867 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -155,9 +155,10 @@
                                     <field name="user_id" />
                                     <div class="oe_goal_state_block">
                                         <t t-if="record.type_display.raw_value == 'checkbox'">
-                                            <div class="oe_goal_state oe_e"><t t-if="record.state.raw_value=='reached'"><span class="oe_green">W</span></t>
-                                                <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">N</t>
-                                                <t t-if="record.state.raw_value=='failed'"><span class="oe_red">X</span></t>
+                                            <div class="oe_goal_state oe_e">
+                                                <t t-if="record.state.raw_value=='reached'"><span class="oe_green" title="Goal Reached">W</span></t>
+                                                <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'"><span title="Goal in Progress">N</span></t>
+                                                <t t-if="record.state.raw_value=='failed'"><span class="oe_red" title="Goal Failed">X</span></t>
                                             </div>
                                         </t>
                                         <t t-if="record.type_display.raw_value == 'progress'">
@@ -168,7 +169,7 @@
                                                 <div t-attf-class="oe_goal_state #{record.current.raw_value == record.target_goal.raw_value+1 ? 'oe_orange' : record.current.raw_value &gt; record.target_goal.raw_value ? 'oe_red' : 'oe_green'}">
                                                     <t t-esc="record.current.raw_value" />
                                                 </div>
-                                                <em>reached when lower than <t t-esc="record.target_goal.raw_value" /></em>
+                                                <em>Target: less than <t t-esc="record.target_goal.raw_value" /></em>
                                             </t>
                                         </t>
                                         
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 1b47f2918d5..8aa577bb4fe 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -31,7 +31,7 @@
                                             Target:
                                         </t>
                                         <t t-if="goal.type_condition == 'lower'">
-                                            Target less than:
+                                            Target: &lt;=
                                         </t>
                                         <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                         <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
@@ -53,7 +53,7 @@
                                     Target:
                                 </t>
                                 <t t-if="planline.type_condition == 'lower'">
-                                    Target (less than):
+                                    Target: &lt;=
                                 </t>
                                 <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
                             </div>

From 2b5069f7c8cc7d1d3a7640872e487d6bd7e37cdc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 17:49:12 +0200
Subject: [PATCH 334/547] [REF] move justgage to lib directory

bzr revid: mat@openerp.com-20130429154912-hcq99ukqwr1b2uqh
---
 addons/gamification/static/{src/js => lib/justgage}/justgage.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/gamification/static/{src/js => lib/justgage}/justgage.js (100%)

diff --git a/addons/gamification/static/src/js/justgage.js b/addons/gamification/static/lib/justgage/justgage.js
similarity index 100%
rename from addons/gamification/static/src/js/justgage.js
rename to addons/gamification/static/lib/justgage/justgage.js

From 76491b781a9614aec7a4ade332ae9cbff8c0e84b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 1 May 2013 18:55:25 +0530
Subject: [PATCH 335/547] [IMP]: Improve typo

bzr revid: dbr@tinyerp.com-20130501132525-04ebuxo5usmsi0av
---
 addons/hr_recruitment/hr_recruitment.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3ec36886edb..1d19fc6b204 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -578,10 +578,10 @@ class crm_meeting(osv.Model):
     }
 
     def create(self, cr, uid, vals, context=None):
-        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj = self.browse(cr, uid, res, context=context)
-        if obj.applicant_id:
-            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj.applicant_id.id] , obj.name, obj.date,obj.duration, context=context)
-        return res
+        meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj_meeting = self.browse(cr, uid, meeting_id, context=context)
+        if obj_meeting.applicant_id:
+            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj_meeting.applicant_id.id] , obj_meeting.name, obj_meeting.date,obj_meeting.duration, context=context)
+        return meeting_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 477c5a064b3037fc384671aa3a55e302df9cb217 Mon Sep 17 00:00:00 2001
From: "Ravi Gohil (OpenERP)" <rgo@tinyerp.com>
Date: Tue, 7 May 2013 16:41:02 +0530
Subject: [PATCH 336/547] [FIX] document: 'user_id' field must be declared as
 m2o rather than simple char field as a related field refering it in the same
 module. (Maintenance Case: 592256)

lp bug: https://launchpad.net/bugs/1175984 fixed

bzr revid: rgo@tinyerp.com-20130507111102-iq6jxwy1fy02727q
---
 addons/document/report/document_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index c9df78e4272..a4133f46387 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -31,7 +31,7 @@ class report_document_user(osv.osv):
         'name': fields.char('Year', size=64,readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'user_id':fields.integer('Owner', readonly=True),
+        'user_id': fields.many2one('res.users', 'Owner', readonly=True),
         'user': fields.related('user_id', 'name', type='char', size=64, readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'datas_fname': fields.char('File Name',size=64,readonly=True),

From 0c570e89934296cf5ca7f91c0581d78f7674a2b8 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 8 May 2013 10:26:21 +0530
Subject: [PATCH 337/547] [IMP]purchase : in search view warehouse filter
 display two times

bzr revid: pna@tinyerp.com-20130508045621-00qnigii90n129y0
---
 addons/purchase/report/purchase_report_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 909663f43bb..9acb733e882 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -74,7 +74,6 @@
                     <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>

From 342e2afee175235a50c36c4bfcfa1e8ff1ea6a0c Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 17 May 2013 15:01:56 +0530
Subject: [PATCH 338/547] [FIX]remove wrong fix by pan.

bzr revid: vme@tinyerp.com-20130517093156-gvjvznpjzdg71ls9
---
 addons/web/static/src/css/base.css  | 3 +--
 addons/web/static/src/css/base.sass | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index cdd79760dff..1b2a6b7221c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -528,7 +528,6 @@
 }
 .openerp .oe_grey {
   color: #aaaaaa;
-  height: 30px;
 }
 .openerp .oe_tag {
   border: 1px solid #afafb6;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5d2e5d6f239..9c52a658622 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -467,7 +467,6 @@ $sheet-padding: 16px
         max-width: 650px
     .oe_grey
         color: #aaa
-        height: 30px
 
     // }}}
 

From f7bb48d3b173abb6f9a57ff86870ff4e36e46fe1 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 17 May 2013 15:02:22 +0530
Subject: [PATCH 339/547] [IMP] show button bottom of card.

bzr revid: vme@tinyerp.com-20130517093222-r62lgqhgx3xnryd9
---
 addons/mail/static/src/css/mail_group.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 4f2b8a16dd0..5ba817aa1a5 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -91,7 +91,9 @@
 }
 
 .openerp .oe_group_button {
-    padding-top: 7px;
+    position: absolute;
+    padding-bottom: 50px;
+    bottom: 0;
 }
 
 .openerp .oe_group_button .oe_group_join {

From 33eb5db0d7c9f290e460056a3cb08d411840b21e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 23 May 2013 11:51:08 +0200
Subject: [PATCH 340/547] apply missing patch

bzr revid: mat@openerp.com-20130523095108-fvdxg2vcsr14ce5z
---
 addons/account/i18n/zh_CN.po         |   10 +-
 addons/account_voucher/i18n/nl_BE.po |   28 +-
 addons/base_calendar/i18n/es_MX.po   | 1562 ++++++++++++--------------
 addons/base_setup/i18n/nl_BE.po      |  116 +-
 addons/crm/i18n/nl_BE.po             |  289 +++--
 addons/point_of_sale/i18n/zh_CN.po   |   16 +-
 addons/sale/res_config.py            |    2 +-
 7 files changed, 1029 insertions(+), 994 deletions(-)

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index ff84dd866e8..0e216ddb68f 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-01-30 03:58+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 09:04+0000\n"
+"Last-Translator: Oliver Yuan <Unknown>\n"
 "Language-Team: \n"
 "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:20+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-26 05:34+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10748,7 +10748,7 @@ msgstr "手动的发票税(非主营业务纳税)"
 #: code:addons/account/account_invoice.py:550
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
-msgstr ""
+msgstr "供应商付款条件没有包含付款条件行"
 
 #. module: account
 #: field:account.account,parent_right:0
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index 0cdc8cd8399..a58e655aec6 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-19 18:04+0000\n"
+"PO-Revision-Date: 2013-04-26 16:01+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "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:33+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 "Language: nl\n"
 
 #. module: account_voucher
@@ -138,6 +138,8 @@ msgid ""
 "You can not change the journal as you already reconciled some statement "
 "lines!"
 msgstr ""
+"U kunt het journaal niet veranderen, omdat er al uittreksellijnen zijn "
+"afgepunt."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -148,7 +150,7 @@ msgstr "Goedkeuren"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr ""
+msgstr "Leveranciersbetalingen"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -223,7 +225,7 @@ msgstr "Berichten"
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipts"
-msgstr ""
+msgstr "Aankoopbewijzen"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -431,7 +433,7 @@ msgstr "Debet"
 #: code:addons/account_voucher/account_voucher.py:1547
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Het dagboek kan niet worden gewijzigd"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -745,7 +747,7 @@ msgstr "Augustus"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "Betaling bevestigen"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
@@ -786,7 +788,7 @@ msgstr "Betaald"
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipts"
-msgstr ""
+msgstr "Verkoopbewijzen"
 
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
@@ -834,7 +836,7 @@ msgstr "Onmiddellijk betalen"
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Dr/Cr"
-msgstr ""
+msgstr "Db/Cr"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
@@ -845,7 +847,7 @@ msgstr "Vorige betalingen?"
 #: code:addons/account_voucher/account_voucher.py:1112
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "De factuur die u wilt betalen, is niet meer geldig."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -884,7 +886,7 @@ msgstr "Gelieve een reeks in te stellen voor het journaal."
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "Klantenbetalingen"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
@@ -938,7 +940,7 @@ msgstr "Nummer"
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Credit"
-msgstr ""
+msgstr "Credit"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
@@ -1279,7 +1281,7 @@ msgstr "Openstaand saldo"
 #. module: account_voucher
 #: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
 msgid "Status <b>changed</b>"
-msgstr ""
+msgstr "Status <b>vgewijzigd</b>"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1014
diff --git a/addons/base_calendar/i18n/es_MX.po b/addons/base_calendar/i18n/es_MX.po
index fcb00c6d478..9a2fe449d37 100644
--- a/addons/base_calendar/i18n/es_MX.po
+++ b/addons/base_calendar/i18n/es_MX.po
@@ -1,929 +1,879 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 01:17+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 15:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "El evento comienza"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Hourly"
-msgstr "Cada hora"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Required to Join"
-msgstr "Requerido para unirse"
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
 #: help:calendar.todo,exdate:0
+#: help:crm.meeting,exdate:0
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
-"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
-"de calendario recurrente."
 
 #. module: base_calendar
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-"La compañía seleccionada no está en las compañías permitidas para este "
-"usuario"
-
-#. module: base_calendar
-#: field:calendar.event.edit.all,name:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
-msgid "Monthly"
-msgstr "Mensual"
+#: selection:crm.meeting,rrule_type:0
+msgid "Week(s)"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invited User"
-msgstr "Usuario invitado"
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation"
-msgstr "Invitación"
+#: selection:calendar.attendee,cutype:0
+msgid "Unknown"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,recurrency:0
 #: help:calendar.todo,recurrency:0
+#: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr "Reunión periódica"
+msgstr ""
+
+#. module: base_calendar
+#: model:crm.meeting.type,name:base_calendar.categ_meet5
+msgid "Feedback Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
 msgid "Alarms"
-msgstr "Alarmas"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "Domingo"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr "Rol"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Invitation details"
-msgstr "Detalles de la invitación"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr "Cuarto"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,show_as:0
-#: field:calendar.todo,show_as:0
-msgid "Show as"
-msgstr "Mostrar como"
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "Users"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,day:0
-#: selection:base.calendar.set.exrule,select1:0
 #: field:calendar.event,day:0
 #: selection:calendar.event,select1:0
 #: field:calendar.todo,day:0
 #: selection:calendar.todo,select1:0
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "Día del mes"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
+#: selection:crm.meeting,class:0
 msgid "Public"
-msgstr "Público"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid " "
-msgstr " "
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "March"
-msgstr "Marzo"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:414
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+#: field:crm.meeting,message_unread:0
+msgid "Unread Messages"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "Viernes"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
+#: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr "Todo el día"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,select1:0
-#: field:calendar.event,select1:0
-#: field:calendar.todo,select1:0
-msgid "Option"
-msgstr "Opción"
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
-#: selection:res.users,availability:0
+#: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr "Libre"
+msgstr ""
+
+#. module: base_calendar
+#: help:crm.meeting,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr "Indica si es requerida la confirmación de una respuesta."
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.adjunto"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr "Los usuarios a los que les fue delegado la petición original"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr "Ref. evento"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,we:0
-#: field:calendar.event,we:0
-#: field:calendar.todo,we:0
-msgid "Wed"
-msgstr "Mié"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Show Time as"
-msgstr "Mostrar hora como"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,tu:0
 #: field:calendar.event,tu:0
 #: field:calendar.todo,tu:0
+#: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "Mar"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Yearly"
-msgstr "Anualmente"
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "El evento finaliza"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr "Última"
+msgstr ""
 
 #. module: base_calendar
-#: help:calendar.attendee,state:0
-msgid "Status of the attendee's participation"
-msgstr "Estado de la participación de los asistentes"
+#: help:crm.meeting,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
+#: field:crm.meeting,message_ids:0
+msgid "Messages"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr "Días"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Detalle de la invitación"
+msgid "To"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1355
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#: code:addons/base_calendar/base_calendar.py:1260
 #, python-format
 msgid "Error!"
-msgstr "¡Error!"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr "Presidente"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "My Meetings"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr "Procedimiento"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr "Cancelada"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr "Minutos"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr "Mostrar"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event.edit.all:0
-msgid "Edit all Occurrences"
-msgstr "Editar todas las ocurrencias"
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation type"
-msgstr "Tipo de invitación"
+#: view:crm.meeting:0
+msgid "Mail To"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Secondly"
-msgstr "En segundo lugar"
+#: field:crm.meeting,name:0
+msgid "Meeting Subject"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
-msgid "Event Date"
-msgstr "Fecha evento"
+msgid "End of Recurrence"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: base_calendar
-#: help:base_calendar.invite.attendee,email:0
-msgid "Provide external email address who will receive this invitation."
 msgstr ""
-"Proporcione las direcciones de correo externas de quienes recibiran esta "
-"invitacion."
 
 #. module: base_calendar
-#: model:ir.module.module,description:base_calendar.module_meta_information
-msgid ""
-"Full featured calendar system that supports:\n"
-"    - Calendar of events\n"
-"    - Alerts (create requests)\n"
-"    - Recurring events\n"
-"    - Invitations to people"
+#: view:calendar.event:0
+msgid "Recurrency Option"
 msgstr ""
-"Completo sistema de calendario que soporta:\n"
-"    - Calendario de eventos\n"
-"    - Alertas (crea peticiones)\n"
-"    - Eventos recursivos\n"
-"    - Invitación de personas"
 
 #. module: base_calendar
-#: help:calendar.attendee,cutype:0
-msgid "Specify the type of Invitation"
-msgstr "Especifique el tipo de invitación"
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Years"
-msgstr "Años"
+#: view:crm.meeting:0
+#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
+msgid "Meetings"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
+msgid "Recurrent ID date"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "Fecha del final del evento"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr "Participación opcional"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,date_deadline:0
-#: field:calendar.todo,date_deadline:0
-msgid "Deadline"
-msgstr "Fecha límite"
+#: help:crm.meeting,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:385
-#: code:addons/base_calendar/base_calendar.py:1088
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:441
+#: code:addons/base_calendar/base_calendar.py:1013
+#: code:addons/base_calendar/base_calendar.py:1015
+#: code:addons/base_calendar/base_calendar.py:1460
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,active:0
 #: help:calendar.todo,active:0
+#: help:crm.meeting,active:0
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
-"Si el campo activo se establece a verdadero, se omitirá la alarma del "
-"evento, sin embargo no se eliminará."
 
 #. module: base_calendar
-#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
-msgid "Basic Calendar Functionality"
-msgstr "Funcionalidad básica del calendario"
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:crm.meeting,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
 #: field:calendar.event,organizer_id:0
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr "Organizador"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
+#: field:crm.meeting,user_id:0
 msgid "Responsible"
-msgstr "Responsable"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: model:res.request.link,name:base_calendar.request_link_meeting
+#: model:res.request.link,name:base_calendar.request_link_event
 msgid "Event"
-msgstr "Evento"
-
-#. module: base_calendar
-#: help:calendar.event,edit_all:0
-#: help:calendar.todo,edit_all:0
-msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr "Editar todas las ocurrencias de la reunión recurrente."
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr "Antes de"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
+#: field:crm.meeting,date_open:0
+#: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
-msgid "Edit all events"
-msgstr "Editar todos los eventos"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
 #: field:calendar.event,attendee_ids:0
+#: field:calendar.event,partner_ids:0
 #: field:calendar.todo,attendee_ids:0
+#: field:calendar.todo,partner_ids:0
+#: field:crm.meeting,attendee_ids:0
+#: field:crm.meeting,partner_ids:0
 msgid "Attendees"
-msgstr "Asistentes"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr "Calendario de tareas"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,su:0
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
+#: field:crm.meeting,su:0
 msgid "Sun"
-msgstr "Dom"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr "Tipo de invitación"
-
-#. module: base_calendar
-#: help:calendar.attendee,partner_id:0
-msgid "Partner related to contact"
-msgstr "Partner relacionado con el contacto"
+msgstr ""
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr "Detalles del recordatorio"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr "Delegado desde"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,select1:0
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
+#: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr "Día del mes"
-
-#. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,location:0
-#: field:calendar.event.edit.all,location:0
-#: field:calendar.todo,location:0
-msgid "Location"
-msgstr "Lugar"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,send_mail:0
-msgid "Send mail?"
-msgstr "¿Enviar email?"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,email:0
-#: selection:calendar.alarm,action:0
-#: field:calendar.attendee,email:0
-msgid "Email"
-msgstr "Correo electrónico"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Event Detail"
-msgstr "Detalles del evento"
-
-#. module: base_calendar
-#: selection:calendar.alarm,state:0
-msgid "Run"
-msgstr "Ejecutar"
-
-#. module: base_calendar
-#: field:calendar.event,exdate:0
-#: field:calendar.todo,exdate:0
-msgid "Exception Date/Times"
-msgstr "Fecha/horas excepción"
-
-#. module: base_calendar
-#: selection:calendar.event,class:0
-#: selection:calendar.todo,class:0
-msgid "Confidential"
-msgstr "Confidencial"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,end_date:0
-#: field:calendar.event,end_date:0
-#: field:calendar.todo,end_date:0
-msgid "Repeat Until"
-msgstr "Repetir hasta"
-
-#. module: base_calendar
-#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
-msgid ""
-"Create specific calendar alarms that may be assigned to calendar events or "
-"meetings."
 msgstr ""
-"Crear alarmas específicas que puedan ser asignadas a eventos de calendario o "
-"reuniones."
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "Visibility"
-msgstr "Visibilidad"
+#: field:crm.meeting,message_follower_ids:0
+msgid "Followers"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.attendee,rsvp:0
-msgid "Required Reply?"
-msgstr "¿Respuesta requerida?"
-
-#. module: base_calendar
-#: field:calendar.event,base_calendar_url:0
-#: field:calendar.todo,base_calendar_url:0
-msgid "Caldav URL"
-msgstr "URL de caldav"
-
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "Select range to Exclude"
-msgstr "Elija el rango a excluir"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrente"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
-#: selection:calendar.event,month_list:0
-#: selection:calendar.todo,month_list:0
-msgid "July"
-msgstr "Julio"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: selection:calendar.attendee,state:0
-msgid "Accepted"
-msgstr "Aceptada"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,th:0
-#: field:calendar.event,th:0
-#: field:calendar.todo,th:0
-msgid "Thu"
-msgstr "Jue"
-
-#. module: base_calendar
-#: field:calendar.attendee,child_ids:0
-msgid "Delegrated To"
-msgstr "Delegada en"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Required Reply"
-msgstr "Respuesta requerida"
-
-#. module: base_calendar
-#: selection:calendar.event,end_type:0
-#: selection:calendar.todo,end_type:0
-msgid "Forever"
-msgstr "Siempre"
+#: field:calendar.event,location:0
+#: field:calendar.todo,location:0
+#: field:crm.meeting,location:0
+msgid "Location"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr "Participación  requerida"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: view:calendar.event:0
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+#: field:crm.meeting,show_as:0
+msgid "Show Time as"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1015
+#, python-format
+msgid "Count cannot be negative or 0."
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+#: model:ir.model,name:base_calendar.model_crm_meeting
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Meeting Details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/crm_meeting.py:102
+#, python-format
+msgid "The following contacts have no email address :"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting.type:0
+#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting_type
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_type
+msgid "Meeting Types"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr "Creada"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
-msgid "Private"
-msgstr "Privada"
+#: selection:crm.meeting,class:0
+msgid "Public for Employees"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Daily"
-msgstr "Diariamente"
+#: view:crm.meeting:0
+msgid "hours"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:385
-#, python-format
-msgid "Can not Duplicate"
-msgstr "No se puede duplicar"
-
-#. module: base_calendar
-#: field:calendar.event,class:0
-#: field:calendar.todo,class:0
-msgid "Mark as"
-msgstr "Marcar como"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: field:calendar.attendee,partner_address_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_calendar
-#: help:calendar.event,rrule_type:0
-#: help:calendar.todo,rrule_type:0
-msgid "Let the event automatically repeat at that interval"
-msgstr "Permite que el evento se repita automáticamente en ese intervalo"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,partner_id:0
-#: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Contact"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: selection:base_calendar.invite.attendee,type:0
-msgid "Partner Contacts"
-msgstr "Contactos de la empresa"
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Ok"
-msgstr "_Aceptar"
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Options"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "First"
-msgstr "Primera"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Privacy"
-msgstr "Privacidad"
-
-#. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Zona horaria"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Subject"
-msgstr "Asunto"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "September"
-msgstr "Septiembre"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "December"
-msgstr "Diciembre"
+msgstr ""
 
 #. module: base_calendar
-#: help:base_calendar.invite.attendee,send_mail:0
-msgid "Check this if you want to send an Email to Invited Person"
-msgstr "Marque aquí si quiere enviar un correo a la persona invitada"
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,categ_ids:0
+msgid "Tags"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr "Disponibilidad"
-
-#. module: base_calendar
-#: view:calendar.event.edit.all:0
-msgid "_Save"
-msgstr "_Guardar"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr "Individual"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
+#: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr "Repetir x veces"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr "Dueño"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Delegation Info"
-msgstr "Información delegación"
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event.edit.all,date:0
-msgid "Start Date"
-msgstr "Fecha inicio"
+#: model:ir.ui.menu,name:base_calendar.mail_menu_calendar
+msgid "Calendar"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr "Nombre común"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr "Rechazada"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "My Role"
-msgstr "Mi rol"
+#: code:addons/base_calendar/base_calendar.py:1460
+#, python-format
+msgid "Group by date is not supported, use the calendar view instead."
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-msgid "My Events"
-msgstr "Mis eventos"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Decline"
-msgstr "Rechazar"
-
-#. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Weeks"
-msgstr "Semanas"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr "Grupo"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,edit_all:0
-#: field:calendar.todo,edit_all:0
-msgid "Edit All"
-msgstr "Editar todo"
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr ""
 
 #. module: base_calendar
-#: field:base_calendar.invite.attendee,contact_ids:0
-msgid "Contacts"
-msgstr "Contactos"
+#: view:calendar.event:0
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+#: field:crm.meeting,class:0
+msgid "Privacy"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr "Información sobre la alarma básica"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
+#: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr "Vie"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-#: selection:res.alarm,trigger_interval:0
-msgid "Hours"
-msgstr "Horas"
-
-#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
-#, python-format
-msgid "Count can not be Negative"
-msgstr "La cuenta no puede ser negativa"
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr "Miembro"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
+#: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "Ubicación del evento"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
+#: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr "Regla recurrente"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr "Adjunto"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation From"
-msgstr "Invitación desde"
+#: field:crm.meeting,date_closed:0
+msgid "Closed"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-msgid "End of Recurrency"
-msgstr "Fin de recurrencia"
+msgid "From"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: field:calendar.event.edit.all,alarm_id:0
+#: field:calendar.event,alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:crm.meeting,alarm_id:0
 msgid "Reminder"
-msgstr "Recordatorio"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
-msgid "Set Exrule"
-msgstr "Establecer Exregla"
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+#: selection:crm.meeting,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: base_calendar
+#: model:crm.meeting.type,name:base_calendar.categ_meet2
+msgid "Internal Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr "Eventos"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
-#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
-msgid "Invite Attendees"
-msgstr "Invitar asistentes"
+#: field:calendar.alarm,state:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+#: field:crm.meeting,state:0
+msgid "Status"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr "Email del invitado"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,repeat:0
-#: field:calendar.event,count:0
-#: field:calendar.todo,count:0
-#: field:res.alarm,repeat:0
-msgid "Repeat"
-msgstr "Repetir"
+#: model:crm.meeting.type,name:base_calendar.categ_meet1
+msgid "Customer Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -931,186 +881,193 @@ msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
 msgstr ""
-"La referencia a la URI que apunta a la información del directorio "
-"correspondiente al participante."
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "August"
-msgstr "Agosto"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr "Lunes"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
-#: selection:calendar.event,byday:0
-#: selection:calendar.todo,byday:0
-msgid "Third"
-msgstr "Tercero"
+#: model:crm.meeting.type,name:base_calendar.categ_meet4
+msgid "Open Discussion"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Models"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "June"
-msgstr "Junio"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
-msgstr "Alarma básica"
-
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
-msgid "The"
-msgstr "El"
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: view:crm.meeting:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr "Delegado desde"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr "Usuario"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
+#: field:crm.meeting,date:0
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Start Date"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "November"
-msgstr "Noviembre"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr "Indicar los grupos a los que pertenece el asistente"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-msgid "Data"
-msgstr "Datos"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr "Lun"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,count:0
-msgid "Count"
-msgstr "Total"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "No repetir"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "October"
-msgstr "Octubre"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
 #: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+#: view:crm.meeting:0
 msgid "Uncertain"
-msgstr "Incierto"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.attendee,language:0
-msgid "Language"
-msgstr "Idioma"
+#: constraint:calendar.event:0
+#: constraint:calendar.todo:0
+#: constraint:crm.meeting:0
+msgid "Error ! End date cannot be set before start date."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr "Disparadores"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "January"
-msgstr "Enero"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr "Relacionado con"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr "Intervalo"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr "Miércoles"
-
-#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1088
-#, python-format
-msgid "Interval can not be Negative"
-msgstr "El intervalo no puede ser negativo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
+#: field:crm.meeting,message_summary:0
 msgid "Summary"
-msgstr "Resumen"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
 #: field:calendar.event,active:0
 #: field:calendar.todo,active:0
+#: field:crm.meeting,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:399
+#, python-format
+msgid "You cannot duplicate a calendar attendee."
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr "Elija el día del mes en que se repetirá la reunión"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr "Acción"
-
-#. module: base_calendar
-#: help:base_calendar.invite.attendee,type:0
-msgid "Select whom you want to Invite"
-msgstr "Seleccione a quien quiere invitar"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1119,52 +1076,38 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
-"Duración' y 'Repetir' son ambos opcionales, pero si uno está activo también "
-"debe estarlo el otro"
-
-#. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
-msgid "Calendar Edit all event"
-msgstr "Editar todos los eventos del calendario"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr "Rol de participación para el usuario del calendario."
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr "Delegado a"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr "Define la acción a invocar cuando salte la alarma"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Starting at"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
+#: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr "Fecha de fin"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr "Buscar eventos"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Recurrency Option"
-msgstr "Opción de recurrencia"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Weekly"
-msgstr "Semanal"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1173,87 +1116,70 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
-"Si el campo activo es verdadero, le permitirá ocultar la notificación de "
-"aviso del evento sin eliminarlo."
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-msgid "Recurrent ID date"
-msgstr "ID fecha recurrente"
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+#: field:crm.meeting,end_type:0
+msgid "Recurrence Termination"
+msgstr ""
 
 #. module: base_calendar
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
-
-#. module: base_calendar
-#: field:calendar.alarm,state:0
-#: view:calendar.attendee:0
-#: field:calendar.attendee,state:0
-#: view:calendar.event:0
-#: field:calendar.event,state:0
-#: field:calendar.todo,state:0
-msgid "State"
-msgstr "Estado"
+#: view:crm.meeting:0
+msgid "Until"
+msgstr ""
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr "Detalles del recordatorio"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "To Review"
-msgstr "A revisar"
+#: model:crm.meeting.type,name:base_calendar.categ_meet3
+msgid "Off-site Meeting"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,freq:0
-#: field:calendar.event,freq:0
-#: field:calendar.todo,freq:0
-msgid "Frequency"
-msgstr "Frecuencia"
+#: view:crm.meeting:0
+msgid "Day of Month"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr "Hecho"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
+#: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Repetir cada (días/semana/mes/año)"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: field:base_calendar.invite.attendee,user_ids:0
-msgid "Users"
-msgstr "Usuarios"
+#: view:crm.meeting:0
+msgid "All Day?"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "of"
-msgstr "de"
-
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
-#: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_res_users
-msgid "res.users"
-msgstr "res.usuarios"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Tuesday"
-msgstr "Martes"
+#: model:ir.actions.act_window,help:base_calendar.action_crm_meeting
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to schedule a new meeting.\n"
+"          </p><p>\n"
+"            The calendar is shared between employees and fully integrated "
+"with\n"
+"            other applications such as the employee holidays or the "
+"business\n"
+"            opportunities.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1262,129 +1188,103 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
-"Facilita una descripción más completa del componente del calendario que la "
-"facilitada por la propiedad \"RESUMEN\""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr "Usuario responsable"
+msgstr ""
 
 #. module: base_calendar
+#: view:crm.meeting:0
+msgid "Select Weekdays"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1519
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
-#: selection:res.users,availability:0
+#: selection:crm.meeting,show_as:0
+#, python-format
 msgid "Busy"
-msgstr "Ocupado"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr "Evento de calendario"
-
-#. module: base_calendar
-#: selection:calendar.attendee,state:0
-#: selection:calendar.event,state:0
-#: selection:calendar.todo,state:0
-msgid "Tentative"
-msgstr "Provisional"
-
-#. module: base_calendar
-#: field:calendar.event,interval:0
-#: field:calendar.todo,interval:0
-msgid "Repeat every"
-msgstr "Repetir cada"
-
-#. module: base_calendar
-#: selection:calendar.event,end_type:0
-#: selection:calendar.todo,end_type:0
-msgid "Fix amout of times"
-msgstr "Cantidad fija de veces"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
+#: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr "Recurrente"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
+#: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr "Recurrencia"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
-#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
-msgid "Event Invitations"
-msgstr "Invitaciones al evento"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr "Jueves"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
+#: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr "Regla de excepción"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
 msgstr ""
-"Para indicar el idioma de los valores de texto en una propiedad o parámetro "
-"de propiedad."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr "Detalles"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
 #: help:calendar.todo,exrule:0
+#: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
-"Define una regla o patrón de repetición de tiempo a excluir de la regla "
-"recurrente."
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
+#: field:crm.meeting,month_list:0
 msgid "Month"
-msgstr "Mes"
-
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr "Invitar personas"
-
-#. module: base_calendar
-#: help:calendar.event,rrule:0
-#: help:calendar.todo,rrule:0
-msgid ""
-"Defines a rule or repeating pattern for recurring events\n"
-"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
-"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
-"Define una regla o patrón repetitivo para eventos recurrentes.\n"
-"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
-"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirmed Events"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr "Referencia URI"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1393,110 +1293,115 @@ msgstr "Referencia URI"
 #: field:calendar.event,name:0
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
+#: field:crm.meeting,description:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "May"
-msgstr "Mayo"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,type:0
-#: view:calendar.attendee:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Search Invitations"
-msgstr "Buscar invitaciones"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr "Después de"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr "Parar"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr "ir.valores"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_model
-msgid "Objects"
-msgstr "Objetos"
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_crm_meeting_type
+msgid "Meeting Type"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr "Delegada"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
+#: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr "Sáb"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "Choose day where repeat the meeting"
-msgstr "Eligir día en el que repetir la cita"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to setup a new alarm type.\n"
+"              </p><p>\n"
+"                You can define a customized type of calendar alarm that may "
+"be\n"
+"                assigned to calendar events or meetings.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Minutely"
-msgstr "Cada minuto"
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
 msgstr ""
-"Indique el usuario que está actuando en nombre del usuario del calendario."
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: field:calendar.event.edit.all,date_deadline:0
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+#: field:crm.meeting,date_deadline:0
 msgid "End Date"
-msgstr "Fecha final"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "February"
-msgstr "Febrero"
-
-#. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Months"
-msgstr "Meses"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr "Recurso"
+msgstr ""
 
 #. module: base_calendar
+#: field:crm.meeting.type,name:0
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_alarm
-msgid "Event alarm information"
-msgstr "Información del aviso del evento"
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1504,154 +1409,162 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
-"Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
-"o contiene el texto a mostrar"
 
 #. module: base_calendar
-#: field:calendar.event,alarm_id:0
-#: field:calendar.event,base_calendar_alarm_id:0
-#: field:calendar.todo,alarm_id:0
-#: field:calendar.todo,base_calendar_alarm_id:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: base_calendar
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
-#, python-format
-msgid "Please Apply Recurrency before applying Exception Rule."
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
-"Por favor, aplique la repetición antes de aplicar la excepción de la regla"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr "Enviado por usuario"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "April"
-msgstr "Abril"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/crm_meeting.py:106
+#, python-format
+msgid "Email addresses not found"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr "Periodo de recurrencia"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
+#: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr "Día de la semana"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1013
+#, python-format
+msgid "Interval cannot be negative."
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
+#: field:crm.meeting,byday:0
 msgid "By day"
-msgstr "Por día"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:441
+#, python-format
+msgid "First you have to specify the date of the invitation."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr "Modelo"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr "Audio"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
+#: field:crm.meeting,id:0
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr "Con propósito informativo"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-msgid "Invite"
-msgstr "Invitar"
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr "Información asistentes"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr "ID del registro"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr "Necesita acción"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr "Enviado por"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
+#: field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Secuencia"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
+#: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "Internal User"
-msgstr "Usuario interno"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Accept"
-msgstr "Aceptar"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr "Sábado"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation To"
-msgstr "Invitación a"
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+#: field:crm.meeting,interval:0
+msgid "Repeat Every"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr "Segundo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
-#: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr "Libre/Ocupado"
-
-#. module: base_calendar
-#: field:calendar.event,end_type:0
-#: field:calendar.todo,end_type:0
-msgid "Way to end reccurency"
-msgstr "Forma de terminar recurrencia"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1659,20 +1572,16 @@ msgstr "Forma de terminar recurrencia"
 #: field:calendar.event,duration:0
 #: field:calendar.todo,date:0
 #: field:calendar.todo,duration:0
+#: field:crm.meeting,duration:0
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr "Duración"
-
-#. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
-msgstr "Email externo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr "Fecha activación"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1684,19 +1593,10 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
-"* Apunta a un recurso de sonido, que se escucha cuando la alarma se activa "
-"por audio.\n"
-"* El archivo que está intentando ser enviado como adjunto en el correo "
-"electrónico.\n"
-"* Apunta a un recurso de procedimiento, que se invoca cuando la alarma se "
-"activa por procedimiento."
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr "Quinto"
-
-#~ msgid "Set Exclude range"
-#~ msgstr "Fijar el rango de exclusión"
+msgstr ""
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index f22fd2c8adc..518ada07a5c 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-01 11:22+0000\n"
+"PO-Revision-Date: 2013-04-26 16:24+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "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:12+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Emails Integration"
-msgstr ""
+msgstr "E-mailintegratie"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -29,18 +29,19 @@ msgstr "Gast"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactpersonen"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Gebruik externe verificatieproviders. Meld aan met Google, Facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -54,11 +55,19 @@ msgid ""
 "OpenERP using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"OpenERP maakt het mogelijk om automatisch leads (of andere documenten)\n"
+"                             aan te maken op basis van inkomende e-mails. U "
+"kunt automatisch e-mails synchroniseren met OpenERP\n"
+"                            met behulp van reguliere POP / IMAP-accounts, "
+"via een direct e-mailintegratiescript voor uw\n"
+"                            e-mailserver, of door zelf uw e-mails naar "
+"OpenERP te sturen met behulp van specifieke\n"
+"                            plug-ins voor uw favoriete e-mailprogramma."
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
 msgid "SALE"
-msgstr ""
+msgstr "VERKOOP"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -68,24 +77,24 @@ msgstr "Lid"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Portaaltoegang"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "Verificatie"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Offertes en verkooporders"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "Algemeen"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -95,12 +104,12 @@ msgstr "Donor"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "Relatiebeheer"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -110,32 +119,32 @@ msgstr "Patiënt"
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Gebruikers mogen gegevens importeren uit csv-bestanden"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "Meerdere bedrijven beheren"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
-msgstr ""
+msgstr "Op e-mailclient"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+msgstr "--db-filter=UW_DATABASE"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Haal contactpersonen op uit LinkedIn"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
 msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Activeer de Thunderbirdplug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -145,22 +154,22 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "Klantenopties"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "Verkoopopties"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
 msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Activeer de Outlookplug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -179,7 +188,7 @@ msgstr "Huurder"
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Gelijk welk scherm van OpenERP delen of insluiten"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -192,6 +201,8 @@ msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Als u een nieuwe contactpersoon maakt (persoon of bedrijf), kunt u alle "
+"gegevens van LinkedIn laden (foto, adres, enz.)"
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -200,6 +211,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Werken in omgevingen met meerdere bedrijven, met de nodige "
+"toegangsbeveiliging tussen de bedrijven.\n"
+"                Hiermee installeert u de module multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -208,6 +222,9 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Het openbare portaal is alleen toegankelijk als u zich in een enkele "
+"databasemodus bevindt. U kunt\n"
+"                                    de OpenERP-server starten met de optie"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -215,11 +232,13 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"U vindt meer opties bij de bedrijfsgegevens: adres voor de kop- en "
+"voettekst, teksten voor achterstallige betalingen, enz."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -238,6 +257,12 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Wanneer u een document naar een klant stuurt,\n"
+"                                    (offerte, factuur), kan uw klant\n"
+"                                    aanmelden en zijn documenten bekijken,\n"
+"                                    uw bedrijfsnieuws lezen, zijn projecten "
+"controleren,\n"
+"                                    enz."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -253,6 +278,8 @@ msgstr "Cliënt"
 #: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
+"Activeer het openbare deel van OpenERP; OpenERP wordt hiermee een openbare "
+"website."
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -265,6 +292,13 @@ msgid ""
 "                Partner from the selected emails.\n"
 "                This installs the module plugin_thunderbird."
 msgstr ""
+"Met de plug-in kunt u e-mails met bijlagen koppelen aan de geselecteerde\n"
+"                OpenERP-objecten. U kunt een relatie of een lead kiezen en\n"
+"                de gekozen e-mail koppelen als een .eml-bestand als bijlage\n"
+"                aan het geselecteerde record. U kunt documenten aanmaken "
+"voor CRM-lead\n"
+"                en relaties vanuit de geselecteerde e-mails. Hiermee "
+"installeert u de module plugin_thunderbird."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -280,7 +314,7 @@ msgstr "Gebruik een andere benaming voor Klant"
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Verkoop instellen"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -293,16 +327,23 @@ msgid ""
 "                email into an OpenERP mail message with attachments.\n"
 "                This installs the module plugin_outlook."
 msgstr ""
+"Met de Outlookplug-in kunt u een object selecteren dat u wilt toevoegen\n"
+"                aan uw e-mail en de bijlagen van MS Outlook. U kunt een "
+"relatie \n"
+"                of een lead kiezen en de geselecteerde e-mail archiveren in "
+"een\n"
+"                OpenERP-mailbericht met bijlagen.\n"
+"                Hiermee installeert u de module plugin_outlook."
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Opties"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer portal"
-msgstr ""
+msgstr "Klantenportaal activeren"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -311,36 +352,37 @@ msgid ""
 "                                    Once activated, the login page will be "
 "replaced by the public website."
 msgstr ""
+"Na activering zal de aanmeldpagina worden vervangen door de openbare website."
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Sta het delen van documenten toe"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+msgstr "(bedrijfsnieuws, vacatures, contactformulier, enz.)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Openbare portaal activeren"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Uitgaande e-mailservers instellen"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Integratie sociale netwerken"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Geef uw klanten toegang tot hun documenten."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -352,7 +394,7 @@ msgstr "Afbreken"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Toepassen"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -363,12 +405,12 @@ msgstr "Kies uw terminologie"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Uw bedrijfsgegevens instellen"
 
 #~ msgid "Logo"
 #~ msgstr "Logo"
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 697c7c4f083..a22d1f605a6 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/i18n/nl_BE.po
@@ -1,20 +1,20 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
 # * crm
-# Els Van Vossel <evv@agaplan.eu>, 2012.
+# Els Van Vossel <evv@agaplan.eu>, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-10-02 07:29+0000\n"
+"PO-Revision-Date: 2013-04-26 23:39+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "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:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 "Language: nl\n"
 
 #. module: crm
@@ -28,6 +28,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Hiermee kunt u de inkomende mailserver instellen en leads laten maken van "
+"binnenkomende e-mails."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:881
@@ -76,7 +78,7 @@ msgstr "Opportuniteiten kiezen"
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -96,7 +98,7 @@ msgstr "Fasenaam"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Verkoper"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -113,18 +115,18 @@ msgstr "Dag"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Bedrijfsnaam"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Training"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Verkooplabels"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -137,6 +139,7 @@ msgstr "Verw. sluiting"
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
+"Als dit is ingeschakeld, zijn er nieuwe berichten die uw aandacht vragen."
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -182,6 +185,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Bevat de Chatsamenvatting (aantal berichten, ...). Deze samenvatting is in "
+"html-formaat, zodat ze in de kanbanweergave kan worden gebruikt."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:624
@@ -189,7 +194,7 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: crm
 #: view:crm.lead:0
@@ -238,7 +243,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Herinnering voor gebruiker"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -266,7 +271,7 @@ msgstr "Leadanalyse"
 #: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s een gesprek</b> voor <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -328,6 +333,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een nieuwe klantensegmentering wilt instellen.\n"
+"              </p><p>\n"
+"                Maak specifiieke categorieën en ken deze toe aan uw\n"
+"                contactpersonen voor een betere interactie. Via\n"
+"                segmentering kunt u categorieën toekennen aan "
+"contactpersonen\n"
+"                volgens de door u ingestelde criteria.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -341,6 +356,7 @@ msgstr "Contactpersoon"
 msgid ""
 "When escalating to this team override the salesman with the team leader."
 msgstr ""
+"Bij escaleren naar dit team, wordt de verkoper vervangen door de teamleider."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -380,12 +396,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om een opportuniteit voor deze klant te maken.\n"
+"              </p><p>\n"
+"                Met opportuniteiten kunt u uw verkooppijplijn en uw "
+"mogelijke verkopen opvolgen,\n"
+"                voor een beter zicht op te verwachten inkomsten.\n"
+"              </p><p>\n"
+"                U kunt vergaderingen en telefoongesprekken plannen\n"
+"                voor opportuniteiten. U kunt van een opportuniteit een "
+"offerte maken, documenten\n"
+"                toevoegen, discussies volgen, en nog veel meer.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "Dood"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -393,7 +422,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -407,7 +436,7 @@ msgstr "Segmentering"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Koppelen aan een bestaande relatie"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -425,8 +454,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
-"Dit percentage drukt de standaard/gemiddelde slaagkans uit voor de zaak in "
-"deze fase."
+"Dit percentage drukt de standaard/gemiddelde slagingskans uit voor de zaak "
+"in deze fase."
 
 #. module: crm
 #: view:crm.lead:0
@@ -454,6 +483,7 @@ msgstr ""
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
+"Leads toegewezen aan een van de verkoopteams onder mijn beheer, of aan mij"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
@@ -472,6 +502,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een nieuw verkoopteam wilt maken.\n"
+"              </p><p>\n"
+"                Met verkoopteams organiseert u meerdere verkopers of "
+"afdelingen in\n"
+"                aparte teams. Elk team werkt op zijn eigen\n"
+"                opportuniteitenlijst.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -485,7 +524,7 @@ msgstr "Gewone of telefonische vergadering over opportuniteit"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -495,7 +534,7 @@ msgstr "Opportuniteit maken"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Instellen"
 
 #. module: crm
 #: view:crm.lead:0
@@ -555,18 +594,26 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"De status wordt op 'Uit te voeren' gezet als er een zaak wordt gemaakt.      "
+"                            \n"
+"Als de zaak lopende is, wordt de status op 'Open' gezet.                     "
+"             \n"
+"Als het gesprek is gevoerd, wordt de status op 'Uitgevoerd' gezet.           "
+"                       \n"
+"Als het gesprek nog moet worden uitgevoerd, gaat de status naar 'Niet "
+"uitgevoerd'."
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
 #: field:crm.lead,message_summary:0
 #: field:crm.phonecall,message_summary:0
 msgid "Summary"
-msgstr "Samenvatting"
+msgstr "Overzicht"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Samenvoegen"
 
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
@@ -589,6 +636,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Herinnering voor Lead: [[object.id ]] [[object.partner_id and 'van ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -608,7 +657,7 @@ msgstr "De code van het verkoopteam moet uniek zijn"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "Email address of the contact"
-msgstr ""
+msgstr "E-mailadres van de contactpersoon"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -629,6 +678,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Klik als u een nieuwe categorie wilt maken.\n"
+"          </p><p>\n"
+"            Maak specifieke telefooncategorieën om beter de gesprekstypen\n"
+"            op te volgen in het systeem.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -734,12 +790,12 @@ msgstr "Televisie"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -749,7 +805,7 @@ msgstr "Verwerking stoppen"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -761,6 +817,8 @@ msgstr "Telefoongesprekken zoeken"
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Leads/Opportuniteiten die zijn toegewezen aan een van de verkoopteams onder "
+"mijn beheer"
 
 #. module: crm
 #: field:calendar.attendee,categ_id:0
@@ -781,7 +839,7 @@ msgstr "Van %s : %s"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -790,7 +848,7 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -809,6 +867,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Koppeling tussen fasen en verkoopteams. Deze maken de huidige fase enkel "
+"toegankelijk voor de gekozen verkoopteams."
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -847,7 +907,7 @@ msgstr "Relatiecategorie"
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Slagingskans (%)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -889,7 +949,7 @@ msgstr "Maart"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "E-mail verzenden"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
@@ -919,6 +979,8 @@ msgid ""
 "Opportunities that are assigned to either me or one of the sale teams I "
 "manage"
 msgstr ""
+"Opportuniteiten die zijn toegewezen aan een van de verkoopteams onder mijn "
+"beheer of aan mij"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
@@ -984,6 +1046,9 @@ msgid ""
 "Allows you to track your customers/suppliers claims and grievances.\n"
 "                    This installs the module crm_claim."
 msgstr ""
+"Hiermee kunt u klachten en problemen van klanten/ aan leveranciers "
+"opvolgen.\n"
+"                    Hiermee installeert u de module crm_claim."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -1058,7 +1123,7 @@ msgstr "Fase"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "Aan mij toegewezen telefoongesprekken"
 
 #. module: crm
 #: field:crm.lead,user_login:0
@@ -1086,11 +1151,13 @@ msgid ""
 "Allows you to communicate with Customer,  process Customer query, and "
 "provide better help and support. This installs the module crm_helpdesk."
 msgstr ""
+"Hiermee kunt u met de klant communiceren, vragen beantwoorden en betere "
+"ondersteuning verlenen. Hiermee installeert u de module crm_helpdesk."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Verwijderen"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
@@ -1100,7 +1167,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1141,12 +1208,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "Betalingswijzen"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1193,6 +1260,9 @@ msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
+"Dit veld dient om een onderscheid te maken tussen de fasen voor leads en die "
+"voor opportuniteiten, of om fasen in te stellen die voor beide typen van "
+"toepassing zijn."
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_create
@@ -1234,7 +1304,7 @@ msgstr "onbekend"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1247,7 +1317,7 @@ msgstr "Datum"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Onlineondersteuning"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1273,6 +1343,10 @@ msgid ""
 "set to 'Done'. If the case needs to be reviewed then the Status is  set to "
 "'Pending'."
 msgstr ""
+"De status wordt op 'Voorlopig' gezet als de zaak wordt gemaakt. Als de zaak "
+"lopende is, wordt de status op 'Open' gezet. Als de zaak is behandeld, wordt "
+"de status op 'Gereed' gezet. Als de zaak moet worden bekeken, wordt de "
+"status op 'Wachtend' gezet."
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
@@ -1306,7 +1380,7 @@ msgstr "Segmenteringsomschrijving"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Description"
-msgstr ""
+msgstr "Leadomschrijving"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:565
@@ -1317,7 +1391,7 @@ msgstr "Samengevoegde opportuniteiten"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Consulting"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1327,7 +1401,7 @@ msgstr "Code"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Opties"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1342,7 +1416,7 @@ msgstr "Telefoongesprekken in status Uit te voeren en Open."
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Verkopers"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1362,12 +1436,12 @@ msgstr "Annuleren"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Opportuniteiten voor mij of mijn team(s)"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1389,7 +1463,7 @@ msgstr ""
 #: field:crm.lead2opportunity.partner.mass,action:0
 #: field:crm.partner.binding,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "Gekoppelde klant"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1406,12 +1480,12 @@ msgstr "Lead/opportuniteit"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten samenvoegen"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "WOrdt gebruikt om fasen te rangschikken. Lager is beter."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1426,7 +1500,7 @@ msgstr "Leads/opportuniteiten in status Open."
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
@@ -1484,7 +1558,7 @@ msgstr "Naam"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities that are assigned to me"
-msgstr ""
+msgstr "Leads/opportuniteiten die aan mij zijn toegekend"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
@@ -1502,12 +1576,12 @@ msgstr "Mijn zaken"
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatiehistoriek"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "Landen tonen"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1531,7 +1605,7 @@ msgstr "Prospect omzetten naar relatie"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
-msgstr ""
+msgstr "CRM betalingswijze"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1554,7 +1628,7 @@ msgstr "Groeperen op..."
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge Leads/Opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten samenvoegen"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -1566,7 +1640,7 @@ msgstr "Hoofdteam"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
-msgstr ""
+msgstr "Geen relatie koppelen"
 
 #. module: crm
 #: field:crm.lead,date_action:0
@@ -1580,11 +1654,14 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"De status van uw document wordt automatisch gewijzigd in de functie van de "
+"gekozen fase. Als een fase gekoppeld is aan de status 'Gesloten', dan wordt "
+"het document automatisch gesloten als het in deze status komt."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assign opportunities to"
-msgstr ""
+msgstr "Opportuniteiten toewijzen aan"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1600,12 +1677,12 @@ msgstr "Maand van gesprek"
 #: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "Relatie is <b>gemaakt</b>."
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
 msgid "Manage Customer Claims"
-msgstr ""
+msgstr "Klachten van klanten opvolgen"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -1618,7 +1695,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "Diensten"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1657,7 +1734,7 @@ msgstr "Antwoord aan"
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "Weergeven"
 
 #. module: crm
 #: view:board.board:0
@@ -1693,12 +1770,12 @@ msgstr "Extra informatie"
 #. module: crm
 #: view:crm.lead:0
 msgid "Fund Raising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "Bewerken…"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1730,13 +1807,15 @@ msgstr "Lead naar opportuniteit / relatie"
 #: help:crm.lead,partner_id:0
 msgid "Linked partner (optional). Usually created when converting the lead."
 msgstr ""
+"Gekoppelde relatie (optioneel). Doorgaans gemaakt bij het omzetten van de "
+"lead."
 
 #. module: crm
 #: field:crm.lead,payment_mode:0
 #: view:crm.payment.mode:0
 #: model:ir.actions.act_window,name:crm.action_crm_payment_mode
 msgid "Payment Mode"
-msgstr ""
+msgstr "Betalingswijze"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
@@ -1746,19 +1825,19 @@ msgstr "Vele leads naar opportuniteit / relatie"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "On Mail Server"
-msgstr ""
+msgstr "Op mailserver"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Contacts Segmentation"
-msgstr ""
+msgstr "Contactpersoonsegmentering"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -1773,7 +1852,7 @@ msgstr "Televerkoop"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Leads voor mij of mijn team(s)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1817,7 +1896,7 @@ msgstr "Lead / klant"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "Supportafdeling"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1881,13 +1960,13 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "Ontwerp"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing opportunities"
-msgstr ""
+msgstr "Samenvoegen met bestaande opportuniteiten"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1912,6 +1991,8 @@ msgid ""
 "The name of the future partner company that will be created while converting "
 "the lead into opportunity"
 msgstr ""
+"De naam van de toekomstige relatie die zal worden gemaakt als van de lead "
+"een opportuniteit wordt gemaakt."
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0
@@ -1945,7 +2026,7 @@ msgstr "Openstaande opportuniteiten"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Email Campaign - Services"
-msgstr ""
+msgstr "E-mailcampagne - Diensten"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2018,7 +2099,7 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Create a new customer"
-msgstr ""
+msgstr "Een  nieuwe klant maken"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2028,7 +2109,7 @@ msgstr "Verw. sluiting"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "Software"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2063,12 +2144,12 @@ msgstr "Plaats"
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "Beide"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "Gesprek uitgevoerd"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2079,12 +2160,12 @@ msgstr "Verantwoordelijke"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
-msgstr ""
+msgstr "Direct Marketing"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
@@ -2094,7 +2175,7 @@ msgstr "Creatiejaar"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
-msgstr ""
+msgstr "Conversieopties"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2106,7 +2187,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2114,6 +2195,8 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"Het e-mailadres van het team. Nieuwe e-mails worden automatisch als lead "
+"gemaakt en toegekend aan dit team."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2172,7 +2255,7 @@ msgstr "Verder verwerken"
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2214,6 +2297,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Deze fase is niet zichtbaar, vb. in statusbalk of kanbanweergave, als er "
+"zich geen records in deze fase bevinden."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2229,12 +2314,12 @@ msgstr "Verkoopteam aan wie de zaak toebehoort"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Kopadvertenties"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2279,17 +2364,17 @@ msgstr "Objectnaam"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Telefoongesprekken voor mij of mijn team(s)"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "Herstellen"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Klantenservice"
 
 #. module: crm
 #: field:crm.case.section,message_ids:0
@@ -2344,7 +2429,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Gekoppelde status"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -2365,7 +2450,7 @@ msgstr "Een gesprek plannen/noteren"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten kiezen"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2390,7 +2475,7 @@ msgstr "Bevestigen"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Ongelezen berichten"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2407,7 +2492,7 @@ msgstr "Optionele expressie"
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Volgers"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2430,7 +2515,7 @@ msgstr ""
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "Leads maken van binnenkomende mails"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2481,7 +2566,7 @@ msgstr "Opportuniteiten maken van leads"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "E-mailcampagne - Producten"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -2509,7 +2594,7 @@ msgstr "Allereerste contact met een nieuwe prospect"
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "Gesprekken"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2519,7 +2604,7 @@ msgstr "Kans automatisch wijzigen"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "Mijn telefoongesprekken"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
@@ -2530,7 +2615,7 @@ msgstr "Kwalificatie"
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Conversion Action"
-msgstr ""
+msgstr "Conversieactie"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2606,7 +2691,7 @@ msgstr "Verw. sluitingsjaar"
 #. module: crm
 #: model:ir.actions.client,name:crm.action_client_crm_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Het verkoopmenu openen"
 
 #. module: crm
 #: field:crm.lead,date_open:0
@@ -2629,12 +2714,12 @@ msgstr "Een gesprek plannen/noteren"
 #. module: crm
 #: field:crm.lead,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Geplande kosten"
 
 #. module: crm
 #: help:crm.lead,date_deadline:0
 msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Verwachte datum waarop de opportuniteit kan worden gerealiseerd."
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -2698,7 +2783,7 @@ msgstr "Straat 2"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "Helpdesk en ondersteuning"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
@@ -2785,7 +2870,7 @@ msgstr "Gesprek noteren"
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
-msgstr ""
+msgstr "Hiermee kunt u activiteiten voor fondsenwerving beheren"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -2797,6 +2882,8 @@ msgstr "Telefoongesprek"
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
 msgstr ""
+"Telefoongesprekken die zijn toegewezen aan een van de verkoopteams onder "
+"mijn beheer"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2806,7 +2893,7 @@ msgstr "Creatiedatum"
 #. module: crm
 #: view:crm.lead:0
 msgid "at"
-msgstr ""
+msgstr "bij"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -2875,7 +2962,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne notities"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2895,7 +2982,7 @@ msgstr "Straat"
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Doorverwezen via"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2940,6 +3027,7 @@ msgstr "Verloren"
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
+"Gesloten/geannuleerde leads kunnen niet in een opportuniteit worden omgezet"
 
 #. module: crm
 #: view:crm.lead:0
@@ -4199,3 +4287,6 @@ msgstr ""
 
 #~ msgid "Recurrent"
 #~ msgstr "Recurrent"
+
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Voorwaardevelden"
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index e4d914ae56e..23dc97f2376 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2013-04-24 06:41+0000\n"
+"Last-Translator: viney <Unknown>\n"
 "Language-Team: \n"
 "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:07+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.plain_water
 msgid "Plain Water"
-msgstr "白开水"
+msgstr "纯净水"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poire_conference_product_template
@@ -2269,7 +2269,7 @@ msgstr "7月"
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_config_pos
 #: view:pos.session:0
 msgid "Point of Sales"
-msgstr ""
+msgstr "零售"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2303,7 +2303,7 @@ msgstr "打印数"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr "POS付款"
+msgstr "付款"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_50cl_product_template
@@ -2407,7 +2407,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr "POS收银条"
+msgstr "收银条"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index ec2307ca983..bfbaa5f0a6f 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -58,7 +58,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
             implied_group='product.group_product_variant',
             help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),
         'module_warning': fields.boolean("Allow configuring alerts by customer or products",
-            help="""Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer.
+            help="""Allow to configure notification on products and trigger them when a user wants to sell a given product or a given customer.
 Example: Product: this product is deprecated, do not purchase more than 5.
                 Supplier: don't forget to ask for an express delivery."""),
         'module_sale_margin': fields.boolean("Display margins on sales orders",

From ffa10eb55e6ad5ccfc2142ff334ea5e402714e0a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 23 May 2013 14:13:59 +0200
Subject: [PATCH 341/547] add missing po

bzr revid: mat@openerp.com-20130523121359-8ybm58szjyfxxm5b
---
 addons/auth_crypt/i18n/lt.po        | 28 ++++++++++++++++++
 addons/auth_oauth_signup/i18n/lt.po | 23 +++++++++++++++
 addons/contacts/i18n/lt.po          | 45 +++++++++++++++++++++++++++++
 addons/note_pad/i18n/lt.po          | 28 ++++++++++++++++++
 addons/pad_project/i18n/lt.po       | 39 +++++++++++++++++++++++++
 addons/plugin/i18n/lt.po            | 23 +++++++++++++++
 addons/portal_anonymous/i18n/lt.po  | 25 ++++++++++++++++
 addons/web_shortcuts/i18n/lt.po     | 25 ++++++++++++++++
 8 files changed, 236 insertions(+)
 create mode 100644 addons/auth_crypt/i18n/lt.po
 create mode 100644 addons/auth_oauth_signup/i18n/lt.po
 create mode 100644 addons/contacts/i18n/lt.po
 create mode 100644 addons/note_pad/i18n/lt.po
 create mode 100644 addons/pad_project/i18n/lt.po
 create mode 100644 addons/plugin/i18n/lt.po
 create mode 100644 addons/portal_anonymous/i18n/lt.po
 create mode 100644 addons/web_shortcuts/i18n/lt.po

diff --git a/addons/auth_crypt/i18n/lt.po b/addons/auth_crypt/i18n/lt.po
new file mode 100644
index 00000000000..03f0bd5249f
--- /dev/null
+++ b/addons/auth_crypt/i18n/lt.po
@@ -0,0 +1,28 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Užšifruotas slaptažodis"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
diff --git a/addons/auth_oauth_signup/i18n/lt.po b/addons/auth_oauth_signup/i18n/lt.po
new file mode 100644
index 00000000000..27fb83e6a4f
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/lt.po
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
diff --git a/addons/contacts/i18n/lt.po b/addons/contacts/i18n/lt.po
new file mode 100644
index 00000000000..f785a308009
--- /dev/null
+++ b/addons/contacts/i18n/lt.po
@@ -0,0 +1,45 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Spauskite, kad sukurtumėte kontaktą adresų knygoje.\n"
+"</p><p>\n"
+"OpenERP pagalba galima stebėti visus veiksmus susijusius su\n"
+"kontaktu; bendravimas, pardavimų galimybių istorija,\n"
+"dokumentai, ir t.t.\n"
+"</p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Kontaktai"
diff --git a/addons/note_pad/i18n/lt.po b/addons/note_pad/i18n/lt.po
new file mode 100644
index 00000000000..3c814e3f7eb
--- /dev/null
+++ b/addons/note_pad/i18n/lt.po
@@ -0,0 +1,28 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Užrašinė"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Nuorodą į užrašinę"
diff --git a/addons/pad_project/i18n/lt.po b/addons/pad_project/i18n/lt.po
new file mode 100644
index 00000000000..2f7340a36e2
--- /dev/null
+++ b/addons/pad_project/i18n/lt.po
@@ -0,0 +1,39 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Klaida! Užduotės pabaigos data negali būti ankstesnė nei pradžios data"
+
+#. module: pad_project
+#: field:project.task,description_pad:0
+msgid "Description PAD"
+msgstr ""
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Užduotis"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Klaida! Negalima sukurti rekursinių užduočių."
diff --git a/addons/plugin/i18n/lt.po b/addons/plugin/i18n/lt.po
new file mode 100644
index 00000000000..dc120cadcf2
--- /dev/null
+++ b/addons/plugin/i18n/lt.po
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/portal_anonymous/i18n/lt.po b/addons/portal_anonymous/i18n/lt.po
new file mode 100644
index 00000000000..60643c7f356
--- /dev/null
+++ b/addons/portal_anonymous/i18n/lt.po
@@ -0,0 +1,25 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Prisijungti"
diff --git a/addons/web_shortcuts/i18n/lt.po b/addons/web_shortcuts/i18n/lt.po
new file mode 100644
index 00000000000..70fc0a04b6c
--- /dev/null
+++ b/addons/web_shortcuts/i18n/lt.po
@@ -0,0 +1,25 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-24 18:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Pridėti / pašalinti trumpinį..."

From b605ff42426d0704d8e7f24737d99d7abc22ded9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 27 May 2013 11:18:15 +0200
Subject: [PATCH 342/547] [FIX] use path to lib justgage

bzr revid: mat@openerp.com-20130527091815-hvgwf8mxryus1a4a
---
 addons/gamification/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 34ee3e7189f..0143f266d35 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -56,7 +56,7 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
     'css': ['static/src/css/gamification.css'],
     'js': [
         'static/src/js/gamification.js',
-        'static/src/js/justgage.js',
+        'static/lib/justgage/justgage.js',
     ],
     'qweb': ['static/src/xml/gamification.xml'],
 }

From a51a1fe65ddf5b7d01d32d1db07d29a8ffa8d419 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 27 May 2013 11:37:38 +0200
Subject: [PATCH 343/547] [IMP] don't use new action manager for do_action

bzr revid: mat@openerp.com-20130527093738-2dp8uw5nli7xzahu
---
 addons/gamification/goal.py                       | 3 +--
 addons/gamification/static/src/js/gamification.js | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 924025da05c..2261f3a5490 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -389,8 +389,7 @@ class gamification_goal(osv.Model):
                         views = [(view_id, mode)]
                         break
                 action['views'] = views
-            # doesn't seem to work if not in popup
-            action['target'] = 'new'
+
             return action
 
         if goal.computation_mode == 'manually':
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 272fa109e78..8c9aff58775 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -29,8 +29,7 @@ openerp.gamification = function(instance) {
                     goal_action['action'] = res;
                 });
                 $.when(goal_action).done(function() {
-                    var action_manager = new instance.web.ActionManager(this);
-                    var action = action_manager.do_action(goal_action.action);
+                    var action = self.do_action(goal_action.action);
                     $.when(action).done(function () {
                         new instance.web.Model('gamification.goal').call('update', [[goal_id]]).then(function(res) {
                             self.get_goal_todo_info();
@@ -46,8 +45,7 @@ openerp.gamification = function(instance) {
                     plan_action['action'] = res;
                 });
                 $.when(plan_action).done(function() {
-                    var action_manager = new instance.web.ActionManager(this);
-                    action_manager.do_action(plan_action.action).done(function () {
+                    self.do_action(plan_action.action).done(function () {
                         self.get_goal_todo_info();
                     });
                 });

From 086e9dcfd5b09c2a9cac9e5f74a962108c2a31f3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 27 May 2013 11:40:42 +0200
Subject: [PATCH 344/547] [FIX] accept challenge parameter

bzr revid: mat@openerp.com-20130527094042-5jjz14m262fs2zo9
---
 addons/gamification/plan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 01471fe7238..0ae3dd36b2d 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -597,7 +597,7 @@ class gamification_goal_plan(osv.Model):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
         self.message_post(cr, uid, plan_ids, body=message, context=context)
-        self.write(cr, uid, plan_ids, {'proposed_user_ids': [(3, user_id)], 'user_id': [(4, user_id)]}, context=context)
+        self.write(cr, uid, plan_ids, {'proposed_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
         return self.generate_goals_from_plan(cr, uid, plan_ids, context=context)
 
     def discard_challenge(self, cr, uid, plan_ids, context=None, user_id=None):

From 1cdc9245e7fccff0e9bf5d83363a210c71445e3e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 27 May 2013 17:47:04 +0530
Subject: [PATCH 345/547] [IMP]Hr: Improve tooltip and labels

bzr revid: dbr@tinyerp.com-20130527121704-k7fyapvs0ogfdamx
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cc3813b7240..6ff0b2efc9a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help=" My Leave Requests and My Allocation Requests"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f4069ed70ab..4fd0c15202a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -186,7 +186,7 @@ class hr_applicant(base_stage, osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Application Name', size=128, required=True),
+        'name': fields.char('Subject / Application Name', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),

From f6fcf060204091ede6bd5a3b48624d5496a19edc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 27 May 2013 14:25:50 +0200
Subject: [PATCH 346/547] [IMP] better action for new users

bzr revid: mat@openerp.com-20130527122550-2lwjet1vnb69bdt4
---
 addons/gamification/goal_base_data.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index e2861bda863..77cf830335a 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -46,13 +46,12 @@
             <field name="res_id_field">company_id.id</field>
         </record>
 
-
         <record id="action_new_simplified_res_users" model="ir.actions.act_window">
-            <field name="name">New User</field>
+            <field name="name">Create User</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>
-            <field name="target">new</field>
+            <field name="target">current</field>
             <field name="view_id" ref="base.view_users_simple_form"/>
             <field name="context">{'default_groups_ref': ['base.group_user']}</field>
             <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>

From c7c84a8695b629aa4158721ac551375a94f833c9 Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <prajapatijitendra7969@gmail.com>
Date: Tue, 28 May 2013 11:13:39 +0530
Subject: [PATCH 347/547] [IMP]hr_recruitment: Improve code with active id and
 remove the extra field

bzr revid: prajapatijitendra7969@gmail.com-20130528054339-1dqdc6ytwu5nyi75
---
 addons/hr_recruitment/hr_recruitment.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 4fd0c15202a..364a4a851df 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -322,7 +322,6 @@ class hr_applicant(base_stage, osv.Model):
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {
-            'default_applicant_id':applicant.id,
             'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
             'default_user_id': uid,
             'default_name': applicant.name,
@@ -576,15 +575,11 @@ class applicant_category(osv.osv):
 
 class crm_meeting(osv.Model):
     _inherit = 'crm.meeting'
-    _columns = {
-    'applicant_id': fields.many2one ('hr.applicant', 'Recruitment')
-    }
 
     def create(self, cr, uid, vals, context=None):
         meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
         obj_meeting = self.browse(cr, uid, meeting_id, context=context)
-        if obj_meeting.applicant_id:
-            self.pool.get('hr.applicant').log_meeting(cr, uid, [obj_meeting.applicant_id.id] , obj_meeting.name, obj_meeting.date,obj_meeting.duration, context=context)
+        self.pool.get('hr.applicant').log_meeting(cr, uid, context.get('active_ids',[]), obj_meeting.name, obj_meeting.date, obj_meeting.duration, context=context)
         return meeting_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cf322c62acd67bef490d2d65cfde90085e648f00 Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <prajapatijitendra7969@gmail.com>
Date: Tue, 28 May 2013 12:00:31 +0530
Subject: [PATCH 348/547] [IMP]hr_holidays:Remove the extra space

bzr revid: prajapatijitendra7969@gmail.com-20130528063031-ad6gp45az42q9018
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6ff0b2efc9a..43c659847fc 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help=" My Leave Requests and My Allocation Requests"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests and My Allocation Requests"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>

From 86abcbf3bbc3ac597221c6af5a3d69933da090e5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 29 May 2013 13:08:28 +0530
Subject: [PATCH 349/547] [IMP]hr_recruitment: remove label from tree so .py
 code effect

bzr revid: dbr@tinyerp.com-20130529073828-a77uw29ijqpkw2ib
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 716c1cba8d5..c3757508b38 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,7 +42,7 @@
             <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
                 <field name="message_unread" invisible="1"/>
                 <field name="create_date"/>
-                <field name="name" string="Subject"/>
+                <field name="name"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="partner_phone"/>

From 28c8d47912ae918ab930af3f18d4e8040b9e6242 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 31 May 2013 14:26:38 +0200
Subject: [PATCH 350/547] [ADD] business description of module

bzr revid: mat@openerp.com-20130531122638-2h18azr1kcr929vq
---
 addons/gamification/html/index.html | 86 +++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 addons/gamification/html/index.html

diff --git a/addons/gamification/html/index.html b/addons/gamification/html/index.html
new file mode 100644
index 00000000000..890efa0d1ec
--- /dev/null
+++ b/addons/gamification/html/index.html
@@ -0,0 +1,86 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+        <h2 class="oe_slogan">Drive Engagement with Gamification</h2>
+        <h3 class="oe_slogan">Leverage natural desire for competition</h3>
+        <p class="oe_mt32">
+               Reinforce good habits and improve win rates with real-time recognition and rewards inspired by <a href="http://en.wikipedia.org/wiki/Gamification">game mechanics</a>. Align teams around clear business objectives with challenges, personal objectives and team leader boards.
+        </p>
+        <div class="oe_span4 oe_centered">
+            <h3>Leaderboards</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_01.png">
+            </div>
+            <p>
+               Promote leaders and competition amongst sales team with performance ratios.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Personnal Objectives</h3>
+            <div class="oe_row_img">
+                <img class="oe_picture" src="crm_game_02.png">
+            </div>
+            <p>
+                Assign clear goals to users to align them with the company objectives.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Visual Information</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_03.png">
+            </div>
+            <p>
+                See in an glance the progress of each user.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Create custom Challenges</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Use predefined goals to generate easily your own challenges. Assign it to a team or individual users. Receive feedback as often as needed: daily, weekly... Repeat it automatically to compare progresses through time.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Motivate with Badges</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_linkedin.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Inspire achievement with recognition of coworker's good work by rewarding badges. These can be deserved manually or upon completion of challenges. Add fun to the competition with rare badges.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Adapt to any module</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Create goals linked to any module. The evaluation system is very flexible and can be used for many different tasks : sales evaluation, creation of events, project completion or even helping new users to complete their profile.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_02.png">
+            </div>
+        </div>
+    </div>
+</section>

From 516d7fbb4330f9d937eaf458c82411b6e855b8bc Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 3 Jun 2013 18:09:20 +0530
Subject: [PATCH 351/547] [IMP]hr_recruit : Improve create method and Improve
 lfilter help as per suggest

bzr revid: dbr@tinyerp.com-20130603123920-6spa009pzvrhzxos
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 addons/hr_recruitment/hr_recruitment.py | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 43c659847fc..1d6d2227e84 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,7 +14,7 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests and My Allocation Requests"/>
+                    <filter string="My Requests" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests"/>
                     <separator/>
                     <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 364a4a851df..8fc104bf34f 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -577,9 +577,8 @@ class crm_meeting(osv.Model):
     _inherit = 'crm.meeting'
 
     def create(self, cr, uid, vals, context=None):
-        meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj_meeting = self.browse(cr, uid, meeting_id, context=context)
-        self.pool.get('hr.applicant').log_meeting(cr, uid, context.get('active_ids',[]), obj_meeting.name, obj_meeting.date, obj_meeting.duration, context=context)
-        return meeting_id
+        if 'active_ids' in context and 'active_model' in context and context['active_model'] == 'hr.applicant':
+            self.pool.get('hr.applicant').log_meeting(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
+        return super(crm_meeting, self).create(cr, uid, vals, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a8eb9301e4284bb575031befe2eee5a0dba3b152 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 3 Jun 2013 18:03:14 +0200
Subject: [PATCH 352/547] [REF] gamification: code review of badge.py

bzr revid: qdp-launchpad@openerp.com-20130603160314-zprlgye2rpd140pv
---
 addons/gamification/badge.py           | 168 ++++++++-----------------
 addons/hr_gamification/gamification.py |   5 +-
 2 files changed, 57 insertions(+), 116 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 2b681dca91e..fd63deceaf7 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -20,9 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-from openerp import tools
 from openerp.tools.translate import _
-from openerp.tools.safe_eval import safe_eval
 
 from templates import TemplateHelper
 from datetime import date
@@ -30,25 +28,22 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
-
 class gamification_badge_user(osv.Model):
     """User having received a badge"""
 
     _name = 'gamification.badge.user'
     _description = 'Gamification user badge'
+    _order = "create_date desc"
 
     _columns = {
         'user_id': fields.many2one('res.users', string="User", required=True),
         'badge_id': fields.many2one('gamification.badge', string='Badge', required=True),
         'comment': fields.text('Comment'),
-
         'badge_name': fields.related('badge_id', 'name', type="char", string="Badge Name"),
         'create_date': fields.datetime('Created', readonly=True),
-        'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
+        'create_uid': fields.many2one('res.users', 'Creator', readonly=True),
     }
 
-    _order = "create_date desc"
-
 
 class gamification_badge(osv.Model):
     """Badge object that users can send and receive"""
@@ -57,70 +52,50 @@ class gamification_badge(osv.Model):
     _description = 'Gamification badge'
     _inherit = ['mail.thread']
 
-    def _get_image(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
+
+    def _get_unique_global_list(self, cr, uid, ids, name, args, context=None):
+        """Return the list of unique res.users ids having received this badge"""
+        result = dict.fromkeys(ids, {'': False, '': False})
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = tools.image_get_resized_images(obj.image)
+            res = set()
+            for owner in obj.owner_ids:
+                res.add(owner.user_id.id)
+            res = list(res)
+            result[obj.id]['unique_owner_ids'] = res
+            result[obj.id]['stat_count_distinct'] = len(res)
         return result
 
+    #TODO: use multi attribute to compute all the functional fields in a row for global/monthly/user wise (or not) stats
     def _get_global_count(self, cr, uid, ids, name, args, context=None):
         """Return the number of time this badge has been granted"""
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
-                cr, uid, [('badge_id', '=', obj.id)], context=context))
             result[obj.id] = len(obj.owner_ids)
         return result
-
-    def _get_unique_global_list(self, cr, uid, ids, name, args, context=None):
-        """Return the list of unique res.users ids having received this badge"""
-        result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            res = self.pool.get('gamification.badge.user').read_group(
-                                   cr, uid, domain=[('badge_id', '=', obj.id)],
-                                   fields=['badge_id', 'user_id'],
-                                   groupby=['user_id'], context=context)
-            result[obj.id] = [badge_user['user_id'][0] for badge_user in res]
-        return result
-
-    def _get_unique_global_count(self, cr, uid, ids, name, args, context=None):
-        """Return the number of time this badge has been granted to individual users"""
-        result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            res = self.pool.get('gamification.badge.user').read_group(
-                                   cr, uid, domain=[('badge_id', '=', obj.id)],
-                                   fields=['badge_id', 'user_id'],
-                                   groupby=['user_id'], context=context)
-            result[obj.id] = len(res)
-        return result
-
     def _get_month_count(self, cr, uid, ids, name, args, context=None):
         """Return the number of time this badge has been granted this month"""
+        badge_user_obj = self.pool.get('gamification.badge.user')
         result = dict.fromkeys(ids, False)
-        first_month_day = date.today().replace(day=1).isoformat()
+        first_month_day = date.today().replace(day=1).isoformat()#TODO: this isn't good. Must use DEFAULT_SERVER_DATE_FORMAT
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
-                cr, uid, [('badge_id', '=', obj.id),
-                          ('create_date', '>=', first_month_day)], context=context))
+            result[obj.id] = badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_date', '>=', first_month_day)], context=context, count=True)
         return result
 
     def _get_global_my_count(self, cr, uid, ids, name, args, context=None):
         """Return the number of time this badge has been granted to the current user"""
+        badge_user_obj = self.pool.get('gamification.badge.user')
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
-                    cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)],
-                    context=context))
+            result[obj.id] = badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)], context=context, count=True)
         return result
 
     def _get_month_my_count(self, cr, uid, ids, name, args, context=None):
         """Return the number of time this badge has been granted to the current user this month"""
+        badge_user_obj = self.pool.get('gamification.badge.user')
         result = dict.fromkeys(ids, False)
-        first_month_day = date.today().replace(day=1).isoformat()
+        first_month_day = date.today().replace(day=1).isoformat()#TODO: this isn't good. Must use DEFAULT_SERVER_DATE_FORMAT
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
-                cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid),
-                          ('create_date', '>=', first_month_day)], context=context))
+            result[obj.id] = badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True)
         return result
 
     def _get_month_my_sent(self, cr, uid, ids, name, args, context=None):
@@ -142,20 +117,20 @@ class gamification_badge(osv.Model):
         """
         result = dict.fromkeys(ids, False)
         for badge in self.browse(cr, uid, ids, context=context):
-            if self.can_grant_badge(cr, uid, uid, badge.id, context) != 1:
+            if self._can_grant_badge(cr, uid, uid, badge.id, context) != 1:
+                #if the user cannot grant this badge at all, result is 0
                 result[badge.id] = 0
             elif not badge.rule_max:
+                #if there is no limitation, -1 is returned which mean 'infinite'
                 result[badge.id] = -1
             else:
                 result[badge.id] = badge.rule_max_number - badge.stat_my_monthly_sending
-
         return result
 
     _columns = {
         'name': fields.char('Badge', required=True, translate=True),
         'description': fields.text('Description'),
-        'image': fields.binary("Image",
-            help="This field holds the image used for the badge, limited to 256x256"),
+        'image': fields.binary("Image", help="This field holds the image used for the badge, limited to 256x256"),
         # image_select: selection with a on_change to fill image with predefined picts
         'rule_auth': fields.selection([
                 ('everyone', 'Everyone'),
@@ -163,7 +138,7 @@ class gamification_badge(osv.Model):
                 ('having', 'People having some badges'),
                 ('nobody', 'No one, assigned through challenges'),
             ],
-            string="Allowed to Grant",
+            string="Allowance to Grant",
             help="Who can grant this badge",
             required=True),
         'rule_auth_user_ids': fields.many2many('res.users', 'rel_badge_auth_users',
@@ -186,10 +161,8 @@ class gamification_badge(osv.Model):
             string='Remaining Sending Allowed', help="If a maxium is set"),
 
         'plan_ids': fields.one2many('gamification.goal.plan', 'reward_id',
-            string="Reward for Challenges"),
+            string="Reward of Challenges"),
 
-        'compute_code': fields.char('Compute Code',
-            help="The name of the python method that will be executed to verify if a user can receive this badge."),
         'goal_type_ids': fields.many2many('gamification.goal.type',
             string='Goals Linked',
             help="The users that have succeeded theses goals will receive automatically the badge."),
@@ -199,15 +172,17 @@ class gamification_badge(osv.Model):
         'unique_owner_ids': fields.function(_get_unique_global_list,
             string='Unique Owners',
             help="The list of unique users having received this badge.",
+            multi='unique_users',
             type="many2many", relation="res.users"),
 
         'stat_count': fields.function(_get_global_count, string='Total',
             type="integer",
             help="The number of time this badge has been received."),
-        'stat_count_distinct': fields.function(_get_unique_global_count,
+        'stat_count_distinct': fields.function(_get_unique_global_list,
             type="integer",
             string='Number of users',
-            help="The number of time this badge has been received by individual users."),
+            multi='unique_users',
+            help="The number of time this badge has been received by unique users."),
         'stat_this_month': fields.function(_get_month_count,
             type="integer",
             string='Monthly total',
@@ -226,10 +201,9 @@ class gamification_badge(osv.Model):
         'stat_count_distinct': 0,
         'stat_this_month': 0,
         'rule_auth': 'everyone',
-        'compute_code': "self.nobody(cr, uid, context)"
     }
 
-    def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=None, context=None):
+    def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=False, context=None):
         """Send a notification to a user for receiving a badge
 
         Does NOT verify constrains on badge granting.
@@ -237,36 +211,22 @@ class gamification_badge(osv.Model):
         The stats counters are incremented
         :param badge_id: id of the badge to deserve
         :param badge_user_ids: list(int) of badge users that will receive the badge
-        :param user_from: res.users object that has sent the badge
+        :param user_from: optional id of the res.users object that has sent the badge
         """
-        context = context or {}
         badge = self.browse(cr, uid, badge_id, context=context)
         template_env = TemplateHelper()
 
         res = None
         for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context=context):
-            values = {'badge_user': badge_user}
-
-            if user_from:
-                values['user_from'] = user_from
-            else:
-                values['user_from'] = False
+            values = {'badge_user': badge_user, 'user_from': user_from}
             body_html = template_env.get_template('badge_received.mako').render(values)
-            context['badge_user'] = badge_user
-
-            res = self.message_post(cr, uid, badge.id,
-                                    body=body_html,
-                                    type='comment',
-                                    subtype='mt_comment',
-                                    context=context)
-
+            res = self.message_post(cr, uid, badge.id, body=body_html, type='comment', subtype='mt_comment', context=context)
         return res
 
     def check_granting(self, cr, uid, user_from_id, badge_id, context=None):
-        """Check the user can grant a badge and raise the appropriate exception
+        """Check the user 'user_from_id' can grant the badge 'badge_id' and raise the appropriate exception
         if not"""
-        context = context or {}
-        status_code = self.can_grant_badge(cr, uid, user_from_id, badge_id, context)
+        status_code = self._can_grant_badge(cr, uid, user_from_id, badge_id, context=context)
         if status_code == 1:
             return True
         elif status_code == 2:
@@ -281,7 +241,7 @@ class gamification_badge(osv.Model):
             _logger.exception("Unknown badge status code: %d" % int(status_code))
         return False
 
-    def can_grant_badge(self, cr, uid, user_from_id, badge_id, context=None):
+    def _can_grant_badge(self, cr, uid, user_from_id, badge_id, context=None):
         """Check if a user can grant a badge to another user
 
         :param user_from_id: the id of the res.users trying to send the badge
@@ -293,75 +253,57 @@ class gamification_badge(osv.Model):
             4: don't have the required badges
             5: user's monthly limit reached
         """
-        context = context or {}
         badge = self.browse(cr, uid, badge_id, context=context)
 
         if badge.rule_auth == 'nobody':
             return 2
 
-        elif badge.rule_auth == 'users':
-            if user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
-                return 3
+        elif badge.rule_auth == 'users' and user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
+            return 3
 
         elif badge.rule_auth == 'having':
-            badge_users = self.pool.get('gamification.badge.user').search(
-                cr, uid, [('user_id', '=', user_from_id)], context=context)
-
-            if len(badge_users) == 0:
-                # the user_from has no badges
-                return 4
-
-            owners = [owner.id for owner in badge.owner_ids]
-            granted = False
-            for badge_user in badge_users:
-                if badge_user in owners:
-                    granted = True
-                    break
-            if not granted:
-                return 4
-
-        # else badge.rule_auth == 'everyone' -> no check
+            all_user_badges = self.pool.get('gamification.badge.user').search(cr, uid, [('user_id', '=', user_from_id)], context=context)
+            for required_badge in badge.rule_auth_badge_ids:
+                if required_badge.id not in all_user_badges:
+                    return 4
 
         if badge.rule_max and badge.stat_my_monthly_sending >= badge.rule_max_number:
-            # sent the maximum number of time this month
             return 5
 
+        # badge.rule_auth == 'everyone' -> no check
         return 1
 
 
 class grant_badge_wizard(osv.TransientModel):
+    """ Wizard allowing to grant a badge to a user"""
+
     _name = 'gamification.badge.user.wizard'
     _columns = {
         'user_id': fields.many2one("res.users", string='User', required=True),
-        'badge_id': fields.many2one("gamification.badge", string='Badge',  required=True),
+        'badge_id': fields.many2one("gamification.badge", string='Badge', required=True),
         'comment': fields.text('Comment'),
     }
 
     def action_grant_badge(self, cr, uid, ids, context=None):
         """Wizard action for sending a badge to a chosen user"""
-        if context is None:
-            context = {}
 
         badge_obj = self.pool.get('gamification.badge')
         badge_user_obj = self.pool.get('gamification.badge.user')
 
         for wiz in self.browse(cr, uid, ids, context=context):
             if uid == wiz.user_id.id:
-                raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
+                raise osv.except_osv(_('Warning!'), _('You can not grant a badge to yourself'))
 
-            if badge_obj.check_granting(cr, uid,
-                                         user_from_id=uid,
-                                         badge_id=wiz.badge_id.id,
-                                         context=context):
+            #check if the badge granting is legitimate
+            if badge_obj.check_granting(cr, uid, user_from_id=uid, badge_id=wiz.badge_id.id, context=context):
+                #create the badge
                 values = {
                     'user_id': wiz.user_id.id,
                     'badge_id': wiz.badge_id.id,
                     'comment': wiz.comment,
                 }
                 badge_user = badge_user_obj.create(cr, uid, values, context=context)
+                #notify the user
+                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
 
-                user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-
-                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
-
-        return {}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/gamification.py
index bbda1e23ab1..ea86ba3b779 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/gamification.py
@@ -106,7 +106,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
             if uid == wiz.user_id.id:
                 raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
 
-            if badge_obj.can_grant_badge(cr, uid,
+            if badge_obj._can_grant_badge(cr, uid,
                                          user_from_id=uid,
                                          badge_id=wiz.badge_id.id,
                                          context=context):
@@ -119,9 +119,8 @@ class hr_grant_badge_wizard(osv.TransientModel):
                 }
                 badge_user = badge_user_obj.create(cr, uid, values, context=context)
 
-                user_from = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 
-                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=user_from, context=context)
+                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
 
         return {}
 

From 3887f78cef37b681ad67cd0cc96477c7b1e3ecd8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 3 Jun 2013 22:30:53 +0200
Subject: [PATCH 353/547] [REF] gamification: code review (WIP)

bzr revid: qdp-launchpad@openerp.com-20130603203053-dy7ia09rl0i1sxmd
---
 addons/gamification/doc/goal.rst              |  4 +-
 addons/gamification/goal.py                   | 80 +++++++------------
 addons/gamification/goal_type_data.py         |  4 +-
 addons/gamification/goal_view.xml             |  2 +-
 addons/gamification/plan.py                   |  2 +-
 addons/gamification/res_users.py              |  4 +-
 .../static/src/xml/gamification.xml           |  8 +-
 7 files changed, 39 insertions(+), 65 deletions(-)

diff --git a/addons/gamification/doc/goal.rst b/addons/gamification/doc/goal.rst
index bdb5f71a253..e315931462f 100644
--- a/addons/gamification/doc/goal.rst
+++ b/addons/gamification/doc/goal.rst
@@ -33,7 +33,7 @@ Fields
  - ``last_update`` : the date of the last modification of this goal
  - ``computation_mode`` : related field from the linked goal type
  - ``type_description`` : related field from the linked goal type
- - ``type_unit`` : related field from the linked goal type
+ - ``type_suffix`` : related field from the linked goal type
  - ``type_condition`` : related field from the linked goal type
 
 
@@ -43,4 +43,4 @@ Methods
  - ``update`` :
    Compute the current value of goal and change states accordingly and send reminder if needed.
  - ``get_action`` :
-   Returns the action description specified for the goal modification. If an action XML ID is specified in the goal type definition it will be used. If a goal is manual, the action is a simple wizard to input a new value.
\ No newline at end of file
+   Returns the action description specified for the goal modification. If an action XML ID is specified in the goal type definition it will be used. If a goal is manual, the action is a simple wizard to input a new value.
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 2261f3a5490..561cd7a5807 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -41,17 +41,18 @@ class gamification_goal_type(osv.Model):
     """
     _name = 'gamification.goal.type'
     _description = 'Gamification goal type'
+    _order = 'sequence'
 
     def _get_suffix(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict.fromkeys(ids, 0)
-        for goal in self.browse(cr, uid, ids, context):
-            if goal.unit and not goal.monetary:
-                res[goal.id] = goal.unit
+        res = dict.fromkeys(ids, '')
+        for goal in self.browse(cr, uid, ids, context=context):
+            if goal.suffix and not goal.monetary:
+                res[goal.id] = goal.suffix
             elif goal.monetary:
                 # use the current user's company currency
                 user = self.pool.get('res.users').browse(cr, uid, uid, context)
-                if goal.unit:
-                    res[goal.id] = "%s %s" % (user.company_id.currency_id.symbol, goal.unit)
+                if goal.suffix:
+                    res[goal.id] = "%s %s" % (user.company_id.currency_id.symbol, goal.suffix)
                 else:
                     res[goal.id] = user.company_id.currency_id.symbol
             else:
@@ -61,13 +62,9 @@ class gamification_goal_type(osv.Model):
     _columns = {
         'name': fields.char('Goal Type', required=True, translate=True),
         'description': fields.text('Goal Description'),
-
         'monetary': fields.boolean('Monetary Value', help="The target and current value are defined in the company currency."),
-        'unit': fields.char('Suffix',
-            help="The unit of the target and current values", translate=True),
-        'full_suffix': fields.function(_get_suffix, type="char",
-            string="Full Suffix", help="The currency and suffix field"),
-
+        'suffix': fields.char('Suffix', help="The unit of the target and current values", translate=True),
+        'full_suffix': fields.function(_get_suffix, type="char", string="Full Suffix", help="The currency and suffix field"),
         'computation_mode': fields.selection([
                 ('manually', 'Recorded manually'),
                 ('count', 'Automatic: number of records'),
@@ -75,13 +72,12 @@ class gamification_goal_type(osv.Model):
                 ('python', 'Automatic: execute a specific Python code'),
             ],
             string="Computation Mode",
-            required=True),
+            required=True), #TODO: add help tooltip
         'display_mode': fields.selection([
                 ('progress', 'Progressive (using numerical values)'),
                 ('checkbox', 'Checkbox (done or not-done)'),
             ],
             string="Displayed as", required=True),
-
         'model_id': fields.many2one('ir.model',
             string='Model',
             help='The model object for the field to evaluate'),
@@ -96,7 +92,6 @@ class gamification_goal_type(osv.Model):
             required=True),
         'compute_code': fields.char('Compute Code',
             help="The name of the python method that will be executed to compute the current value. See the file gamification/goal_type_data.py for examples."),
-
         'condition': fields.selection([
                 ('higher', 'The higher the better'),
                 ('lower', 'The lower the better')
@@ -104,18 +99,13 @@ class gamification_goal_type(osv.Model):
             string='Goal Performance',
             help='A goal is considered as completed when the current value is compared to the value to reach',
             required=True),
-        'sequence': fields.integer('Sequence',
-            help='Sequence number for ordering',
-            required=True),
-
-        'action_id': fields.many2one('ir.actions.act_window',
-            string="Action",
+        'sequence': fields.integer('Sequence', help='Sequence number for ordering', required=True),
+        'action_id': fields.many2one('ir.actions.act_window', string="Action",
             help="The action that will be called to update the goal value."),
         'res_id_field': fields.char("ID Field of user",
             help="The field name on the user profile (res.users) containing the value for res_id for action.")
     }
 
-    _order = 'sequence'
     _defaults = {
         'sequence': 1,
         'condition': 'higher',
@@ -137,19 +127,13 @@ class gamification_goal(osv.Model):
 
     def _get_completeness(self, cr, uid, ids, field_name, arg, context=None):
         """Return the percentage of completeness of the goal, between 0 and 100"""
-        res = {}
-        for goal in self.browse(cr, uid, ids, context):
-            if goal.type_condition == 'higher':
-                if goal.current > 0:
-                    res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
-                else:
-                    res[goal.id] = 0.0
-            else:
+        res = dict.fromkeys(ids, 0.0)
+        for goal in self.browse(cr, uid, ids, context=context):
+            if goal.type_condition == 'higher' and goal.current > 0:
+                res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
+            elif goal.current < goal.target_goal:
                 # a goal 'lower than' has only two values possible: 0 or 100%
-                if goal.current < goal.target_goal:
-                    res[goal.id] = 100.0
-                else:
-                    res[goal.id] = 0.0
+                res[goal.id] = 100.0
         return res
 
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
@@ -157,8 +141,7 @@ class gamification_goal(osv.Model):
         if not type_id:
             return {'value': {'type_id': False}}
         goal_type = goal_type.browse(cr, uid, type_id, context=context)
-        ret = {'value': {'computation_mode': goal_type.computation_mode, 'type_condition': goal_type.condition}}
-        return ret
+        return {'value': {'computation_mode': goal_type.computation_mode, 'type_condition': goal_type.condition}}
 
     _columns = {
         'type_id': fields.many2one('gamification.goal.type',
@@ -166,7 +149,7 @@ class gamification_goal(osv.Model):
             required=True,
             ondelete="cascade"),
         'user_id': fields.many2one('res.users', string='User', required=True),
-        'planline_id' : fields.many2one('gamification.goal.planline',
+        'planline_id': fields.many2one('gamification.goal.planline',
             string='Goal Planline',
             ondelete="cascade"),
         'plan_id': fields.related('planline_id', 'plan_id',
@@ -207,7 +190,7 @@ class gamification_goal(osv.Model):
 
         'type_description': fields.related('type_id', 'description',
             type='char', string='Type Description', readonly=True),
-        'type_unit': fields.related('type_id', 'unit',
+        'type_suffix': fields.related('type_id', 'suffix',
             type='char', string='Type Description', readonly=True),
         'type_condition': fields.related('type_id', 'condition',
             type='char', string='Type Condition', readonly=True),
@@ -224,6 +207,7 @@ class gamification_goal(osv.Model):
     }
     _order = 'create_date desc, end_date desc, type_id, id'
 
+#TODO code review of this method
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
 
@@ -232,7 +216,6 @@ class gamification_goal(osv.Model):
         If a goal reaches the target value, the status is set to reached
         If the end date is passed (at least +1 day, time not considered) without
         the target value being reached, the goal is set as failed."""
-        if context is None: context = {}
 
         for goal in self.browse(cr, uid, ids, context=context):
             if goal.state in ('draft', 'canceled'):
@@ -250,12 +233,8 @@ class gamification_goal(osv.Model):
 
                         # generate a remind report
                         template_env = TemplateHelper()
-                        body_html = template_env.get_template('reminder.mako').render({'object':goal})
-                        self.message_post(cr, uid, goal.id,
-                            body=body_html,
-                            partner_ids=[goal.user_id.partner_id.id],
-                            context=context,
-                            subtype='mail.mt_comment')
+                        body_html = template_env.get_template('reminder.mako').render({'object': goal})
+                        self.message_post(cr, uid, goal.id, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
 
             elif goal.type_id.computation_mode == 'python':
                 values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.type')}
@@ -294,10 +273,7 @@ class gamification_goal(osv.Model):
                     towrite = {'current': len(res)}
 
             # check goal target reached
-            if (goal.type_id.condition == 'higher' \
-                and towrite['current'] >= goal.target_goal) \
-            or (goal.type_id.condition == 'lower' \
-                and towrite['current'] <= goal.target_goal):
+            if (goal.type_id.condition == 'higher' and towrite['current'] >= goal.target_goal) or (goal.type_id.condition == 'lower' and towrite['current'] <= goal.target_goal):
                 towrite['state'] = 'reached'
 
             # check goal failure
@@ -418,19 +394,18 @@ class gamification_goal(osv.Model):
         values = {'state': 'reached', 'current': 1}
         self.write(cr, uid, goal_ids, values, context=context)
 
+#TOCHECK: it's totally unclear for me what the 'current' and the update method...
 
 class goal_manual_wizard(osv.TransientModel):
     """Wizard type to update a manual goal"""
     _name = 'gamification.goal.wizard'
     _columns = {
-        'goal_id': fields.many2one("gamification.goal", string='Goal'),
+        'goal_id': fields.many2one("gamification.goal", string='Goal', required=True),
         'current': fields.float('Current'),
     }
 
     def action_update_current(self, cr, uid, ids, context=None):
         """Wizard action for updating the current value"""
-        if context is None:
-            context = {}
 
         goal_obj = self.pool.get('gamification.goal')
 
@@ -442,3 +417,4 @@ class goal_manual_wizard(osv.TransientModel):
             goal_obj.write(cr, uid, [wiz.goal_id.id], towrite, context=context)
             goal_obj.update(cr, uid, [wiz.goal_id.id], context=context)
         return {}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/goal_type_data.py
index 6a04d39fdd3..944ca4fe92e 100644
--- a/addons/gamification/goal_type_data.py
+++ b/addons/gamification/goal_type_data.py
@@ -35,8 +35,6 @@ class gamification_goal_type_data(osv.Model):
 
         The model specified in 'xml_id' must inherit from mail.thread
         """
-        if context is None: context = {}
         ref_obj = self.pool.get(xml_id)
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        count = ref_obj.search(cr, uid, [('message_follower_ids', '=', user.partner_id.id)], count=True, context=context)
-        return count
+        return ref_obj.search(cr, uid, [('message_follower_ids', '=', user.partner_id.id)], count=True, context=context)
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 073cbd69867..d1da5f027d1 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -250,7 +250,7 @@
                             </group>
                             <group string="Formating Options">
                                 <field name="display_mode" widget="radio" />
-                                <field name="unit" placeholder="e.g. days"/>
+                                <field name="suffix" placeholder="e.g. days"/>
                                 <field name="monetary"/>
                             </group>
                             <group string="Clickable Goals">
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 0ae3dd36b2d..2541d9e500b 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -791,7 +791,7 @@ class gamification_goal_planline(osv.Model):
                 }),
         'type_condition': fields.related('type_id', 'condition', type="selection",
             readonly=True, string="Condition", selection=[('lower', '<='), ('higher', '>=')]),
-        'type_unit': fields.related('type_id', 'unit', type="char", readonly=True, string="Unit"),
+        'type_suffix': fields.related('type_id', 'suffix', type="char", readonly=True, string="Unit"),
         'type_monetary': fields.related('type_id', 'monetary', type="boolean", readonly=True, string="Monetary"),
         'type_full_suffix': fields.related('type_id', 'full_suffix', type="char", readonly=True, string="Suffix"),
     }
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 18034880d68..1798282119c 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -56,7 +56,7 @@ class res_users_gamification_group(osv.Model):
                             'type_condition': planline_board['goal_type'].condition,
                             'type_computation_mode': planline_board['goal_type'].computation_mode,
                             'type_monetary': planline_board['goal_type'].monetary,
-                            'type_unit': planline_board['goal_type'].unit,
+                            'type_suffix': planline_board['goal_type'].suffix,
                             'type_action': True if planline_board['goal_type'].action_id else False,
                             'type_display': planline_board['goal_type'].display_mode,
                             'target_goal': planline_board['target_goal'],
@@ -95,7 +95,7 @@ class res_users_gamification_group(osv.Model):
                         'type_description': goal.type_description,
                         'type_condition': goal.type_id.condition,
                         'type_monetary': goal.type_id.monetary,
-                        'type_unit': goal.type_id.unit,
+                        'type_suffix': goal.type_id.suffix,
                         'type_action': True if goal.type_id.action_id else False,
                         'type_display': goal.type_id.display_mode,
                         'state': goal.state,
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 8aa577bb4fe..9f6bc1c81e9 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -34,7 +34,7 @@
                                             Target: &lt;=
                                         </t>
                                         <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                        <t t-if="goal.type_suffix"><t t-esc="goal.type_suffix"/></t>
                                     </div>
                                 </t>
                             </div>
@@ -55,7 +55,7 @@
                                 <t t-if="planline.type_condition == 'lower'">
                                     Target: &lt;=
                                 </t>
-                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
                             </div>
                         </div>
                     </div>
@@ -73,11 +73,11 @@
                                         <!-- progress, action on current value -->
                                         <t t-esc="goal.user_name"/><br/>
                                         <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
-                                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
                                         </t>
                                         <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
                                             <a class="oe_goal_action" t-att-id="planline.own_goal_id">
-                                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
                                             </a>
                                         </t>
                                     </t>

From f48f396096abdc5f13f2256d2ddec2669703340a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 5 Jun 2013 13:33:39 +0200
Subject: [PATCH 354/547] [FIX] gamification: correct function calls with multi

bzr revid: mat@openerp.com-20130605113339-6tiytkoeebd5s89w
---
 addons/gamification/badge.py | 88 ++++++++++++++----------------------
 1 file changed, 34 insertions(+), 54 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index fd63deceaf7..53e7eb84b05 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
 
 from templates import TemplateHelper
@@ -52,60 +53,37 @@ class gamification_badge(osv.Model):
     _description = 'Gamification badge'
     _inherit = ['mail.thread']
 
-
-    def _get_unique_global_list(self, cr, uid, ids, name, args, context=None):
-        """Return the list of unique res.users ids having received this badge"""
-        result = dict.fromkeys(ids, {'': False, '': False})
+    def _get_owners_info(self, cr, uid, ids, name, args, context=None):
+        """Return:
+            the list of unique res.users ids having received this badge
+            the total number of time this badge was granted
+            the total number of users this badge was granted to
+        """
+        result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
             res = set()
             for owner in obj.owner_ids:
                 res.add(owner.user_id.id)
             res = list(res)
-            result[obj.id]['unique_owner_ids'] = res
-            result[obj.id]['stat_count_distinct'] = len(res)
+            result[obj.id] = {
+                'unique_owner_ids': res,
+                'stat_count': len(obj.owner_ids),
+                'stat_count_distinct': len(res)
+            }
         return result
 
-    #TODO: use multi attribute to compute all the functional fields in a row for global/monthly/user wise (or not) stats
-    def _get_global_count(self, cr, uid, ids, name, args, context=None):
-        """Return the number of time this badge has been granted"""
+    def _get_badge_user_stats(self, cr, uid, ids, name, args, context=None):
+        """Return stats related to badge users"""
         result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = len(obj.owner_ids)
-        return result
-    def _get_month_count(self, cr, uid, ids, name, args, context=None):
-        """Return the number of time this badge has been granted this month"""
         badge_user_obj = self.pool.get('gamification.badge.user')
-        result = dict.fromkeys(ids, False)
-        first_month_day = date.today().replace(day=1).isoformat()#TODO: this isn't good. Must use DEFAULT_SERVER_DATE_FORMAT
+        first_month_day = date.today().replace(day=1).strftime(DF)
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_date', '>=', first_month_day)], context=context, count=True)
-        return result
-
-    def _get_global_my_count(self, cr, uid, ids, name, args, context=None):
-        """Return the number of time this badge has been granted to the current user"""
-        badge_user_obj = self.pool.get('gamification.badge.user')
-        result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)], context=context, count=True)
-        return result
-
-    def _get_month_my_count(self, cr, uid, ids, name, args, context=None):
-        """Return the number of time this badge has been granted to the current user this month"""
-        badge_user_obj = self.pool.get('gamification.badge.user')
-        result = dict.fromkeys(ids, False)
-        first_month_day = date.today().replace(day=1).isoformat()#TODO: this isn't good. Must use DEFAULT_SERVER_DATE_FORMAT
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True)
-        return result
-
-    def _get_month_my_sent(self, cr, uid, ids, name, args, context=None):
-        """Return the number of time this badge has been granted to the current user this month"""
-        result = dict.fromkeys(ids, False)
-        first_month_day = date.today().replace(day=1).isoformat()
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = len(self.pool.get('gamification.badge.user').search(
-                cr, uid, [('badge_id', '=', obj.id), ('create_uid', '=', uid),
-                          ('create_date', '>=', first_month_day)], context=context))
+            result[obj.id] = {
+                'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)], context=context, count=True),
+                'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_date', '>=', first_month_day)], context=context, count=True),
+                'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True),
+                'stat_my_monthly_sending': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_uid', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True)
+            }
         return result
 
     def _remaining_sending_calc(self, cr, uid, ids, name, args, context=None):
@@ -153,9 +131,10 @@ class gamification_badge(osv.Model):
             help="Check to set a monthly limit per person of sending this badge"),
         'rule_max_number': fields.integer('Limitation Number',
             help="The maximum number of time this badge can be sent per month per person."),
-        'stat_my_monthly_sending': fields.function(_get_month_my_sent,
+        'stat_my_monthly_sending': fields.function(_get_badge_user_stats,
             type="integer",
             string='My Monthly Sending Total',
+            multi='badge_users',
             help="The number of time the current user has sent this badge this month."),
         'remaining_sending': fields.function(_remaining_sending_calc, type='integer',
             string='Remaining Sending Allowed', help="If a maxium is set"),
@@ -169,37 +148,38 @@ class gamification_badge(osv.Model):
 
         'owner_ids': fields.one2many('gamification.badge.user', 'badge_id',
             string='Owners', help='The list of instances of this badge granted to users'),
-        'unique_owner_ids': fields.function(_get_unique_global_list,
+        'unique_owner_ids': fields.function(_get_owners_info,
             string='Unique Owners',
             help="The list of unique users having received this badge.",
             multi='unique_users',
             type="many2many", relation="res.users"),
 
-        'stat_count': fields.function(_get_global_count, string='Total',
+        'stat_count': fields.function(_get_owners_info, string='Total',
             type="integer",
+            multi='unique_users',
             help="The number of time this badge has been received."),
-        'stat_count_distinct': fields.function(_get_unique_global_list,
+        'stat_count_distinct': fields.function(_get_owners_info,
             type="integer",
             string='Number of users',
             multi='unique_users',
             help="The number of time this badge has been received by unique users."),
-        'stat_this_month': fields.function(_get_month_count,
+        'stat_this_month': fields.function(_get_badge_user_stats,
             type="integer",
             string='Monthly total',
+            multi='badge_users',
             help="The number of time this badge has been received this month."),
-        'stat_my': fields.function(_get_global_my_count, string='My Total',
+        'stat_my': fields.function(_get_badge_user_stats, string='My Total',
             type="integer",
+            multi='badge_users',
             help="The number of time the current user has received this badge."),
-        'stat_my_this_month': fields.function(_get_month_my_count,
+        'stat_my_this_month': fields.function(_get_badge_user_stats,
             type="integer",
             string='My Monthly Total',
+            multi='badge_users',
             help="The number of time the current user has received this badge this month."),
     }
 
     _defaults = {
-        'stat_count': 0,
-        'stat_count_distinct': 0,
-        'stat_this_month': 0,
         'rule_auth': 'everyone',
     }
 

From dceeb97c5f26d9c012c25c579eed7a58ab446f75 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 6 Jun 2013 10:39:28 +0200
Subject: [PATCH 355/547] [IMP] gamification: add tooltip and explain update
 method

bzr revid: mat@openerp.com-20130606083928-k00b7ydioi3ed5ra
---
 addons/gamification/goal.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 561cd7a5807..a511b2d5bcc 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -72,7 +72,8 @@ class gamification_goal_type(osv.Model):
                 ('python', 'Automatic: execute a specific Python code'),
             ],
             string="Computation Mode",
-            required=True), #TODO: add help tooltip
+            help="Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'.",
+            required=True),
         'display_mode': fields.selection([
                 ('progress', 'Progressive (using numerical values)'),
                 ('checkbox', 'Checkbox (done or not-done)'),
@@ -223,8 +224,8 @@ class gamification_goal(osv.Model):
                 continue
 
             if goal.type_id.computation_mode == 'manually':
+                # no comoutation for manual goals, only check for reminders
                 towrite = {'current': goal.current}
-                # check for remind to update
                 if goal.remind_update_delay and goal.last_update:
                     delta_max = timedelta(days=goal.remind_update_delay)
                     last_update = datetime.strptime(goal.last_update, '%Y-%m-%d').date()
@@ -237,6 +238,7 @@ class gamification_goal(osv.Model):
                         self.message_post(cr, uid, goal.id, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
 
             elif goal.type_id.computation_mode == 'python':
+                # execute the chosen method
                 values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.type')}
                 result = safe_eval(goal.type_id.compute_code, values, {})
 
@@ -251,6 +253,7 @@ class gamification_goal(osv.Model):
                 obj = self.pool.get(goal.type_id.model_id.model)
                 field_date_name = goal.type_id.field_date_id.name
 
+                # eval the domain with user_id replaced by goal user
                 domain = safe_eval(goal.type_id.domain,
                                    {'user_id': goal.user_id.id})
                 if goal.start_date and field_date_name:

From 24c879ffd5f8e59552c5efa31933cdb68e7df2f7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 4 Jun 2013 20:37:39 +0200
Subject: [PATCH 356/547] [REF] gamificiation: code review. WIP going on

bzr revid: qdp-launchpad@openerp.com-20130604183739-uskl2x369w8hydhr
---
 addons/gamification/goal.py            | 94 ++++++++++++--------------
 addons/gamification/goal_base_data.xml |  2 +-
 addons/gamification/goal_type_data.py  |  1 +
 addons/gamification/res_users.py       | 11 +--
 addons/gamification/templates.py       | 10 ++-
 5 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index a511b2d5bcc..896b476f158 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -145,14 +145,11 @@ class gamification_goal(osv.Model):
         return {'value': {'computation_mode': goal_type.computation_mode, 'type_condition': goal_type.condition}}
 
     _columns = {
-        'type_id': fields.many2one('gamification.goal.type',
-            string='Goal Type',
-            required=True,
-            ondelete="cascade"),
+        'type_id': fields.many2one('gamification.goal.type', string='Goal Type', required=True, ondelete="cascade"),
+        #TODO: add some tooltip/grey label in view to explain that people can use 'user_id' in their domain
+        #TODO: actually it would be better to use 'user.id' in the domain definition, because it means user is a browse record and it's more flexible (i can do '[(country_id,=,user.partner_id.country_id.id)])
         'user_id': fields.many2one('res.users', string='User', required=True),
-        'planline_id': fields.many2one('gamification.goal.planline',
-            string='Goal Planline',
-            ondelete="cascade"),
+        'planline_id': fields.many2one('gamification.goal.planline', string='Goal Planline', ondelete="cascade"),
         'plan_id': fields.related('planline_id', 'plan_id',
             string="Plan",
             type='many2one',
@@ -163,12 +160,8 @@ class gamification_goal(osv.Model):
         'target_goal': fields.float('To Reach',
             required=True,
             track_visibility='always'),  # no goal = global index
-        'current': fields.float('Current',
-            required=True,
-            track_visibility='always'),
-        'completeness': fields.function(_get_completeness,
-            type='float',
-            string='Completeness'),
+        'current': fields.float('Current Value', required=True, track_visibility='always'),
+        'completeness': fields.function(_get_completeness, type='float', string='Completeness'),
         'state': fields.selection([
                 ('draft', 'Draft'),
                 ('inprogress', 'In progress'),
@@ -181,24 +174,17 @@ class gamification_goal(osv.Model):
             required=True,
             track_visibility='always'),
 
-        'computation_mode': fields.related('type_id', 'computation_mode',
-            type='char',
-            string="Type computation mode"),
+        'computation_mode': fields.related('type_id', 'computation_mode', type='char', string="Type computation mode"),
         'remind_update_delay': fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
         'last_update': fields.date('Last Update',
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
 
-        'type_description': fields.related('type_id', 'description',
-            type='char', string='Type Description', readonly=True),
-        'type_suffix': fields.related('type_id', 'suffix',
-            type='char', string='Type Description', readonly=True),
-        'type_condition': fields.related('type_id', 'condition',
-            type='char', string='Type Condition', readonly=True),
-        'type_suffix': fields.related('type_id', 'full_suffix',
-            type="char", string="Suffix", readonly=True),
-        'type_display': fields.related('type_id', 'display_mode',
-            type="char", string="Display Mode", readonly=True),
+        'type_description': fields.related('type_id', 'description', type='char', string='Type Description', readonly=True),
+        'type_suffix': fields.related('type_id', 'suffix', type='char', string='Type Description', readonly=True),
+        'type_condition': fields.related('type_id', 'condition', type='char', string='Type Condition', readonly=True),
+        'type_suffix': fields.related('type_id', 'full_suffix', type="char", string="Suffix", readonly=True),
+        'type_display': fields.related('type_id', 'display_mode', type="char", string="Display Mode", readonly=True),
     }
 
     _defaults = {
@@ -208,7 +194,6 @@ class gamification_goal(osv.Model):
     }
     _order = 'create_date desc, end_date desc, type_id, id'
 
-#TODO code review of this method
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
 
@@ -219,13 +204,16 @@ class gamification_goal(osv.Model):
         the target value being reached, the goal is set as failed."""
 
         for goal in self.browse(cr, uid, ids, context=context):
+            #TODO: towrite may be falsy, to avoid useless write on the object. Please check the whole thing is still working
+            towrite = {}
             if goal.state in ('draft', 'canceled'):
                 # skip if goal draft or canceled
                 continue
 
             if goal.type_id.computation_mode == 'manually':
-                # no comoutation for manual goals, only check for reminders
-                towrite = {'current': goal.current}
+
+                #TODO: put this code section in a separated method
+                # check for remind to update
                 if goal.remind_update_delay and goal.last_update:
                     delta_max = timedelta(days=goal.remind_update_delay)
                     last_update = datetime.strptime(goal.last_update, '%Y-%m-%d').date()
@@ -242,10 +230,9 @@ class gamification_goal(osv.Model):
                 values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.type')}
                 result = safe_eval(goal.type_id.compute_code, values, {})
 
-                if type(result) == float or type(result) == int or type(result) == long:
+                if type(result) in (float, int, long) and result != goal.current:
                     towrite = {'current': result}
                 else:
-                    towrite = {'current': goal.current}
                     _logger.exception(_('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
                     # raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
 
@@ -254,8 +241,9 @@ class gamification_goal(osv.Model):
                 field_date_name = goal.type_id.field_date_id.name
 
                 # eval the domain with user_id replaced by goal user
-                domain = safe_eval(goal.type_id.domain,
-                                   {'user_id': goal.user_id.id})
+                domain = safe_eval(goal.type_id.domain, {'user_id': goal.user_id.id})  # TODO: {'user_id': goal.user_id} (see above comment)
+
+                #add temporal clause(s) to the domain if fields are filled on the goal
                 if goal.start_date and field_date_name:
                     domain.append((field_date_name, '>=', goal.start_date))
                 if goal.end_date and field_date_name:
@@ -263,26 +251,26 @@ class gamification_goal(osv.Model):
 
                 if goal.type_id.computation_mode == 'sum':
                     field_name = goal.type_id.field_id.name
-                    res = obj.read_group(cr, uid, domain, [field_name],
-                                         [''], context=context)
-                    if res[0][field_name]:
-                        towrite = {'current': res[0][field_name]}
-                    else:
-                        # avoid false when no result
-                        towrite = {'current': 0}
+                    res = obj.read_group(cr, uid, domain, [field_name], [''], context=context)
+                    new_value = res and res[0][field_name] or 0.0
 
                 else:  # computation mode = count
-                    res = obj.search(cr, uid, domain, context=context)
-                    towrite = {'current': len(res)}
+                    new_value = obj.search(cr, uid, domain, context=context, count=True)
+
+                #avoid useless write if the new value is the same as the old one
+                if new_value != goal.current:
+                    towrite = {'current': new_value}
 
             # check goal target reached
-            if (goal.type_id.condition == 'higher' and towrite['current'] >= goal.target_goal) or (goal.type_id.condition == 'lower' and towrite['current'] <= goal.target_goal):
+            #TODO: reached condition is wrong because it should check time constraints.
+            if (goal.type_id.condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.type_id.condition == 'lower' and towrite.get('current', goal.curren) <= goal.target_goal):
                 towrite['state'] = 'reached'
 
             # check goal failure
             elif goal.end_date and fields.date.today() > goal.end_date:
                 towrite['state'] = 'failed'
-            self.write(cr, uid, [goal.id], towrite, context=context)
+            if towrite:
+                self.write(cr, uid, [goal.id], towrite, context=context)
         return True
 
     def action_start(self, cr, uid, ids, context=None):
@@ -315,6 +303,7 @@ class gamification_goal(osv.Model):
 
     def create(self, cr, uid, vals, context=None):
         """Overwrite the create method to add a 'just_created' field to True"""
+        #TODO: rename just_created into something more explicit (related to the effect, not to the cause) like 'avoid_onchange_log', for example
         context = context or {}
         context['just_created'] = True
         return super(gamification_goal, self).create(cr, uid, vals, context=context)
@@ -350,14 +339,15 @@ class gamification_goal(osv.Model):
         """
         goal = self.browse(cr, uid, goal_id, context=context)
         if goal.type_id.action_id:
+            #open a the action linked on the goal
             action = goal.type_id.action_id.read()[0]
 
             if goal.type_id.res_id_field:
-                current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
-                # eg : company_id.id
+                current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+                # this loop manages the cases where res_id_field is a browse record path (eg : company_id.currency_id.id)
                 field_names = goal.type_id.res_id_field.split('.')
-                res = current_user.__getitem__(field_names[0])
-                for field_name in field_names[1:]:
+                res = current_user
+                for field_name in field_names[:]:
                     res = res.__getitem__(field_name)
                 action['res_id'] = res
 
@@ -368,12 +358,12 @@ class gamification_goal(osv.Model):
                         views = [(view_id, mode)]
                         break
                 action['views'] = views
-
             return action
 
         if goal.computation_mode == 'manually':
+            #open a wizard window to update the value manually
             action = {
-                'name': "Update %s" % goal.type_id.name,
+                'name': _("Update %s") % goal.type_id.name,
                 'id': goal_id,
                 'type': 'ir.actions.act_window',
                 'views': [[False, 'form']],
@@ -384,6 +374,8 @@ class gamification_goal(osv.Model):
             return action
         return False
 
+    #TODO: i find a bit annoying to have this method on the goal class instead of being on only the goal type related.
+    # i wouldn't put this in a dedicated method... well i think something is wrong conceptually with this thing
     def changed_users_avatar(self, cr, uid, ids, context):
         """Warning a user changed his avatar.
 
@@ -392,12 +384,12 @@ class gamification_goal(osv.Model):
         Set the state of every type_base_avatar linked to ids to 'reached' and
         set current value to 1.
         """
+
         goal_type_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'type_base_avatar', context)
         goal_ids = self.search(cr, uid, [('type_id', '=', goal_type_id.id), ('user_id', 'in', ids)], context=context)
         values = {'state': 'reached', 'current': 1}
         self.write(cr, uid, goal_ids, values, context=context)
 
-#TOCHECK: it's totally unclear for me what the 'current' and the update method...
 
 class goal_manual_wizard(osv.TransientModel):
     """Wizard type to update a manual goal"""
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 77cf830335a..17886a6144c 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -16,7 +16,7 @@
 
         <record model="gamification.goal.type" id="type_base_avatar">
             <field name="name">Set your Avatar</field>
-            <field name="description">In your user perference</field>
+            <field name="description">In your user preference</field>
             <field name="computation_mode">manually</field>
             <field name="display_mode">checkbox</field>
             <!-- problem : default avatar != False -> manually + check in write function -->
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/goal_type_data.py
index 944ca4fe92e..24be886ab75 100644
--- a/addons/gamification/goal_type_data.py
+++ b/addons/gamification/goal_type_data.py
@@ -30,6 +30,7 @@ class gamification_goal_type_data(osv.Model):
     """
     _inherit = 'gamification.goal.type'
 
+#TODO: is it usefull to have this method in a standalone file? why not directly in the computation field of the related goal type?
     def number_following(self, cr, uid, xml_id="mail.thread", context=None):
         """Return the number of 'xml_id' objects the user is following
 
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 1798282119c..c0458263e05 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -1,6 +1,6 @@
 from openerp.osv import osv
 
-
+#TODO add copyright and last line for vim users
 class res_users_gamification_group(osv.Model):
     """ Update of res.users class
         - if adding groups to an user, check gamification.goal.plan linked to
@@ -25,6 +25,7 @@ class res_users_gamification_group(osv.Model):
             self.pool.get('gamification.goal').changed_users_avatar(cr, uid, ids, context)
         return write_res
 
+#TODO: this method is not clear about what she returns (list of dict but the dict's keys may be different from one to another)... it's doubtfull conceptually. Don't we need some more doc? why is this method looking so overkill?
     def get_goals_todo_info(self, cr, uid, context=None):
         """Return the list of goals assigned to the user, grouped by plan"""
         all_goals_info = []
@@ -67,7 +68,7 @@ class res_users_gamification_group(osv.Model):
                             continue
 
                         vals['goals'].append({
-                            'rank': goal[0]+1,
+                            'rank': goal[0] + 1,
                             'id': goal[1].id,
                             'user_id': goal[1].user_id.id,
                             'user_name': goal[1].user_id.name,
@@ -110,10 +111,10 @@ class res_users_gamification_group(osv.Model):
 
     def get_challenge_suggestions(self, cr, uid, context=None):
         """Return the list of goal plans suggested to the user"""
-        if context is None: context = {}
         plan_info = []
-        plan_ids = self.pool.get('gamification.goal.plan').search(cr, uid, [('proposed_user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
-        for plan in self.pool.get('gamification.goal.plan').browse(cr, uid, plan_ids, context=context):
+        goal_plan_obj = self.pool.get('gamification.goal.plan')
+        plan_ids = goal_plan_obj.search(cr, uid, [('proposed_user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
+        for plan in goal_plan_obj.browse(cr, uid, plan_ids, context=context):
             values = {
                 'id': plan.id,
                 'name': plan.name,
diff --git a/addons/gamification/templates.py b/addons/gamification/templates.py
index 21e6b8e0b4f..fb9c23c3e3d 100644
--- a/addons/gamification/templates.py
+++ b/addons/gamification/templates.py
@@ -8,18 +8,22 @@
 
 from jinja2.sandbox import SandboxedEnvironment
 from jinja2 import FileSystemLoader
-    
+
 from urllib import urlencode, quote as quote
 import os.path
 
+#TODO: to check: new dependancies in openerp? fine or not?
+#TODO: to check: if it's ok, i think it would be better directly in the server (tools) so that other modules that doesn't depend on gamification can use it
+#TODO; someone else should check this code, i'm not the good one
+
 class TemplateHelper(SandboxedEnvironment):
 
     GAMIFICATION_PATH = os.path.dirname(os.path.abspath(__file__))
 
     def __init__(self):
 
-        super(TemplateHelper,self).__init__(
-            loader=FileSystemLoader(os.path.join(self.GAMIFICATION_PATH,'templates/')),
+        super(TemplateHelper, self).__init__(
+            loader=FileSystemLoader(os.path.join(self.GAMIFICATION_PATH, 'templates/')),
             block_start_string="<%",
             block_end_string="%>",
             variable_start_string="${",

From bb17b02de508526a90172def7f299636a655eb24 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 6 Jun 2013 14:47:08 +0200
Subject: [PATCH 357/547] [IMP] gamification: more flexible domain, using
 email_templates

bzr revid: mat@openerp.com-20130606124708-3occhsgwkaxwzyp3
---
 addons/gamification/__openerp__.py            |   2 +-
 addons/gamification/badge.py                  |  16 ++-
 addons/gamification/badge_data.xml            |  18 +++
 addons/gamification/goal.py                   |  60 +++++-----
 addons/gamification/goal_base_data.xml        | 110 +++++++++++++++++-
 addons/gamification/plan.py                   |  23 ++--
 addons/gamification/res_users.py              |  24 +++-
 addons/gamification/templates.py              |   1 -
 addons/gamification/templates/reminder.mako   |   3 +-
 .../gamification_sale_crm/sale_crm_goals.xml  |  22 ++--
 10 files changed, 222 insertions(+), 57 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 0143f266d35..aaa4565cf43 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Ressources',
-    'depends': ['mail'],
+    'depends': ['mail', 'email_template'],
     'description': """
 Gamification process
 ====================
diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 53e7eb84b05..2c44fd2f182 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -23,7 +23,7 @@ from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
 
-from templates import TemplateHelper
+# from templates import TemplateHelper
 from datetime import date
 import logging
 
@@ -194,12 +194,20 @@ class gamification_badge(osv.Model):
         :param user_from: optional id of the res.users object that has sent the badge
         """
         badge = self.browse(cr, uid, badge_id, context=context)
-        template_env = TemplateHelper()
+        # template_env = TemplateHelper()
 
         res = None
+        temp_obj = self.pool.get('email.template')
+        template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_badge_received', context)
+        ctx = context.copy()
         for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context=context):
-            values = {'badge_user': badge_user, 'user_from': user_from}
-            body_html = template_env.get_template('badge_received.mako').render(values)
+
+            ctx.update({'user_from': self.pool.get('res.users').browse(cr, uid, user_from).name})
+
+            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.badge.user', badge_user.id, context=ctx)
+
+            # values = {'badge_user': badge_user, 'user_from': user_from}
+            # body_html = template_env.get_template('badge_received.mako').render(values)
             res = self.message_post(cr, uid, badge.id, body=body_html, type='comment', subtype='mt_comment', context=context)
         return res
 
diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index 8bd60d72dec..bedd9916c16 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -884,4 +884,22 @@
                                 AABJRU5ErkJggg==</field>
         </record>
     </data>
+
+
+    <data noupdate="0">
+
+        <record id="email_template_badge_received" model="email.template">
+            <field name="name">Received Badge</field>
+            <field name="body_html"><![CDATA[
+        <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !
+        % if ctx["user_from"]
+            This badge was granted by <strong>${ctx["user_from"]}</strong>.
+        % endif
+    </p>
+
+    % if object.comment
+        <p><em>${object.comment}</em></p>
+    % endif]]></field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 896b476f158..32a6bd55512 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.safe_eval import safe_eval
 from openerp.tools.translate import _
 
-from templates import TemplateHelper
-
 from datetime import date, datetime, timedelta
 
 import logging
@@ -88,8 +88,10 @@ class gamification_goal_type(osv.Model):
         'field_date_id': fields.many2one('ir.model.fields',
             string='Date Field',
             help='The date to use for the time period evaluated'),
+                #TODO: actually it would be better to use 'user.id' in the domain definition, because it means user is a browse record and it's more flexible (i can do '[(country_id,=,user.partner_id.country_id.id)])
+
         'domain': fields.char("Filter Domain",
-            help="Technical filters rules to apply",
+            help="Technical filters rules to apply. Use 'user.id' (without marks) to limit the search to the evaluated user.",
             required=True),
         'compute_code': fields.char('Compute Code',
             help="The name of the python method that will be executed to compute the current value. See the file gamification/goal_type_data.py for examples."),
@@ -146,8 +148,6 @@ class gamification_goal(osv.Model):
 
     _columns = {
         'type_id': fields.many2one('gamification.goal.type', string='Goal Type', required=True, ondelete="cascade"),
-        #TODO: add some tooltip/grey label in view to explain that people can use 'user_id' in their domain
-        #TODO: actually it would be better to use 'user.id' in the domain definition, because it means user is a browse record and it's more flexible (i can do '[(country_id,=,user.partner_id.country_id.id)])
         'user_id': fields.many2one('res.users', string='User', required=True),
         'planline_id': fields.many2one('gamification.goal.planline', string='Goal Planline', ondelete="cascade"),
         'plan_id': fields.related('planline_id', 'plan_id',
@@ -194,6 +194,25 @@ class gamification_goal(osv.Model):
     }
     _order = 'create_date desc, end_date desc, type_id, id'
 
+    def _check_remind_delay(self, goal, context=None):
+        """Verify if a goal has not been updated for some time and send a
+        reminder message of needed.
+
+        :return: data to write on the goal object
+        """
+        if goal.remind_update_delay and goal.last_update:
+            delta_max = timedelta(days=goal.remind_update_delay)
+            last_update = datetime.strptime(goal.last_update, DF).date()
+            if date.today() - last_update > delta_max and goal.state == 'inprogress':
+                # generate a remind report
+                temp_obj = self.pool.get('email.template')
+                template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_reminder', context)
+                body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.goal', goal.id, context=context)
+
+                self.message_post(cr, uid, goal.id, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
+                return {'state': 'inprogress_update'}
+        return {}
+
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
 
@@ -211,19 +230,7 @@ class gamification_goal(osv.Model):
                 continue
 
             if goal.type_id.computation_mode == 'manually':
-
-                #TODO: put this code section in a separated method
-                # check for remind to update
-                if goal.remind_update_delay and goal.last_update:
-                    delta_max = timedelta(days=goal.remind_update_delay)
-                    last_update = datetime.strptime(goal.last_update, '%Y-%m-%d').date()
-                    if date.today() - last_update > delta_max and goal.state == 'inprogress':
-                        towrite['state'] = 'inprogress_update'
-
-                        # generate a remind report
-                        template_env = TemplateHelper()
-                        body_html = template_env.get_template('reminder.mako').render({'object': goal})
-                        self.message_post(cr, uid, goal.id, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
+                towrite.update(self._check_remind_delay(goal, context))
 
             elif goal.type_id.computation_mode == 'python':
                 # execute the chosen method
@@ -231,7 +238,7 @@ class gamification_goal(osv.Model):
                 result = safe_eval(goal.type_id.compute_code, values, {})
 
                 if type(result) in (float, int, long) and result != goal.current:
-                    towrite = {'current': result}
+                    towrite['current'] = result
                 else:
                     _logger.exception(_('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
                     # raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
@@ -241,7 +248,7 @@ class gamification_goal(osv.Model):
                 field_date_name = goal.type_id.field_date_id.name
 
                 # eval the domain with user_id replaced by goal user
-                domain = safe_eval(goal.type_id.domain, {'user_id': goal.user_id.id})  # TODO: {'user_id': goal.user_id} (see above comment)
+                domain = safe_eval(goal.type_id.domain, {'user': goal.user_id})
 
                 #add temporal clause(s) to the domain if fields are filled on the goal
                 if goal.start_date and field_date_name:
@@ -259,11 +266,11 @@ class gamification_goal(osv.Model):
 
                 #avoid useless write if the new value is the same as the old one
                 if new_value != goal.current:
-                    towrite = {'current': new_value}
+                    towrite['current'] = new_value
 
             # check goal target reached
             #TODO: reached condition is wrong because it should check time constraints.
-            if (goal.type_id.condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.type_id.condition == 'lower' and towrite.get('current', goal.curren) <= goal.target_goal):
+            if (goal.type_id.condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.type_id.condition == 'lower' and towrite.get('current', goal.current) <= goal.target_goal):
                 towrite['state'] = 'reached'
 
             # check goal failure
@@ -302,10 +309,9 @@ class gamification_goal(osv.Model):
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def create(self, cr, uid, vals, context=None):
-        """Overwrite the create method to add a 'just_created' field to True"""
-        #TODO: rename just_created into something more explicit (related to the effect, not to the cause) like 'avoid_onchange_log', for example
+        """Overwrite the create method to add a 'no_remind_goal' field to True"""
         context = context or {}
-        context['just_created'] = True
+        context['no_remind_goal'] = True
         return super(gamification_goal, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -322,13 +328,13 @@ class gamification_goal(osv.Model):
                 raise osv.except_osv(_('Error!'), _('Can not modify a started goal'))
 
             if 'current' in vals:
-                if 'just_created' in context:
+                if 'no_remind_goal' in context:
                     # new goals should not be reported
                     continue
 
                 if goal.plan_id and goal.plan_id.report_message_frequency == 'onchange':
                     plan_obj = self.pool.get('gamification.goal.plan')
-                    plan_obj.report_progress(cr, uid, goal.plan_id, users=[goal.user_id], context=context)
+                    plan_obj.report_progress(cr, SUPERUSER_ID, goal.plan_id, users=[goal.user_id], context=context)
         return result
 
     def get_action(self, cr, uid, goal_id, context=None):
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 17886a6144c..b0e21b977cb 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -9,7 +9,7 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
-            <field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
+            <field name="domain">[('id','=',user.id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_users_my')" />
             <field name="res_id_field">id</field>
         </record>
@@ -31,7 +31,7 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
-            <field name="domain">[('user_ids', 'in', user_id), ('name', '!=', 'Your Company')]</field>
+            <field name="domain">[('user_ids', 'in', user.id), ('name', '!=', 'Your Company')]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
             <field name="res_id_field">company_id.id</field>
         </record>
@@ -41,7 +41,7 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
-            <field name="domain">[('user_ids', 'in', user_id),('logo', '!=', False)]</field>
+            <field name="domain">[('user_ids', 'in', user.id),('logo', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
             <field name="res_id_field">company_id.id</field>
         </record>
@@ -63,7 +63,7 @@
             <field name="display_mode">checkbox</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
-            <field name="domain">[('id', '!=', user_id)]</field>
+            <field name="domain">[('id', '!=', user.id)]</field>
             <field name="action_id" eval="ref('action_new_simplified_res_users')" />
         </record>
 
@@ -124,7 +124,109 @@
             <field name="target_goal">1</field>
             <field name="plan_id" eval="ref('plan_base_configure')" />
         </record>
+    </data>
 
+    <!-- Mail template is done in a NOUPDATE block
+         so users can freely customize/delete them -->
+    <data noupdate="0">
+        <!--Email template -->
+        
+        <record id="email_template_goal_reminder" model="email.template">
+            <field name="name">Reminder for Goal Update</field>
+            <field name="body_html"><![CDATA[
+    <header>
+        <strong>Reminder ${object.name}</strong>
+    </header>
 
+    <p class="oe_grey">${object.report_header or ''}</p>
+    
+    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
+
+    <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
+            ]]></field>
+        </record>
+
+        <record id="email_template_goal_progress_perso" model="email.template">
+            <field name="name">Personal Goal Progress</field>
+            <field name="body_html"><![CDATA[
+    <header>
+        <strong>${object.name}</strong>
+    </header>
+    <p class="oe_grey">${object.report_header or ''}</p>
+
+    <table width="100%" border="1">
+    <tr>
+        <th>Goal</th>
+        <th>Target</th>
+        <th>Current</th>
+        <th>Completeness</th>
+    </tr>
+    % for goal in ${ctx["goals"]}:
+        <tr
+            % if goal.completeness >= 100:
+                style="font-weight:bold;"
+            % endif
+            >
+            <td>${goal.type_id.name}</td>
+            <td>${goal.target_goal}
+            % if goal.type_suffix:
+                ${goal.type_suffix}
+            % endif
+            </td>
+            <td>${goal.current}
+            % if goal.type_suffix:
+                ${goal.type_suffix}
+            % endif
+            </td>
+            <td>${goal.completeness} %</td>
+        </tr>
+    % endfor
+    </table>]]></field>
+        </record>
+
+        <record id="email_template_goal_progress_group" model="email.template">
+            <field name="name">Group Goal Progress</field>
+            <field name="body_html"><![CDATA[
+    <header>
+        <strong>${object.name}</strong>
+    </header>
+    <p class="oe_grey">${object.report_header or ''}</p>
+
+    % for planline in ctx['planlines_boards']:
+        <table width="100%" border="1">
+            <tr>
+                <th colspan="4">${planline.goal_type.name}</th>
+            </tr>
+            <tr>
+                <th>#</th>
+                <th>Person</th>
+                <th>Completeness</th>
+                <th>Current</th>
+            </tr>
+            % for idx, goal in planline.board_goals:
+                % if idx < 3 or goal.user_id.id == user.id:
+                    <tr
+                        % if goal.completeness >= 100:
+                            style="font-weight:bold;"
+                        % endif
+                        >
+                        <td>${idx+1}</td>
+                        <td>${goal.user_id.name}</td>
+                        <td>${goal.completeness}%</td>
+                        <td>${goal.current}/${goal.target_goal}
+                        % if goal.type_suffix:
+                            ${goal.type_suffix}
+                        % endif
+                        </td>
+                    </tr>
+                % endif
+            % endfor
+        </table>
+
+        <br/><br/>
+
+    % endfor
+]]></field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 2541d9e500b..4375474fd05 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -22,7 +22,7 @@
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
-from templates import TemplateHelper
+# from templates import TemplateHelper
 
 from datetime import date, datetime, timedelta
 import calendar
@@ -545,12 +545,17 @@ class gamification_goal_plan(osv.Model):
 
         context = context or {}
         goal_obj = self.pool.get('gamification.goal')
-        template_env = TemplateHelper()
-
+        # template_env = TemplateHelper()
+        temp_obj = self.pool.get('email.template')
+        ctx = context.copy()
         if plan.visibility_mode == 'board':
             planlines_boards = self.get_board_goal_info(cr, uid, plan, subset_goal_ids, context)
 
-            body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards, 'uid': uid})
+            ctx.update({'planlines_boards': planlines_boards})
+            template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_group', context)
+            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.goal.plan', plan.id, context=context)
+
+            # body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards, 'uid': uid})
 
             # send to every follower of the plan
             self.message_post(cr, uid, plan.id,
@@ -570,10 +575,14 @@ class gamification_goal_plan(osv.Model):
                 if not values:
                     continue
 
-                values['object'] = plan
-                values['user'] = user,
+                # values['object'] = plan
+                # values['user'] = user
 
-                body_html = template_env.get_template('personal_progress.mako').render(values)
+                ctx.update({'planlines_boards': planlines_boards})
+                template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_perso', context)
+                body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.goal.plan', plan.id, context=context)
+
+                # body_html = template_env.get_template('personal_progress.mako').render(values)
 
                 # send message only to users
                 self.message_post(cr, uid, 0,
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index c0458263e05..4962cb1b975 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -1,6 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
 from openerp.osv import osv
 
-#TODO add copyright and last line for vim users
+
 class res_users_gamification_group(osv.Model):
     """ Update of res.users class
         - if adding groups to an user, check gamification.goal.plan linked to
@@ -144,3 +165,4 @@ class res_groups_gamification_group(osv.Model):
             if plan_ids:
                 goal_plan_obj.write(cr, uid, plan_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
         return write_res
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/gamification/templates.py b/addons/gamification/templates.py
index fb9c23c3e3d..b6d071c8f3a 100644
--- a/addons/gamification/templates.py
+++ b/addons/gamification/templates.py
@@ -40,4 +40,3 @@ class TemplateHelper(SandboxedEnvironment):
             'quote': quote,
             'urlencode': urlencode,
         })
-
diff --git a/addons/gamification/templates/reminder.mako b/addons/gamification/templates/reminder.mako
index f50d798a657..d3f8a584a03 100644
--- a/addons/gamification/templates/reminder.mako
+++ b/addons/gamification/templates/reminder.mako
@@ -13,4 +13,5 @@
     <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
 
     <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
-</body>
\ No newline at end of file
+</body>
+</html>
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index c5f85ef3273..6336f0e0654 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -11,7 +11,7 @@
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
-            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_invoice')]</field>
+            <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
 
         <record model="gamification.goal.type" id="type_crm_nbr_new_leads">
@@ -21,7 +21,7 @@
             <field name="unit">leads</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
-            <field name="domain">[('user_id','=',user_id),('type', '=', 'lead')]</field>
+            <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
         </record>
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_open">
@@ -33,7 +33,7 @@
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
-            <field name="domain">[('user_id','=',user_id),('type', '=', 'lead')]</field>
+            <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
         </record> 
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_close">
@@ -45,7 +45,7 @@
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_open')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_opening_date')" />
-            <field name="domain">[('user_id','=',user_id)]</field>
+            <field name="domain">[('user_id','=',user.id)]</field>
         </record> 
 
 
@@ -56,7 +56,7 @@
             <field name="unit">calls</field>
             <field name="model_id" eval="ref('crm.model_crm_phonecall')" />
             <field name="field_date_id" eval="ref('crm.field_crm_phonecall_date_closed')" />
-            <field name="domain">[('user_id','=',user_id),('state','=','done')]</field>
+            <field name="domain">[('user_id','=',user.id),('state','=','done')]</field>
         </record> 
 
         <record model="gamification.goal.type" id="type_crm_nbr_new_opportunities">
@@ -66,7 +66,7 @@
             <field name="unit">opportunities</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_date_open')" />
-            <field name="domain">[('user_id','=',user_id),('type','=','opportunity')]</field>
+            <field name="domain">[('user_id','=',user.id),('type','=','opportunity')]</field>
         </record>
 
         <record model="gamification.goal.type" id="type_crm_nbr_sale_order_created">
@@ -76,7 +76,7 @@
             <field name="unit">orders</field>
             <field name="model_id" eval="ref('sale.model_sale_order')" />
             <field name="field_date_id" eval="ref('sale.field_sale_order_date_order')" />
-            <field name="domain">[('user_id','=',user_id),('state','not in',('draft', 'sent', 'cancel'))]</field>
+            <field name="domain">[('user_id','=',user.id),('state','not in',('draft', 'sent', 'cancel'))]</field>
         </record>
 
         <record model="gamification.goal.type" id="type_crm_nbr_paid_sale_order">
@@ -86,7 +86,7 @@
             <field name="unit">orders</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
-            <field name="domain">[('state','=','paid'),('user_id','=',user_id),('type','=','out_invoice')]</field>
+            <field name="domain">[('state','=','paid'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
         <record model="gamification.goal.type" id="type_crm_tot_paid_sale_order">
             <field name="name">Total Paid Sales Orders</field>
@@ -96,7 +96,7 @@
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
-            <field name="domain">[('state','=','paid'),('user_id','=',user_id),('type','=','out_invoice')]</field>
+            <field name="domain">[('state','=','paid'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
 
 
@@ -108,7 +108,7 @@
             <field name="unit">invoices</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
-            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
+            <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_refund')]</field>
         </record>
         <record model="gamification.goal.type" id="type_crm_tot_customer_refunds">
             <field name="name">Total Customer Refunds</field>
@@ -119,7 +119,7 @@
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
-            <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
+            <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_refund')]</field>
         </record>
 
 

From 33594d9d6755068c2a2bc3855967345e65412174 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 7 Jun 2013 13:21:24 +0530
Subject: [PATCH 358/547] [IMP]hr_recruite: If in any case no duration tn imp
 msg as MP suggest

bzr revid: dbr@tinyerp.com-20130607075124-x70f2dl5vb6e3s8u
---
 addons/hr_recruitment/hr_recruitment.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index f1c2f3939c2..affacf10d61 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -308,10 +308,9 @@ class hr_applicant(base_stage, osv.Model):
 
     def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
          if not duration:
-             duration = _('unknown')
+             message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting_date, meeting_subject)
          else:
-             duration = str(duration)
-         message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
+             message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, str(duration))
          return self.message_post(cr, uid, ids, body=message,context=context)
 
     def action_makeMeeting(self, cr, uid, ids, context=None):

From c46526a9dc2d376c016a51390779257ac45912c2 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Fri, 7 Jun 2013 18:46:46 +0530
Subject: [PATCH 359/547] Improve Code.

bzr revid: jir@tinyerp.com-20130607131646-kkeo1nuue6klbikj
---
 addons/document/document_view.xml              |  3 +++
 addons/hr_recruitment/hr_recruitment.py        | 18 ++++++++++++++++++
 addons/hr_recruitment/hr_recruitment_view.xml  | 10 ++++++----
 addons/hr_recruitment/res_config.py            |  4 ----
 addons/hr_recruitment/res_config_view.xml      |  6 ------
 .../security/hr_recruitment_security.xml       |  1 -
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index c3bd5ad3f56..8c60e232dbf 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -199,6 +199,9 @@
                 <xpath expr="//filter[@name='my_documents_filter']" position="replace">
                     <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/>
                 </xpath>
+                <xpath expr="//field[@name='name']" position="replace">
+                	<field name="name" filter_domain="['|','|',('name', 'ilike', self), ('datas_fname', 'ilike', self),('index_content', 'ilike', self)]" string="Attachment"/>
+                </xpath>
                 <xpath expr="//field[@name='create_uid']" position="replace">
                     <field name="user_id"/>
                     <field name="parent_id" />
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 161cf71d513..39064304300 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -185,6 +185,24 @@ class hr_applicant(base_stage, osv.Model):
                     res[issue.id][field] = abs(float(duration))
         return res
     
+
+    def attachment_tree_view(self, cr, uid, ids, context):
+        domain = ['&', ('res_model', '=', 'hr.applicant'), ('res_id', 'in', ids)]
+        res_id = ids and ids[0] or False
+        return {
+            'name': _('Attachments'),
+            'domain': domain,
+            'res_model': 'ir.attachment',
+            'type': 'ir.actions.act_window',
+            'view_id': False,
+            'view_mode': 'tree,form',
+            'view_type': 'form',
+            'limit': 80,
+            'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)
+        }
+
+
+
     def _compute_attachments(self, cr, uid, ids, fields, args, context=None):
         res = {}
         attachment_pool = self.pool.get('ir.attachment')
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 542620ad14e..0cc6aff1496 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -89,6 +89,7 @@
                     <button name="action_print_survey" type="object"
                         string="Print Interview" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
+                    <button name="attachment_tree_view" string="Documents" type="object"/>
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
@@ -241,6 +242,7 @@
                 <field name="department_id"/>
                 <field name="categ_ids"/>
                 <field name="message_summary"/>
+                <field name="attachments"/>
                 <templates>
                     <t t-name="kanban-tooltip">
                         <ul class="oe_kanban_tooltip">
@@ -293,10 +295,10 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
-                                    <span>
-                                        <span class="oe_e">'</span>
-                                        <field name="attachments"/>
-                                    </span>
+										 <a t-if="record.attachments.raw_value == 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Document</a> 
+																		
+										 <a t-if="record.attachments.raw_value gt 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Documents</a> 
+                                     
                                 </div>
                                 
                             </div>
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index ac53bf74ff3..161042a99f2 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -29,9 +29,5 @@ class hr_applicant_settings(osv.osv_memory):
         'module_document_ftp': fields.boolean('Allow the automatic indexation of resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
                 This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
-        'fetchmail_applicants': fields.boolean('Create applicants from an incoming email account',
-            fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',   
-            help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
-                and create automatically application documents in the system."""),
     }
 
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 1c692099f60..e341e39c0a4 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -14,12 +14,6 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <div name="recruitment" position="inside">
-                    <div>
-                        <field name="fetchmail_applicants" class="oe_inline"/>
-                        <label for="fetchmail_applicants"/>
-                        <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
-                    </div>
                     <div>
                         <field name="module_document_ftp" class="oe_inline"/>
                         <label for="module_document_ftp"/>
diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index 4fccca1a791..14b448db2ae 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -9,6 +9,5 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-
   </data>
 </openerp>

From 0653e597f67859930be9075698e2a716bfbddc28 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 10:48:01 +0530
Subject: [PATCH 360/547] Changes Code.

bzr revid: jir@tinyerp.com-20130611051801-3eycn095439p5od2
---
 addons/document/document.py                   |  2 +-
 addons/hr_recruitment/__openerp__.py          |  1 -
 addons/hr_recruitment/hr_recruitment.py       | 13 -------------
 addons/hr_recruitment/hr_recruitment_menu.xml | 16 ----------------
 addons/hr_recruitment/hr_recruitment_view.xml |  3 +--
 addons/hr_recruitment/res_config.py           |  1 +
 6 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 54f12e204fe..70cc676b18b 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -1027,7 +1027,7 @@ class node_dir(node_database):
                     print "Cannot eval %s." % dfld.expr
                     print e
                     pass
-
+    
     def __eq__(self, other):
         if type(self) != type(other):
             return False
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index d33bfed6a4d..e83c546af04 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -42,7 +42,6 @@ You can define the different phases of interviews and easily rate the applicant
         'base_status',
         'decimal_precision',
         'hr',
-        'document',
         'survey',
         'base_calendar',
         'fetchmail',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 39064304300..ead8264f663 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -213,17 +213,6 @@ class hr_applicant(base_stage, osv.Model):
                 res[issue.id] = len(attach)
         return res
 
-    def _get_index_content(self, cr, uid, ids, fields, args, context=None):
-        res = {}
-        attachment_pool = self.pool.get('ir.attachment')
-        for issue in self.browse(cr, uid, ids, context=context):
-            res[issue.id] = 0
-            attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',issue.id)])
-            if attach_id:
-                for attach in attachment_pool.browse(cr, uid, attach_id, context):
-                    res[issue.id] = attach.index_content
-        return res
-
     _columns = {
         'name': fields.char('Subject', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
@@ -276,8 +265,6 @@ class hr_applicant(base_stage, osv.Model):
         'emp_id': fields.many2one('hr.employee', 'employee'),
         'attachments': fields.function(_compute_attachments, string='Attachments', \
                                  type="integer"),
-        'index_content': fields.function(_get_index_content, string='Index Content', \
-                                 type="char",store=True),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index fb10a4f20a0..ac326f7b74c 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -23,18 +23,6 @@
             </field>
         </record>
 
-		<record model="ir.actions.act_window" id="hr_applicant_resumes">
-            <field name="name">Resumes and Letters</field>
-            <field name="res_model">ir.attachment</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="document.view_document_file_tree"/>
-            <field name="domain">[('res_model','=','hr.applicant')]</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                 Search through resumes and motivation letters.
-              </p>
-            </field>
-        </record>
         
         <record model="ir.actions.act_window.view" id="action_hr_sec_kanban_view_act_job">
             <field name="sequence" eval="0"/>
@@ -77,10 +65,6 @@
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
             
-        <menuitem
-            name="Resumes and Letters"
-            parent="base.menu_crm_case_job_req_main"
-            id="menu_crm_case_categ0_act_job02" action="hr_applicant_resumes" sequence="3"/>            
     
         <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 0cc6aff1496..3b2d6766730 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -58,7 +58,6 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="index_content" invisible="1"/>
                 <field name="state" invisible="1"/>
             </tree>
         </field>
@@ -188,7 +187,7 @@
                 <separator/>
                 <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
-                <field name="index_content" string="Resume Content"/>
+               
                 <field name="job_id"/>
                 <field name="user_id"/>
                 <separator/>
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index 161042a99f2..ba86722a6bc 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -29,5 +29,6 @@ class hr_applicant_settings(osv.osv_memory):
         'module_document_ftp': fields.boolean('Allow the automatic indexation of resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
                 This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
+ 
     }
 

From 8091ee95b746db97acd3a3382c672a81a4ddb663 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 10:58:30 +0530
Subject: [PATCH 361/547] Add Module.

bzr revid: jir@tinyerp.com-20130611052830-j9svn7ei0cn10l85
---
 addons/hr_applicant_document/__init__.py      | 24 +++++++++
 addons/hr_applicant_document/__openerp__.py   | 47 +++++++++++++++++
 .../hr_applicant_document.py                  | 48 +++++++++++++++++
 .../hr_applicant_document_view.xml            | 51 +++++++++++++++++++
 4 files changed, 170 insertions(+)
 create mode 100644 addons/hr_applicant_document/__init__.py
 create mode 100644 addons/hr_applicant_document/__openerp__.py
 create mode 100644 addons/hr_applicant_document/hr_applicant_document.py
 create mode 100644 addons/hr_applicant_document/hr_applicant_document_view.xml

diff --git a/addons/hr_applicant_document/__init__.py b/addons/hr_applicant_document/__init__.py
new file mode 100644
index 00000000000..d3188eef79a
--- /dev/null
+++ b/addons/hr_applicant_document/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import hr_applicant_document
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_applicant_document/__openerp__.py b/addons/hr_applicant_document/__openerp__.py
new file mode 100644
index 00000000000..537856c54a0
--- /dev/null
+++ b/addons/hr_applicant_document/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Applicant Resumes and Letters',
+    'version': '1.0',
+    'category': 'Human Resources',
+    'sequence': 25,
+    'summary': 'Applicant Resumes and Letters',
+    'description': """
+Manage Applicant Resumes and letters 
+====================================
+This application allows you to keep resumes and letters with applicants.
+
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'],
+    'depends': ['hr_recruitment','document'],
+    'data': ['hr_applicant_document_view.xml'],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'auto_install': True,
+    'application': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
new file mode 100644
index 00000000000..5675d87d473
--- /dev/null
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from openerp import tools
+from openerp.addons.base_status.base_stage import base_stage
+from datetime import datetime
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import html2plaintext
+class applicant_document(osv.osv):
+	_name = 'hr.applicant'
+	_inherit = 'hr.applicant'
+	def _get_index_content(self, cr, uid, ids, fields, args, context=None):
+		res = {}
+		attachment_pool = self.pool.get('ir.attachment')
+		for issue in self.browse(cr, uid, ids, context=context):
+			res[issue.id] = 0
+			attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',issue.id)])
+			if attach_id:
+				for attach in attachment_pool.browse(cr, uid, attach_id, context):
+					res[issue.id] = attach.index_content
+		return res
+
+	_columns = {
+	'index_content': fields.function(_get_index_content, string='Index Content', \
+                                 type="char",store=True),
+	}
+applicant_document()	
+
diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/hr_applicant_document_view.xml
new file mode 100644
index 00000000000..c590c5c89fe
--- /dev/null
+++ b/addons/hr_applicant_document/hr_applicant_document_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+		<record model="ir.ui.view" id="crm_case_tree_view_job_inherit">
+		    <field name="name">Applicants</field>
+		    <field name="model">hr.applicant</field>
+		    <field name="inherit_id" ref="hr_recruitment.crm_case_tree_view_job" />
+		    <field name="arch" type="xml">
+		    	<field name="user_id" position="after">
+		    		<field name="index_content" invisible="1"/>
+		    	</field>
+			</field>
+		</record>
+		     
+		<record id="view_crm_case_jobs_filter_inherit" model="ir.ui.view">
+		    <field name="name">Jobs - Recruitment Search</field>
+		    <field name="model">hr.applicant</field>
+		    <field name="inherit_id" ref="hr_recruitment.view_crm_case_jobs_filter" />
+		    <field name="arch" type="xml">
+		    	<field name="job_id" position="before">
+		    		<field name="index_content" string="Resume Content"/>
+		    	</field>
+		    </field>
+		</record>
+    
+
+	<record model="ir.actions.act_window" id="hr_applicant_resumes">
+        <field name="name">Resumes and Letters</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="document.view_document_file_tree"/>
+        <field name="domain">[('res_model','=','hr.applicant')]</field>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+             Search through resumes and motivation letters.
+          </p>
+        </field>
+    </record>
+
+        <menuitem
+            name="Resumes and Letters"
+            parent="base.menu_crm_case_job_req_main"
+            id="menu_crm_case_categ0_act_job02" action="hr_applicant_resumes" sequence="3"/>            
+        
+        
+
+   </data>
+</openerp>
+    
+

From 959445fa6963e00e4901d5aa5f1afa06c1cb31d4 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 15:10:05 +0530
Subject: [PATCH 362/547] Code Improve.

bzr revid: jir@tinyerp.com-20130611094005-tu13lpz6u837va0s
---
 addons/document/document_view.xml             |  3 --
 .../hr_applicant_document.py                  | 20 +++++++++---
 .../hr_applicant_document_view.xml            | 32 +++++++------------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 8c60e232dbf..c3bd5ad3f56 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -199,9 +199,6 @@
                 <xpath expr="//filter[@name='my_documents_filter']" position="replace">
                     <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/>
                 </xpath>
-                <xpath expr="//field[@name='name']" position="replace">
-                	<field name="name" filter_domain="['|','|',('name', 'ilike', self), ('datas_fname', 'ilike', self),('index_content', 'ilike', self)]" string="Attachment"/>
-                </xpath>
                 <xpath expr="//field[@name='create_uid']" position="replace">
                     <field name="user_id"/>
                     <field name="parent_id" />
diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index 5675d87d473..1b5144b7566 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -29,20 +29,30 @@ from openerp.tools import html2plaintext
 class applicant_document(osv.osv):
 	_name = 'hr.applicant'
 	_inherit = 'hr.applicant'
+
 	def _get_index_content(self, cr, uid, ids, fields, args, context=None):
 		res = {}
 		attachment_pool = self.pool.get('ir.attachment')
-		for issue in self.browse(cr, uid, ids, context=context):
-			res[issue.id] = 0
-			attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',issue.id)])
+		for applicant in self.browse(cr, uid, ids, context=context):
+			res[applicant.id] = 0
+			attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
 			if attach_id:
 				for attach in attachment_pool.browse(cr, uid, attach_id, context):
-					res[issue.id] = attach.index_content
+					res[applicant.id] = attach.index_content
 		return res
 
+	def _content_search(self, cursor, user, obj, name, args, context=None):
+		record_ids = []
+		attachment_pool = self.pool.get('ir.attachment')
+		args += [('res_model','=','hr.applicant')]
+		attach_ids = attachment_pool.search(cursor, user, args)
+		for attach in attachment_pool.browse(cursor, user, attach_ids):
+			record_ids.append(attach.res_id)			
+		return [('id', 'in', record_ids)]
+
 	_columns = {
 	'index_content': fields.function(_get_index_content, string='Index Content', \
-                                 type="char",store=True),
+                                 fnct_search=_content_search,type="text"),
 	}
 applicant_document()	
 
diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/hr_applicant_document_view.xml
index c590c5c89fe..ed373831f85 100644
--- a/addons/hr_applicant_document/hr_applicant_document_view.xml
+++ b/addons/hr_applicant_document/hr_applicant_document_view.xml
@@ -2,27 +2,17 @@
 <openerp>
     <data>
 
-		<record model="ir.ui.view" id="crm_case_tree_view_job_inherit">
-		    <field name="name">Applicants</field>
-		    <field name="model">hr.applicant</field>
-		    <field name="inherit_id" ref="hr_recruitment.crm_case_tree_view_job" />
-		    <field name="arch" type="xml">
-		    	<field name="user_id" position="after">
-		    		<field name="index_content" invisible="1"/>
-		    	</field>
-			</field>
-		</record>
-		     
-		<record id="view_crm_case_jobs_filter_inherit" model="ir.ui.view">
-		    <field name="name">Jobs - Recruitment Search</field>
-		    <field name="model">hr.applicant</field>
-		    <field name="inherit_id" ref="hr_recruitment.view_crm_case_jobs_filter" />
-		    <field name="arch" type="xml">
-		    	<field name="job_id" position="before">
-		    		<field name="index_content" string="Resume Content"/>
-		    	</field>
-		    </field>
-		</record>
+	     
+	<record id="view_crm_case_jobs_filter_inherit" model="ir.ui.view">
+	    <field name="name">Jobs - Recruitment Search</field>
+	    <field name="model">hr.applicant</field>
+	    <field name="inherit_id" ref="hr_recruitment.view_crm_case_jobs_filter" />
+	    <field name="arch" type="xml">
+	    	<field name="job_id" position="before">
+	    		<field name="index_content" string="Resume Content"/>
+	    	</field>
+	    </field>
+	</record>
     
 
 	<record model="ir.actions.act_window" id="hr_applicant_resumes">

From 9bc546a6a00021693456607d7f3756ad5a9f1956 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 16:19:54 +0530
Subject: [PATCH 363/547] Code Improve.

bzr revid: jir@tinyerp.com-20130611104954-k7uta5b9003xx28e
---
 addons/hr_applicant_document/hr_applicant_document.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index 1b5144b7566..f53688a7014 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -21,11 +21,10 @@
 
 import time
 from openerp import tools
-from openerp.addons.base_status.base_stage import base_stage
 from datetime import datetime
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
-from openerp.tools import html2plaintext
+
 class applicant_document(osv.osv):
 	_name = 'hr.applicant'
 	_inherit = 'hr.applicant'
@@ -54,5 +53,4 @@ class applicant_document(osv.osv):
 	'index_content': fields.function(_get_index_content, string='Index Content', \
                                  fnct_search=_content_search,type="text"),
 	}
-applicant_document()	
 

From cd7fc8ccef913d32393ad13f5b149a5a1925b674 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 16:30:08 +0530
Subject: [PATCH 364/547] Improve code.

bzr revid: jir@tinyerp.com-20130611110008-m3ftw03gznv802ll
---
 addons/hr_recruitment/hr_recruitment.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index ead8264f663..09c238fcd86 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -206,11 +206,11 @@ class hr_applicant(base_stage, osv.Model):
     def _compute_attachments(self, cr, uid, ids, fields, args, context=None):
         res = {}
         attachment_pool = self.pool.get('ir.attachment')
-        for issue in self.browse(cr, uid, ids, context=context):
-            res[issue.id] = 0
-            attach = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',issue.id)])
+        for applicant in self.browse(cr, uid, ids, context=context):
+            res[applicant.id] = 0
+            attach = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
             if attach:
-                res[issue.id] = len(attach)
+                res[applicant.id] = len(attach)
         return res
 
     _columns = {

From f9733dcc0c60d555ecf0adb0aa6af175f2815d68 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 17:39:37 +0530
Subject: [PATCH 365/547] Change Certificate.

bzr revid: jir@tinyerp.com-20130611120937-u9frs8q3hzhizfeq
---
 addons/hr_applicant_document/__init__.py         | 16 ++++++++--------
 addons/hr_applicant_document/__openerp__.py      | 16 ++++++++--------
 .../hr_applicant_document.py                     |  9 +++++----
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/addons/hr_applicant_document/__init__.py b/addons/hr_applicant_document/__init__.py
index d3188eef79a..2b119fed44c 100644
--- a/addons/hr_applicant_document/__init__.py
+++ b/addons/hr_applicant_document/__init__.py
@@ -1,24 +1,24 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU Affero General Public License for more details
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
+
 import hr_applicant_document
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_applicant_document/__openerp__.py b/addons/hr_applicant_document/__openerp__.py
index 537856c54a0..539c1eb9610 100644
--- a/addons/hr_applicant_document/__openerp__.py
+++ b/addons/hr_applicant_document/__openerp__.py
@@ -1,25 +1,25 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU Affero General Public License for more details
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
+
 {
     'name': 'Applicant Resumes and Letters',
     'version': '1.0',
diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index f53688a7014..f9c62ed640d 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -2,23 +2,24 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
 #    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    License, or (at your option) any later version
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU Affero General Public License for more details
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
+
 import time
 from openerp import tools
 from datetime import datetime

From 0a44c547862b917d047a51c43f2c89d4843b3c2f Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 19:01:41 +0530
Subject: [PATCH 366/547] Improve code.

bzr revid: jir@tinyerp.com-20130611133141-v9jm2gjst33bdf4c
---
 .../hr_applicant_document.py                  | 46 +++++++++----------
 addons/hr_recruitment/hr_recruitment_view.xml | 10 ++--
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index f9c62ed640d..925b27c6590 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -27,31 +27,31 @@ from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
 class applicant_document(osv.osv):
-	_name = 'hr.applicant'
-	_inherit = 'hr.applicant'
+    _name = 'hr.applicant'
+    _inherit = 'hr.applicant'
 
-	def _get_index_content(self, cr, uid, ids, fields, args, context=None):
-		res = {}
-		attachment_pool = self.pool.get('ir.attachment')
-		for applicant in self.browse(cr, uid, ids, context=context):
-			res[applicant.id] = 0
-			attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
-			if attach_id:
-				for attach in attachment_pool.browse(cr, uid, attach_id, context):
-					res[applicant.id] = attach.index_content
-		return res
+    def _get_index_content(self, cr, uid, ids, fields, args, context=None):
+        res = {}
+        attachment_pool = self.pool.get('ir.attachment')
+        for applicant in self.browse(cr, uid, ids, context=context):
+            res[applicant.id] = 0
+            attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
+            if attach_id:
+                for attach in attachment_pool.browse(cr, uid, attach_id, context):
+                    res[applicant.id] = attach.index_content
+        return res
 
-	def _content_search(self, cursor, user, obj, name, args, context=None):
-		record_ids = []
-		attachment_pool = self.pool.get('ir.attachment')
-		args += [('res_model','=','hr.applicant')]
-		attach_ids = attachment_pool.search(cursor, user, args)
-		for attach in attachment_pool.browse(cursor, user, attach_ids):
-			record_ids.append(attach.res_id)			
-		return [('id', 'in', record_ids)]
+    def _content_search(self, cursor, user, obj, name, args, context=None):
+        record_ids = []
+        attachment_pool = self.pool.get('ir.attachment')
+        args += [('res_model','=','hr.applicant')]
+        attach_ids = attachment_pool.search(cursor, user, args)
+        for attach in attachment_pool.browse(cursor, user, attach_ids):
+            record_ids.append(attach.res_id)			
+        return [('id', 'in', record_ids)]
 
-	_columns = {
-	'index_content': fields.function(_get_index_content, string='Index Content', \
+    _columns = {
+        'index_content': fields.function(_get_index_content, string='Index Content', \
                                  fnct_search=_content_search,type="text"),
-	}
+    }
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3b2d6766730..98fcf27148d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -294,12 +294,12 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
-										 <a t-if="record.attachments.raw_value == 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Document</a> 
-																		
-										 <a t-if="record.attachments.raw_value gt 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Documents</a> 
-                                     
+                                    <a t-if="record.attachments.raw_value == 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Document</a> 
+							
+                                    <a t-if="record.attachments.raw_value gt 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Documents</a> 
+
                                 </div>
-                                
+                            
                             </div>
                             <div class="oe_clear"></div>
                         </div>

From 0b9c8708245ed91fed8dce087008010052a42c4f Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 11 Jun 2013 19:26:21 +0530
Subject: [PATCH 367/547] Improve Code.

bzr revid: jir@tinyerp.com-20130611135621-ae0qh635wl4dhemk
---
 .../hr_applicant_document.py                  |  2 +-
 .../hr_applicant_document_view.xml            | 48 +++++++++----------
 addons/hr_recruitment/hr_recruitment.py       |  2 -
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index 925b27c6590..62ed3dbe722 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -52,6 +52,6 @@ class applicant_document(osv.osv):
 
     _columns = {
         'index_content': fields.function(_get_index_content, string='Index Content', \
-                                 fnct_search=_content_search,type="text"),
+                                 fnct_search=_content_search, type="text"),
     }
 
diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/hr_applicant_document_view.xml
index ed373831f85..5b9ebf3fa0b 100644
--- a/addons/hr_applicant_document/hr_applicant_document_view.xml
+++ b/addons/hr_applicant_document/hr_applicant_document_view.xml
@@ -2,38 +2,34 @@
 <openerp>
     <data>
 
-	     
-	<record id="view_crm_case_jobs_filter_inherit" model="ir.ui.view">
-	    <field name="name">Jobs - Recruitment Search</field>
-	    <field name="model">hr.applicant</field>
-	    <field name="inherit_id" ref="hr_recruitment.view_crm_case_jobs_filter" />
-	    <field name="arch" type="xml">
-	    	<field name="job_id" position="before">
-	    		<field name="index_content" string="Resume Content"/>
-	    	</field>
-	    </field>
-	</record>
-    
+        <record id="view_crm_case_jobs_filter_inherit" model="ir.ui.view">
+            <field name="name">Jobs - Recruitment Search</field>
+            <field name="model">hr.applicant</field>
+            <field name="inherit_id" ref="hr_recruitment.view_crm_case_jobs_filter" />
+            <field name="arch" type="xml">
+                <field name="job_id" position="before">
+                    <field name="index_content" string="Resume Content"/>
+                </field>
+            </field>
+        </record>
 
-	<record model="ir.actions.act_window" id="hr_applicant_resumes">
-        <field name="name">Resumes and Letters</field>
-        <field name="res_model">ir.attachment</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="document.view_document_file_tree"/>
-        <field name="domain">[('res_model','=','hr.applicant')]</field>
-        <field name="help" type="html">
-          <p class="oe_view_nocontent_create">
-             Search through resumes and motivation letters.
-          </p>
-        </field>
-    </record>
+	    <record model="ir.actions.act_window" id="hr_applicant_resumes">
+            <field name="name">Resumes and Letters</field>
+            <field name="res_model">ir.attachment</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="document.view_document_file_tree"/>
+            <field name="domain">[('res_model','=','hr.applicant')]</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                 Search through resumes and motivation letters.
+                </p>
+            </field>
+        </record>
 
         <menuitem
             name="Resumes and Letters"
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job02" action="hr_applicant_resumes" sequence="3"/>            
-        
-        
 
    </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 09c238fcd86..74a242cefa3 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -201,8 +201,6 @@ class hr_applicant(base_stage, osv.Model):
             'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)
         }
 
-
-
     def _compute_attachments(self, cr, uid, ids, fields, args, context=None):
         res = {}
         attachment_pool = self.pool.get('ir.attachment')

From 2bedd3a57d836068fe387fde0207217f2a099871 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Wed, 12 Jun 2013 10:21:14 +0530
Subject: [PATCH 368/547] Changes in view format.

bzr revid: jir@tinyerp.com-20130612045114-6eanyica5s9py1c3
---
 .../hr_applicant_document/hr_applicant_document_view.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/hr_applicant_document_view.xml
index 5b9ebf3fa0b..277441d6d50 100644
--- a/addons/hr_applicant_document/hr_applicant_document_view.xml
+++ b/addons/hr_applicant_document/hr_applicant_document_view.xml
@@ -13,16 +13,16 @@
             </field>
         </record>
 
-	    <record model="ir.actions.act_window" id="hr_applicant_resumes">
+        <record model="ir.actions.act_window" id="hr_applicant_resumes">
             <field name="name">Resumes and Letters</field>
             <field name="res_model">ir.attachment</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="document.view_document_file_tree"/>
             <field name="domain">[('res_model','=','hr.applicant')]</field>
             <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                 Search through resumes and motivation letters.
-                </p>
+            <p class="oe_view_nocontent_create">
+             Search through resumes and motivation letters.
+            </p>
             </field>
         </record>
 

From a2b06d2f13c11f0816ca8bb19ffb3fe3e2973249 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 12 Jun 2013 14:07:58 +0200
Subject: [PATCH 369/547] [REF] gamification: comments and move
 changed_users_avatar method

bzr revid: mat@openerp.com-20130612120758-garx32vy8qjcfseb
---
 addons/gamification/goal.py      | 16 ----------------
 addons/gamification/res_users.py | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 32a6bd55512..32bcc3e513b 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -380,22 +380,6 @@ class gamification_goal(osv.Model):
             return action
         return False
 
-    #TODO: i find a bit annoying to have this method on the goal class instead of being on only the goal type related.
-    # i wouldn't put this in a dedicated method... well i think something is wrong conceptually with this thing
-    def changed_users_avatar(self, cr, uid, ids, context):
-        """Warning a user changed his avatar.
-
-        The goal_type type_base_avatar requires a change of avatar. As an
-        avatar is randomly generated by default, trigger warning when change.
-        Set the state of every type_base_avatar linked to ids to 'reached' and
-        set current value to 1.
-        """
-
-        goal_type_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'type_base_avatar', context)
-        goal_ids = self.search(cr, uid, [('type_id', '=', goal_type_id.id), ('user_id', 'in', ids)], context=context)
-        values = {'state': 'reached', 'current': 1}
-        self.write(cr, uid, goal_ids, values, context=context)
-
 
 class goal_manual_wizard(osv.TransientModel):
     """Wizard type to update a manual goal"""
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 4962cb1b975..3ccdf592881 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -43,12 +43,21 @@ class res_users_gamification_group(osv.Model):
                 goal_plan_obj.write(cr, uid, plan_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
 
         if vals.get('image'):
-            self.pool.get('gamification.goal').changed_users_avatar(cr, uid, ids, context)
+            goal_type_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'type_base_avatar', context)
+            goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('type_id', '=', goal_type_id.id), ('user_id', 'in', ids)], context=context)
+            values = {'state': 'reached', 'current': 1}
+            self.pool.get('gamification.goal').write(cr, uid, goal_ids, values, context=context)
         return write_res
 
-#TODO: this method is not clear about what she returns (list of dict but the dict's keys may be different from one to another)... it's doubtfull conceptually. Don't we need some more doc? why is this method looking so overkill?
     def get_goals_todo_info(self, cr, uid, context=None):
-        """Return the list of goals assigned to the user, grouped by plan"""
+        """Return the list of goals assigned to the user, grouped by plan
+
+        This method intends to return processable data in javascript in the
+        goal_list_to_do template. The output format is not constant as the
+        required information is different between individual and board goal
+        types
+        :return: list of dictionnaries for each goal to display
+        """
         all_goals_info = []
         plan_obj = self.pool.get('gamification.goal.plan')
 

From d704899df3ae40be0bf1cca640e136bd0c96a2d3 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Fri, 14 Jun 2013 14:25:59 +0530
Subject: [PATCH 370/547] Improve module description and template.

bzr revid: jir@tinyerp.com-20130614085559-auji06qm3mbhc7j2
---
 addons/hr_applicant_document/__openerp__.py           | 11 ++++-------
 addons/hr_applicant_document/hr_applicant_document.py |  3 +--
 addons/hr_recruitment/hr_recruitment.py               |  2 +-
 addons/hr_recruitment/hr_recruitment_data.xml         |  4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/hr_applicant_document/__openerp__.py b/addons/hr_applicant_document/__openerp__.py
index 539c1eb9610..33a80d433bb 100644
--- a/addons/hr_applicant_document/__openerp__.py
+++ b/addons/hr_applicant_document/__openerp__.py
@@ -21,20 +21,17 @@
 
 
 {
-    'name': 'Applicant Resumes and Letters',
+    'name': 'Applicant Resumes and Latters',
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 25,
-    'summary': 'Applicant Resumes and Letters',
+    'summary': 'Search applicant by resume index content.',
     'description': """
-Manage Applicant Resumes and letters 
-====================================
-This application allows you to keep resumes and letters with applicants.
-
+    This module allows you to search applicant by resume index content.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'],
+    'images': [],
     'depends': ['hr_recruitment','document'],
     'data': ['hr_applicant_document_view.xml'],
     'demo': [],
diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index 62ed3dbe722..74cf96830a3 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -26,8 +26,7 @@ from datetime import datetime
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
-class applicant_document(osv.osv):
-    _name = 'hr.applicant'
+class hr_applicant(osv.osv):
     _inherit = 'hr.applicant'
 
     def _get_index_content(self, cr, uid, ids, fields, args, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 74a242cefa3..50be3acd3bf 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -261,7 +261,7 @@ class hr_applicant(base_stage, osv.Model):
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
         'emp_id': fields.many2one('hr.employee', 'employee'),
-        'attachments': fields.function(_compute_attachments, string='Attachments', \
+        'attachments': fields.function(_compute_attachments, string='Number of Attachments', \
                                  type="integer"),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 50e19bb7d69..b3eb0ac97d1 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -232,7 +232,7 @@
         <p>If you want more details, feel free to contact us by phone.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id.name}
+         ${object.user_id.signature}
         <br/>]]></field>
     </record>
 
@@ -251,7 +251,7 @@
         If I do not answer, please let me a message with some schedules to call you back.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id.name}
+         ${object.user_id.signature}
         <br/>]]></field>
     </record>
             

From d578a8f90a1438709be3496cbc23c833dce1657f Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Fri, 14 Jun 2013 14:54:53 +0530
Subject: [PATCH 371/547] Improve description.

bzr revid: jir@tinyerp.com-20130614092453-zs8hpnx3mutsmhhd
---
 addons/hr_applicant_document/__openerp__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_applicant_document/__openerp__.py b/addons/hr_applicant_document/__openerp__.py
index 33a80d433bb..6917084e1f4 100644
--- a/addons/hr_applicant_document/__openerp__.py
+++ b/addons/hr_applicant_document/__openerp__.py
@@ -25,9 +25,10 @@
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 25,
-    'summary': 'Search applicant by resume index content.',
+    'summary': 'Search job applications by Index content.',
     'description': """
-    This module allows you to search applicant by resume index content.
+    This module allows you to search job applications by Index content
+    of Resumes & Letters.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

From bb3cb3b570cafb38276e12b566bbf78697efb6ec Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Tue, 18 Jun 2013 12:22:06 +0530
Subject: [PATCH 372/547] Remove extra import and improve naming conventions.

bzr revid: jir@tinyerp.com-20130618065206-adscfsv8dum8h0rl
---
 addons/hr_applicant_document/__openerp__.py   |  2 +-
 .../hr_applicant_document.py                  | 20 +++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/addons/hr_applicant_document/__openerp__.py b/addons/hr_applicant_document/__openerp__.py
index 6917084e1f4..f9034067b00 100644
--- a/addons/hr_applicant_document/__openerp__.py
+++ b/addons/hr_applicant_document/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Applicant Resumes and Latters',
+    'name': 'Applicant Resumes and Letters',
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 25,
diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index 74cf96830a3..7a1ea4f1002 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -18,13 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-
-
-import time
-from openerp import tools
-from datetime import datetime
 from openerp.osv import fields, osv
-from openerp.tools.translate import _
 
 class hr_applicant(osv.osv):
     _inherit = 'hr.applicant'
@@ -34,19 +28,19 @@ class hr_applicant(osv.osv):
         attachment_pool = self.pool.get('ir.attachment')
         for applicant in self.browse(cr, uid, ids, context=context):
             res[applicant.id] = 0
-            attach_id = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
-            if attach_id:
-                for attach in attachment_pool.browse(cr, uid, attach_id, context):
-                    res[applicant.id] = attach.index_content
+            attachment_ids = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
+            if attachment_ids:
+                for attachment in attachment_pool.browse(cr, uid, attachment_ids, context):
+                    res[applicant.id] = attachment.index_content
         return res
 
     def _content_search(self, cursor, user, obj, name, args, context=None):
         record_ids = []
         attachment_pool = self.pool.get('ir.attachment')
         args += [('res_model','=','hr.applicant')]
-        attach_ids = attachment_pool.search(cursor, user, args)
-        for attach in attachment_pool.browse(cursor, user, attach_ids):
-            record_ids.append(attach.res_id)			
+        attachment_ids = attachment_pool.search(cursor, user, args)
+        for attachment in attachment_pool.browse(cursor, user, attachment_ids):
+            record_ids.append(attachment.res_id)			
         return [('id', 'in', record_ids)]
 
     _columns = {

From 4ef00d70beb7a4fe13438d81b2f07ddc53a11e47 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Wed, 19 Jun 2013 17:31:33 +0530
Subject: [PATCH 373/547] [Imp] Improve code at hr_recruitment.

bzr revid: amb@tinyerp.com-20130619120133-hed015bgokzwt8ro
---
 addons/hr_recruitment/hr_recruitment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 50be3acd3bf..84dae5fa574 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -457,7 +457,7 @@ class hr_applicant(base_stage, osv.Model):
         try:
             template = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_approve_applicant')
         except ValueError:
-            pass
+            template = False
         self._get_mail_template(cr, uid, ids, template, context)
         return res
 
@@ -504,7 +504,7 @@ class hr_applicant(base_stage, osv.Model):
         try:
             template = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_refuse_applicant')
         except ValueError:
-            pass
+            template = False
         self._get_mail_template(cr, uid, ids, template, context)
         return res
     

From 812cb324b0be905bfd491a7725f591aa68cb8adb Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Wed, 19 Jun 2013 19:42:15 +0530
Subject: [PATCH 374/547] [Imp] Improve code and variable name.

bzr revid: amb@tinyerp.com-20130619141215-t06d5xykld07sy4i
---
 .../hr_applicant_document.py                    |  8 ++++----
 addons/hr_recruitment/hr_recruitment.py         | 17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index 7a1ea4f1002..f5762aabfcc 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -28,9 +28,9 @@ class hr_applicant(osv.osv):
         attachment_pool = self.pool.get('ir.attachment')
         for applicant in self.browse(cr, uid, ids, context=context):
             res[applicant.id] = 0
-            attachment_ids = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
+            attachment_ids = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)], context=context)
             if attachment_ids:
-                for attachment in attachment_pool.browse(cr, uid, attachment_ids, context):
+                for attachment in attachment_pool.browse(cr, uid, attachment_ids, context=context):
                     res[applicant.id] = attachment.index_content
         return res
 
@@ -38,8 +38,8 @@ class hr_applicant(osv.osv):
         record_ids = []
         attachment_pool = self.pool.get('ir.attachment')
         args += [('res_model','=','hr.applicant')]
-        attachment_ids = attachment_pool.search(cursor, user, args)
-        for attachment in attachment_pool.browse(cursor, user, attachment_ids):
+        attachment_ids = attachment_pool.search(cursor, user, args, context=context)
+        for attachment in attachment_pool.browse(cursor, user, attachment_ids, context=context):
             record_ids.append(attachment.res_id)			
         return [('id', 'in', record_ids)]
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 84dae5fa574..264a9ff175a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -206,7 +206,7 @@ class hr_applicant(base_stage, osv.Model):
         attachment_pool = self.pool.get('ir.attachment')
         for applicant in self.browse(cr, uid, ids, context=context):
             res[applicant.id] = 0
-            attach = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)])
+            attach = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)], context=context)
             if attach:
                 res[applicant.id] = len(attach)
         return res
@@ -455,10 +455,10 @@ class hr_applicant(base_stage, osv.Model):
     def case_close(self, cr, uid, ids, context=None):
         res = super(hr_applicant, self).case_close(cr, uid, ids, context)
         try:
-            template = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_approve_applicant')
+            template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_approve_applicant')
         except ValueError:
-            template = False
-        self._get_mail_template(cr, uid, ids, template, context)
+            template_id = False
+        self._get_mail_template(cr, uid, ids, template_id, context)
         return res
 
     def case_close_with_emp(self, cr, uid, ids, context=None):
@@ -500,18 +500,17 @@ class hr_applicant(base_stage, osv.Model):
         """
         res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
         self.write(cr, uid, ids, {'probability': 0.0})
-        template = False
         try:
-            template = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_refuse_applicant')
+            template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_refuse_applicant')
         except ValueError:
-            template = False
-        self._get_mail_template(cr, uid, ids, template, context)
+            template_id = False
+        self._get_mail_template(cr, uid, ids, template_id, context)
         return res
     
     def _get_mail_template(self, cr, uid, ids, template, context):
         mail_obj = self.pool.get('mail.mail')
         assert template._name == 'email.template'
-        for applications in self.browse(cr, uid, ids, context):
+        for applications in self.browse(cr, uid, ids, context=context):
             if applications.email_from:
                 mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, applications.id, True, context=context)
                 mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context)

From 027fb2bb2320f933f612f1b7bf0502746e14a868 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 10:24:28 +0200
Subject: [PATCH 375/547] [FIX] gamification: correct report sending

bzr revid: mat@openerp.com-20130621082428-5nxalipljwsgbi2j
---
 addons/gamification/goal.py            |  7 +++----
 addons/gamification/goal_base_data.xml |  2 +-
 addons/gamification/plan.py            | 18 ++++++------------
 addons/gamification/res_users.py       |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 32bcc3e513b..e61858c2788 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -325,16 +325,15 @@ class gamification_goal(osv.Model):
         for goal in self.browse(cr, uid, ids, context=context):
             if goal.state != "draft" and ('type_id' in vals or 'user_id' in vals):
                 # avoid drag&drop in kanban view
-                raise osv.except_osv(_('Error!'), _('Can not modify a started goal'))
+                raise osv.except_osv(_('Error!'), _('Can not modify the configuration of a started goal'))
 
-            if 'current' in vals:
+            if vals.get('current'):
                 if 'no_remind_goal' in context:
                     # new goals should not be reported
                     continue
 
                 if goal.plan_id and goal.plan_id.report_message_frequency == 'onchange':
-                    plan_obj = self.pool.get('gamification.goal.plan')
-                    plan_obj.report_progress(cr, SUPERUSER_ID, goal.plan_id, users=[goal.user_id], context=context)
+                    self.pool.get('gamification.goal.plan').report_progress(cr, SUPERUSER_ID, goal.plan_id, users=[goal.user_id], context=context)
         return result
 
     def get_action(self, cr, uid, goal_id, context=None):
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index b0e21b977cb..a97360ef9ff 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -161,7 +161,7 @@
         <th>Current</th>
         <th>Completeness</th>
     </tr>
-    % for goal in ${ctx["goals"]}:
+    % for goal in ctx["goals"]:
         <tr
             % if goal.completeness >= 100:
                 style="font-weight:bold;"
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 4375474fd05..3a823e6ce21 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -505,7 +505,7 @@ class gamification_goal_plan(osv.Model):
         if len(related_goal_ids) == 0:
             return False
 
-        values = {'goals': []}
+        goals = []
         all_done = True
         for goal in goal_obj.browse(cr, uid, related_goal_ids, context=context):
             if goal.end_date:
@@ -518,13 +518,13 @@ class gamification_goal_plan(osv.Model):
                 if goal.state == 'inprogress' or goal.state == 'inprogress_update':
                     all_done = False
 
-            values['goals'].append(goal)
+            goals.append(goal)
 
         if all_done:
             # skip plans where all goal are done or failed
             return False
         else:
-            return values
+            return goals
 
     ##### Reporting #####
 
@@ -571,19 +571,13 @@ class gamification_goal_plan(osv.Model):
         else:
             # generate individual reports
             for user in users or plan.user_ids:
-                values = self.get_indivual_goal_info(cr, uid, user.id, plan, subset_goal_ids, context=context)
-                if not values:
+                goals = self.get_indivual_goal_info(cr, uid, user.id, plan, subset_goal_ids, context=context)
+                if not goals:
                     continue
 
-                # values['object'] = plan
-                # values['user'] = user
-
-                ctx.update({'planlines_boards': planlines_boards})
+                ctx.update({'goals': goals})
                 template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_perso', context)
                 body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.goal.plan', plan.id, context=context)
-
-                # body_html = template_env.get_template('personal_progress.mako').render(values)
-
                 # send message only to users
                 self.message_post(cr, uid, 0,
                                   body=body_html,
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 3ccdf592881..28ec11eab87 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -119,7 +119,7 @@ class res_users_gamification_group(osv.Model):
                     continue
 
                 serialized_goals_info['goals'] = []
-                for goal in goals_info['goals']:
+                for goal in goals_info:
                     serialized_goals_info['goals'].append({
                         'id': goal.id,
                         'type_name': goal.type_id.name,

From 0f912e0b35949826de5ddfabb78bce88760fbe70 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 10:31:40 +0200
Subject: [PATCH 376/547] [IMP] gamification: allow translation of
 check_challenge_reward messages

bzr revid: mat@openerp.com-20130621083140-9awr071wzhrv5pzv
---
 addons/gamification/plan.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 3a823e6ce21..3760095abb4 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -638,7 +638,7 @@ class gamification_goal_plan(osv.Model):
             yesterday = date.today() - timedelta(days=1)
             if end_date == yesterday.isoformat() or force:
                 # open chatter message
-                message_body = "The challenge %s is finished." % plan.name
+                message_body = _("The challenge %s is finished." % plan.name)
 
                 # reward for everybody succeeding
                 rewarded_users = []
@@ -656,19 +656,19 @@ class gamification_goal_plan(osv.Model):
                             rewarded_users.append(user)
 
                     if rewarded_users:
-                        message_body += "<br/>Reward (badge %s) for every succeeding user was sent to %s." % (plan.reward_id.name, ", ".join([user.name for user in rewarded_users]))
+                        message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (plan.reward_id.name, ", ".join([user.name for user in rewarded_users])))
                     else:
-                        message_body += "<br/>Nobody succeeded every goal, no reward is then sent for this challenge."
+                        message_body += _("<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge.")
 
                 # reward bests
                 if plan.reward_first_id:
                     (first_user, second_user, third_user) = self.get_top3_users(cr, uid, plan, context)
                     if first_user:
                         self.reward_user(cr, uid, first_user.id, plan.reward_first_id.id, context)
-                        message_body += "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
+                        message_body += _("<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :")
                         message_body += "<br/> 1. %s - %s" % (first_user.name, plan.reward_first_id.name)
                     else:
-                        message_body += "Nobody reached the required conditions to receive special rewards."
+                        message_body += _("Nobody reached the required conditions to receive special badges.")
 
                     if second_user and plan.reward_second_id:
                         self.reward_user(cr, uid, second_user.id, plan.reward_second_id.id, context)

From 828950cf93ba26222758b571a401db34051e2735 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 11:01:39 +0200
Subject: [PATCH 377/547] [FIX] gamification: send badge as superuser

bzr revid: mat@openerp.com-20130621090139-dptxjh66ocy10bi2
---
 addons/gamification/badge.py           | 10 ++++++----
 addons/gamification/badge_data.xml     | 15 ++++++++-------
 addons/hr_gamification/gamification.py |  6 ++----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 2c44fd2f182..51c4a033803 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
@@ -29,6 +30,7 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
+
 class gamification_badge_user(osv.Model):
     """User having received a badge"""
 
@@ -206,9 +208,8 @@ class gamification_badge(osv.Model):
 
             body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.badge.user', badge_user.id, context=ctx)
 
-            # values = {'badge_user': badge_user, 'user_from': user_from}
-            # body_html = template_env.get_template('badge_received.mako').render(values)
-            res = self.message_post(cr, uid, badge.id, body=body_html, type='comment', subtype='mt_comment', context=context)
+            # as SUPERUSER as normal user don't have write access on a badge
+            res = self.message_post(cr, SUPERUSER_ID, badge.id, partner_ids=[badge_user.user_id.partner_id.id], body=body_html, type='comment', subtype='mt_comment', context=context)
         return res
 
     def check_granting(self, cr, uid, user_from_id, badge_id, context=None):
@@ -292,6 +293,7 @@ class grant_badge_wizard(osv.TransientModel):
                 }
                 badge_user = badge_user_obj.create(cr, uid, values, context=context)
                 #notify the user
-                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
+                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
 
+        return result
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/gamification/badge_data.xml b/addons/gamification/badge_data.xml
index bedd9916c16..35686b0ec4d 100644
--- a/addons/gamification/badge_data.xml
+++ b/addons/gamification/badge_data.xml
@@ -892,14 +892,15 @@
             <field name="name">Received Badge</field>
             <field name="body_html"><![CDATA[
         <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !
-        % if ctx["user_from"]
-            This badge was granted by <strong>${ctx["user_from"]}</strong>.
-        % endif
-    </p>
+            % if ctx["user_from"]
+                This badge was granted by <strong>${ctx["user_from"]}</strong>.
+            % endif
+        </p>
 
-    % if object.comment
-        <p><em>${object.comment}</em></p>
-    % endif]]></field>
+        % if object.comment
+            <p><em>${object.comment}</em></p>
+        % endif
+        ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/gamification.py
index ea86ba3b779..fcc64ca2dc2 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/gamification.py
@@ -119,10 +119,8 @@ class hr_grant_badge_wizard(osv.TransientModel):
                 }
                 badge_user = badge_user_obj.create(cr, uid, values, context=context)
 
-
-                badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
-
-        return {}
+                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
+        return result
 
 
 class hr_employee(osv.osv):

From d42eccc9b89c722ba06a648397ca02581c4b5399 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 11:12:34 +0200
Subject: [PATCH 378/547] cleaning, remove fixed TODO

bzr revid: mat@openerp.com-20130621091234-wgeuhikyrb3qvmjr
---
 addons/gamification/goal.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index e61858c2788..d8a4d10748a 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -88,8 +88,6 @@ class gamification_goal_type(osv.Model):
         'field_date_id': fields.many2one('ir.model.fields',
             string='Date Field',
             help='The date to use for the time period evaluated'),
-                #TODO: actually it would be better to use 'user.id' in the domain definition, because it means user is a browse record and it's more flexible (i can do '[(country_id,=,user.partner_id.country_id.id)])
-
         'domain': fields.char("Filter Domain",
             help="Technical filters rules to apply. Use 'user.id' (without marks) to limit the search to the evaluated user.",
             required=True),
@@ -223,7 +221,6 @@ class gamification_goal(osv.Model):
         the target value being reached, the goal is set as failed."""
 
         for goal in self.browse(cr, uid, ids, context=context):
-            #TODO: towrite may be falsy, to avoid useless write on the object. Please check the whole thing is still working
             towrite = {}
             if goal.state in ('draft', 'canceled'):
                 # skip if goal draft or canceled
@@ -247,7 +244,7 @@ class gamification_goal(osv.Model):
                 obj = self.pool.get(goal.type_id.model_id.model)
                 field_date_name = goal.type_id.field_date_id.name
 
-                # eval the domain with user_id replaced by goal user
+                # eval the domain with user replaced by goal user object
                 domain = safe_eval(goal.type_id.domain, {'user': goal.user_id})
 
                 #add temporal clause(s) to the domain if fields are filled on the goal
@@ -269,7 +266,6 @@ class gamification_goal(osv.Model):
                     towrite['current'] = new_value
 
             # check goal target reached
-            #TODO: reached condition is wrong because it should check time constraints.
             if (goal.type_id.condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.type_id.condition == 'lower' and towrite.get('current', goal.current) <= goal.target_goal):
                 towrite['state'] = 'reached'
 

From 312d3ffc9c936f220476928692a8dd457700e80c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 13:07:27 +0200
Subject: [PATCH 379/547] [IMP] updating the docs

bzr revid: mat@openerp.com-20130621110727-1dqkre4h61vjnq7g
---
 .../doc/gamification_plan_howto.rst           |  4 +-
 addons/gamification/doc/goal.rst              |  4 +-
 addons/gamification/doc/goal_type.rst         | 37 +++++++++++++++++++
 addons/gamification/doc/index.rst             |  9 ++++-
 4 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 addons/gamification/doc/goal_type.rst

diff --git a/addons/gamification/doc/gamification_plan_howto.rst b/addons/gamification/doc/gamification_plan_howto.rst
index 5669c0408db..1dffe60631e 100644
--- a/addons/gamification/doc/gamification_plan_howto.rst
+++ b/addons/gamification/doc/gamification_plan_howto.rst
@@ -9,9 +9,9 @@ A module to create and manage groceries lists has been developped. To motivate u
 Module
 ++++++
 
-The challenge for my addon will consist of an auto-installed module containing only the definition of goals. Goal type are quite technical to create and should not be seen or modified through the web interface.
+The challenge for my addon will consist of an auto-installed module containing only the definition of goals. Goal type are quite technical to create and should not be seen or modified through the web interface. By default, goal types can only be modified by "Gamification Manager". After installing the hr_gamification module, HR Officers will be able to see goal types but not modying it.
 
-If our groceries module is called ``groceries``, the structure will be consisted of three addons :
+If our groceries module is called ``groceries``, the addons structure will be consisted of three addons :
 
 ::
 
diff --git a/addons/gamification/doc/goal.rst b/addons/gamification/doc/goal.rst
index e315931462f..f82cb7b4cbb 100644
--- a/addons/gamification/doc/goal.rst
+++ b/addons/gamification/doc/goal.rst
@@ -8,8 +8,6 @@ Models
 
 ``gamification.goal`` for the generated goals from plans
 
-.. versionchanged:: 7.0
-
 Fields
 ++++++
 
@@ -35,7 +33,7 @@ Fields
  - ``type_description`` : related field from the linked goal type
  - ``type_suffix`` : related field from the linked goal type
  - ``type_condition`` : related field from the linked goal type
-
+ - ``type_display`` : related field from the linked goal type
 
 Methods
 +++++++
diff --git a/addons/gamification/doc/goal_type.rst b/addons/gamification/doc/goal_type.rst
new file mode 100644
index 00000000000..519e679db8d
--- /dev/null
+++ b/addons/gamification/doc/goal_type.rst
@@ -0,0 +1,37 @@
+.. _gamification_goal_type:
+
+gamification.goal.type
+======================
+
+Models
+++++++
+
+``gamification.goal.type`` for the shared behaviour of goals
+
+Fields
+++++++
+
+ - ``name`` : The name of the goal type.
+ - ``description`` : Explain briefly in non-technical terms what the goal evaluates
+ - ``computation_mode`` : How is computed the current value for each individual goal
+    - ``manually`` : the user will set the value itself, no computation
+    - ``count`` : the result is the number of lines returned by a search (eg: number of phone calls)
+    - ``sum`` : the total of the value of a chosen field for each record returned by the search (eg: total amount of all invoices)
+    - ``python`` : for complex computation, will execute a chosen method
+ - ``display_mode`` : How is represented the current value of a goal
+    - ``progress`` : numerical value (eg: an amount)
+    - ``checkbox`` : boolean value with only two state: todo and done (eg: select a timezone)
+
+ - ``suffix`` : text suffix added to the result
+ - ``full_suffix`` : function field combining the monetary and suffix field (eg: €/month, $ expected)
+ - ``model_id`` : the model to evaluate for count and sum goals (eg: Invoices)
+ - ``field_id`` : for sum goals only, the field of model_id that will be evaluated through the computation
+ - ``field_date_id`` : the date to evaluate to restrict the search on a time interval for count and sum goals (eg: validation date)
+ - ``domain`` : Additional restrictions in the form of a domain. To restric the search to a user, use the keyword 'user', can be chained. Eg: ``[('state', '=', 'done'), ('user_id', '=', user.id)]`` or ``[('company_id', '=', user.company_id.id)]``
+ - ``compute_code`` : for python goals only, the method of type gamification.goal.type to execute (eg: self.my_method(cr, uid))
+ - ``condition`` : when is the goal considered as reacher
+    - ``higher`` : when the current value is higher or equal than the target
+    - ``lower`` : when the current value is smaller or equal than the target
+ - ``sequence`` : to order list of goals in a challenger
+ - ``action_id`` : the XML id to of an ir.actions.act_window to execute when the user clicks on a goal on the home page
+ - ``res_id_field`` : the res_id used by the action, using user as for the domain (eg: user.company_id.id)
diff --git a/addons/gamification/doc/index.rst b/addons/gamification/doc/index.rst
index ac48fe051b5..749689ffc9c 100644
--- a/addons/gamification/doc/index.rst
+++ b/addons/gamification/doc/index.rst
@@ -9,9 +9,14 @@ A **Goal** is an objective applied to an user with a numerical target to reach.
 
 A **Goal Type** is a generic objective that can be applied to any structure stored in the database and use numerical value. The creation of goal types is quite technical and should rarely be done. Once a generic goal is created, it can be associated to several goal plans with different numerical targets.
 
-A **Goal Plan** is a a set of goal types with a target value to reach applied to a group of users. It can be periodic to create and evaluate easily the performances of a team.
+A **Goal Plan** (also called Challenge in the interface) is a a set of goal types with a target value to reach applied to a group of users. It can be periodic to create and evaluate easily the performances of a team.
 
 Badges
 ------
-A **Badge** is a symbolic token granted to a user as a sign of reward. It can be offered by a user to another or automatically offered when some conditions are met. The conditions can either be a list of goal types succeeded or a user definied python code executed.
+A **Badge** is a symbolic token granted to a user as a sign of reward. It can be offered by a user to another freely or with some required conditions (selected users, max. number of time per month, etc.).
 
+.. toctree::
+   :maxdepth: 1
+   
+   gamification_plan_howto
+   
\ No newline at end of file

From bb548a1d4ebc403b531cc90d12f12a0e5b5edc38 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 13:07:58 +0200
Subject: [PATCH 380/547] [IMP] improving the computation of res_id_field with
 safe eval

bzr revid: mat@openerp.com-20130621110758-zo20gjzaecv4iu41
---
 addons/gamification/goal.py            | 8 +-------
 addons/gamification/goal_base_data.xml | 8 ++++----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index d8a4d10748a..833d8de9c2f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -179,7 +179,6 @@ class gamification_goal(osv.Model):
             help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
 
         'type_description': fields.related('type_id', 'description', type='char', string='Type Description', readonly=True),
-        'type_suffix': fields.related('type_id', 'suffix', type='char', string='Type Description', readonly=True),
         'type_condition': fields.related('type_id', 'condition', type='char', string='Type Condition', readonly=True),
         'type_suffix': fields.related('type_id', 'full_suffix', type="char", string="Suffix", readonly=True),
         'type_display': fields.related('type_id', 'display_mode', type="char", string="Display Mode", readonly=True),
@@ -345,12 +344,7 @@ class gamification_goal(osv.Model):
 
             if goal.type_id.res_id_field:
                 current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-                # this loop manages the cases where res_id_field is a browse record path (eg : company_id.currency_id.id)
-                field_names = goal.type_id.res_id_field.split('.')
-                res = current_user
-                for field_name in field_names[:]:
-                    res = res.__getitem__(field_name)
-                action['res_id'] = res
+                action['res_id'] = safe_eval(goal.type_id.res_id_field, {'user': current_user})
 
                 # if one element to display, should see it in form mode if possible
                 views = action['views']
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index a97360ef9ff..c4a5f8d73b8 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -11,7 +11,7 @@
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id','=',user.id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_users_my')" />
-            <field name="res_id_field">id</field>
+            <field name="res_id_field">user.id</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_avatar">
@@ -21,7 +21,7 @@
             <field name="display_mode">checkbox</field>
             <!-- problem : default avatar != False -> manually + check in write function -->
             <field name="action_id" eval="ref('base.action_res_users_my')" />
-            <field name="res_id_field">id</field>
+            <field name="res_id_field">user.id</field>
         </record>
 
 
@@ -33,7 +33,7 @@
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user.id), ('name', '!=', 'Your Company')]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
-            <field name="res_id_field">company_id.id</field>
+            <field name="res_id_field">user.company_id.id</field>
         </record>
 
         <record model="gamification.goal.type" id="type_base_company_logo">
@@ -43,7 +43,7 @@
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user.id),('logo', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
-            <field name="res_id_field">company_id.id</field>
+            <field name="res_id_field">user.company_id.id</field>
         </record>
 
         <record id="action_new_simplified_res_users" model="ir.actions.act_window">

From 2c85b5a006f39d8a58167cfd88a670b982dc8258 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 13:11:16 +0200
Subject: [PATCH 381/547] [IMP] updating doc for new user keyword

bzr revid: mat@openerp.com-20130621111116-2vls38to6ds72421
---
 addons/gamification/doc/gamification_plan_howto.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/doc/gamification_plan_howto.rst b/addons/gamification/doc/gamification_plan_howto.rst
index 1dffe60631e..b0e8d1603b8 100644
--- a/addons/gamification/doc/gamification_plan_howto.rst
+++ b/addons/gamification/doc/gamification_plan_howto.rst
@@ -58,25 +58,25 @@ To be able to compute the number of lines, the model containing groceries is req
     <field name="field_date_id" eval="ref('groceries.field_groceries_item_shopping_day')" />
   </record>
 
-As we do not want to count every recorded item, we will use a domain to restrict the selection on the user (display the count only for the items the users has bought) and the state (only the items whose list is confirmed are included). The user restriction is made with the keyword ``user_id`` in the domain and should correspond to a many2one field with the relation ``res.users``. During the evaluation, it is replaced by the user ID of the linked goal.
+As we do not want to count every recorded item, we will use a domain to restrict the selection on the user (display the count only for the items the users has bought) and the state (only the items whose list is confirmed are included). The user restriction is made with the keyword ``user`` in the domain and should correspond to a many2one field with the relation ``res.users``. During the evaluation, it is replaced by the user of the linked goal. As we need the user ID of, we user ``user.id``.
 
 ::
 
   <record model="gamification.goal.type" id="type_groceries_nbr_items">
     ...
-    <field name="domain">[('shopper_id', '=', user_id), ('list_id.state', '=', 'confirmed')]</field>
+    <field name="domain">[('shopper_id', '=', user.id), ('list_id.state', '=', 'confirmed')]</field>
   </record>
 
 An action can also be defined to help users to quickly reach the screen where they will be able to modify their current value. This is done by adding the XML ID of the ir.action we want to call. In our example, we would like to open the grocery list form view owned by the user.
 
-If we do not specify a res_id to the action, only the list of records can be displayed. The restriction is done with the field ``res_id_field`` containing the field name of the user profile containing the required id. In our example, we assume the res.users model has been extended with a many2one field ``groceries_list`` to the model ``groceries.list``.
+If we do not specify a res_id to the action, only the list of records can be displayed. The restriction is done with the field ``res_id_field`` containing the field name from the user profile containing the required id. The parsing mechanism is the same as for the domain of a goal, using the keyword 'user' that wil lbe replaced by the current user. In our example, we assume the res.users model has been extended with a many2one field ``groceries_list`` to the model ``groceries.list``.
 
 ::
 
   <record model="gamification.goal.type" id="type_groceries_nbr_items">
     ...
     <field name="action_id">groceries.action_groceries_list_form</field>
-    <field name="res_id_field">groceries_list.id</field>
+    <field name="res_id_field">user.groceries_list.id</field>
   </record>
 
 

From e6833f4b3c4cc3948e7ef19bddb473e7ba9d2fae Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 25 Jun 2013 16:51:00 +0200
Subject: [PATCH 382/547] [IMP] small twaeks in doc

bzr revid: mat@openerp.com-20130625145100-7ko58fj4z0p3ouqc
---
 addons/gamification/doc/goal_type.rst | 5 +++++
 addons/gamification/doc/index.rst     | 2 ++
 addons/gamification/goal_type_data.py | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/doc/goal_type.rst b/addons/gamification/doc/goal_type.rst
index 519e679db8d..4da960b3371 100644
--- a/addons/gamification/doc/goal_type.rst
+++ b/addons/gamification/doc/goal_type.rst
@@ -35,3 +35,8 @@ Fields
  - ``sequence`` : to order list of goals in a challenger
  - ``action_id`` : the XML id to of an ir.actions.act_window to execute when the user clicks on a goal on the home page
  - ``res_id_field`` : the res_id used by the action, using user as for the domain (eg: user.company_id.id)
+
+Methods
++++++++
+
+Add new methods inheriting from this class to add goal type with python computation mode. Look at the example in ``gamification/goal_type_data.py``
\ No newline at end of file
diff --git a/addons/gamification/doc/index.rst b/addons/gamification/doc/index.rst
index 749689ffc9c..85d4ffe2048 100644
--- a/addons/gamification/doc/index.rst
+++ b/addons/gamification/doc/index.rst
@@ -18,5 +18,7 @@ A **Badge** is a symbolic token granted to a user as a sign of reward. It can be
 .. toctree::
    :maxdepth: 1
    
+   goal_type
+   goal
    gamification_plan_howto
    
\ No newline at end of file
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/goal_type_data.py
index 24be886ab75..ccde88e53f0 100644
--- a/addons/gamification/goal_type_data.py
+++ b/addons/gamification/goal_type_data.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import osv
 
+
 class gamification_goal_type_data(osv.Model):
     """Goal type data
 
@@ -30,7 +31,6 @@ class gamification_goal_type_data(osv.Model):
     """
     _inherit = 'gamification.goal.type'
 
-#TODO: is it usefull to have this method in a standalone file? why not directly in the computation field of the related goal type?
     def number_following(self, cr, uid, xml_id="mail.thread", context=None):
         """Return the number of 'xml_id' objects the user is following
 

From 2718403134a72fe95bd2b717f07b0a2c213cd6bf Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 2 Jul 2013 16:52:47 +0200
Subject: [PATCH 383/547] [IMP] gamification: no report by default

bzr revid: mat@openerp.com-20130702145247-ypqxp4idv5qxudqd
---
 addons/gamification/plan.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 3760095abb4..0e5fc63f689 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -192,8 +192,8 @@ class gamification_goal_plan(osv.Model):
     _defaults = {
         'period': 'once',
         'state': 'draft',
-        'visibility_mode' : 'progressbar',
-        'report_message_frequency' : 'onchange',
+        'visibility_mode': 'progressbar',
+        'report_message_frequency': 'never',
         'last_report_date': fields.date.today,
         'start_date': fields.date.today,
         'manager_id': lambda s, cr, uid, c: uid,

From 6c9f08cfbb005ca8252290301752edb4e0b7cd75 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Jul 2013 12:25:07 +0200
Subject: [PATCH 384/547] [fix] gamification: correctly evaluate completness

bzr revid: mat@openerp.com-20130703102507-i85owm4ptmnulplc
---
 addons/gamification/badge.py | 4 ++--
 addons/gamification/goal.py  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 51c4a033803..b562c6f7a7d 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -98,10 +98,10 @@ class gamification_badge(osv.Model):
         result = dict.fromkeys(ids, False)
         for badge in self.browse(cr, uid, ids, context=context):
             if self._can_grant_badge(cr, uid, uid, badge.id, context) != 1:
-                #if the user cannot grant this badge at all, result is 0
+                # if the user cannot grant this badge at all, result is 0
                 result[badge.id] = 0
             elif not badge.rule_max:
-                #if there is no limitation, -1 is returned which mean 'infinite'
+                # if there is no limitation, -1 is returned which means 'infinite'
                 result[badge.id] = -1
             else:
                 result[badge.id] = badge.rule_max_number - badge.stat_my_monthly_sending
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 833d8de9c2f..6657b76ce3a 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -130,11 +130,13 @@ class gamification_goal(osv.Model):
         """Return the percentage of completeness of the goal, between 0 and 100"""
         res = dict.fromkeys(ids, 0.0)
         for goal in self.browse(cr, uid, ids, context=context):
-            if goal.type_condition == 'higher' and goal.current > 0:
+            if goal.type_condition == 'higher':
                 res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
             elif goal.current < goal.target_goal:
                 # a goal 'lower than' has only two values possible: 0 or 100%
                 res[goal.id] = 100.0
+            else:
+                res[goal.id] = 0.0
         return res
 
     def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):

From 2e3ec5e2e92b76703eecb76d31c085157aba5b98 Mon Sep 17 00:00:00 2001
From: Mohammed Shekha <msh@openerp.com>
Date: Wed, 3 Jul 2013 18:42:23 +0530
Subject: [PATCH 385/547] [FIX]Fixed the issue of last element of grouped row
 removed, due to which grouped total information also got lost.

bzr revid: msh@openerp.com-20130703131223-bwu6hl8v5y5sjt5w
---
 addons/web/static/src/js/view_list.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 74c2fc47aee..a9f110eac28 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1280,7 +1280,8 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
         }
     },
     close: function () {
-        this.$row.children().last().empty();
+        this.$row.children().last().find('button').remove();
+        this.$row.children().last().find('span').remove();
         this.records.reset();
     },
     /**

From 258b58675ce0036bbf4c1d5f7abfc5aae398cb5f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Jul 2013 15:52:27 +0200
Subject: [PATCH 386/547] [fix] use justgage library from sale_crm

bzr revid: mat@openerp.com-20130703135227-m409fmvh5t1ne3o6
---
 addons/gamification/__openerp__.py | 3 ++-
 addons/gamification/goal_view.xml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index aaa4565cf43..444299b9ffb 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -56,7 +56,8 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
     'css': ['static/src/css/gamification.css'],
     'js': [
         'static/src/js/gamification.js',
-        'static/lib/justgage/justgage.js',
+        # conficting with justgage from sale_crm
+        # 'static/lib/justgage/justgage.js',
     ],
     'qweb': ['static/src/xml/gamification.xml'],
 }
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index d1da5f027d1..9e1e692359f 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -163,7 +163,7 @@
                                         </t>
                                         <t t-if="record.type_display.raw_value == 'progress'">
                                             <t t-if="record.type_condition.raw_value =='higher'">
-                                                <field name="current" widget="goal" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}"/>
+                                                <field name="current" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}" />
                                             </t>
                                             <t t-if="record.type_condition.raw_value != 'higher'">
                                                 <div t-attf-class="oe_goal_state #{record.current.raw_value == record.target_goal.raw_value+1 ? 'oe_orange' : record.current.raw_value &gt; record.target_goal.raw_value ? 'oe_red' : 'oe_green'}">

From 84bb3d0fd5863bb92696e1484832d9f422e721d4 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Mon, 15 Jul 2013 15:40:35 +0530
Subject: [PATCH 387/547] [IMP] Remove Dependancy document_ftp.

bzr revid: jir@tinyerp.com-20130715101035-3kure8xsc7rs9b3j
---
 addons/hr_recruitment/hr_recruitment_view.xml | 1 +
 addons/hr_recruitment/res_config.py           | 4 ++--
 addons/hr_recruitment/res_config_view.xml     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 0b210f62ccc..d99c1f70f18 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -125,6 +125,7 @@
                         <field name="response" invisible="1"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <field name="company_id" />
                         <label for="availability"/>
                         <div>
                             <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index ba86722a6bc..56218c3183c 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -26,9 +26,9 @@ class hr_applicant_settings(osv.osv_memory):
     _inherit = ['hr.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'module_document_ftp': fields.boolean('Allow the automatic indexation of resumes',
+        'module_document': fields.boolean('Allow the automatic indexation of resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
-                This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
+                This installs the module document. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
  
     }
 
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index e341e39c0a4..b0dfc5bb232 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -15,8 +15,8 @@
             <field name="arch" type="xml">
                 <div name="recruitment" position="inside">
                     <div>
-                        <field name="module_document_ftp" class="oe_inline"/>
-                        <label for="module_document_ftp"/>
+                        <field name="module_document" class="oe_inline"/>
+                        <label for="module_document"/>
                     </div>
                 </div>
             </field>

From 1d391ebb33d602316f2f467fd987767b62bc6f58 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Tue, 16 Jul 2013 14:36:53 +0530
Subject: [PATCH 388/547] [FIX]Resolve conflicts.

bzr revid: bth@tinyerp.com-20130716090653-4xrtndazb02k2kof
---
 addons/hr_recruitment/hr_recruitment.py | 61 -------------------------
 1 file changed, 61 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 9d8e1669aad..65bec6965d7 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -421,28 +421,6 @@ class hr_applicant(osv.Model):
             self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('Applicant <b>created</b>'), subtype="hr_recruitment.mt_job_new_applicant", context=context)
         return obj_id
 
-<<<<<<< TREE
-    def case_open(self, cr, uid, ids, context=None):
-        """
-            open Request of the applicant for the hr_recruitment
-        """
-        res = super(hr_applicant, self).case_open(cr, uid, ids, context)
-        date = self.read(cr, uid, ids, ['date_open'])[0]
-        if not date['date_open']:
-            self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
-        return res
-
-    def case_close(self, cr, uid, ids, context=None):
-        res = super(hr_applicant, self).case_close(cr, uid, ids, context)
-        try:
-            template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_approve_applicant')
-        except ValueError:
-            template_id = False
-        self._get_mail_template(cr, uid, ids, template_id, context)
-        return res
-
-    def case_close_with_emp(self, cr, uid, ids, context=None):
-=======
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -457,7 +435,6 @@ class hr_applicant(osv.Model):
 
     def create_employee_from_applicant(self, cr, uid, ids, context=None):
         """ Create an hr.employee from the hr.applicants """
->>>>>>> MERGE-SOURCE
         if context is None:
             context = {}
         hr_employee = self.pool.get('hr.employee')
@@ -490,44 +467,6 @@ class hr_applicant(osv.Model):
         dict_act_window['view_mode'] = 'form,tree'
         return dict_act_window
 
-<<<<<<< TREE
-    def case_cancel(self, cr, uid, ids, context=None):
-        """Overrides cancel for crm_case for setting probability
-        """
-        res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        try:
-            template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'email_template_refuse_applicant')
-        except ValueError:
-            template_id = False
-        self._get_mail_template(cr, uid, ids, template_id, context)
-        return res
-    
-    def _get_mail_template(self, cr, uid, ids, template, context):
-        mail_obj = self.pool.get('mail.mail')
-        assert template._name == 'email.template'
-        for applications in self.browse(cr, uid, ids, context=context):
-            if applications.email_from:
-                mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, applications.id, True, context=context)
-                mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context)
-                if mail_state and mail_state['state'] == 'exception':
-                    raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context)
-    
-    def case_pending(self, cr, uid, ids, context=None):
-        """Marks case as pending"""
-        res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as draft
-        """
-        res = super(hr_applicant, self).case_reset(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
-        return res
-
-=======
->>>>>>> MERGE-SOURCE
     def set_priority(self, cr, uid, ids, priority, *args):
         """Set applicant priority
         """

From 89d03a854ada9de9cc14c896805f0daa08cfbdfe Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 22 Aug 2013 18:05:34 +0530
Subject: [PATCH 389/547] [IMP]base_calander: Add create method for crm.meeting
 Update the Doc remove crm.meeting inheritance from .py file

bzr revid: dbr@tinyerp.com-20130822123534-zx3uxdjojoj55bqn
---
 addons/base_calendar/crm_meeting.py     |  9 +++++++++
 addons/hr_recruitment/doc/changelog.rst |  2 ++
 addons/hr_recruitment/hr_recruitment.py | 10 +---------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 66823e0b8f4..38d3683fabd 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -64,6 +64,15 @@ class crm_meeting(osv.Model):
         'state': 'open',
     }
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj = self.browse(cr, uid, res, context=context)
+        if 'active_model' in context and context['active_model'] == 'hr.applicant':
+            self.pool.get('hr.applicant').log_meeting_in_parent(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
+        return res
+
     def message_get_subscription_data(self, cr, uid, ids, context=None):
         res = {}
         for virtual_id in ids:
diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
index 404b94ee6d1..7fb714c8ea0 100644
--- a/addons/hr_recruitment/doc/changelog.rst
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -14,3 +14,5 @@ Changelog
   - ``hr.recruitment.stage``: removed ``state`` field.
 
 - Removed ``hired.employee`` wizard.
+
+- Add new method ``log_meeting_in_parent``.
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index cf091925c92..e168749ef35 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -281,7 +281,7 @@ class hr_applicant(osv.Model):
             return stage_ids[0]
         return False
 
-    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
+    def log_meeting_in_parent(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
          if not duration:
              message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting_date, meeting_subject)
          else:
@@ -518,12 +518,4 @@ class applicant_category(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
 
-class crm_meeting(osv.Model):
-    _inherit = 'crm.meeting'
-
-    def create(self, cr, uid, vals, context=None):
-        if 'active_ids' in context and 'active_model' in context and context['active_model'] == 'hr.applicant':
-            self.pool.get('hr.applicant').log_meeting(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
-        return super(crm_meeting, self).create(cr, uid, vals, context=context)
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From a8063ba55c22c16891169f1cf7e47572a95ddc3b Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Fri, 23 Aug 2013 11:03:50 +0530
Subject: [PATCH 390/547] [imp] improve typo and on create employee behave at
 hr application.

bzr revid: amb@tinyerp.com-20130823053350-mpknggcrgl1504ta
---
 addons/hr_recruitment/hr_recruitment.py       | 2 +-
 addons/hr_recruitment/hr_recruitment_data.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 981b8364c21..e1054a368c5 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -450,7 +450,7 @@ class hr_applicant(osv.Model):
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
                                                      'department_id': applicant.department_id.id or False,
-                                                     'address_id': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.id or False,
+                                                     'address_id': applicant.job_id and applicant.job_id.company_id and applicant.job_id.company_id.id or False,
                                                      'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
                                                      'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
                                                      })
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index b2faf34390b..d3cbc9fff0e 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -221,7 +221,7 @@
         <field name="lang">${object.lang}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field eval="0" name="user_signature"/>
-        <field name="body_html"><![CDATA[<p>Dear Madam, Dear Sir,</p>
+        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
         <p>We thank you for your interest in our company and for your application.
         Unfortunately, your profile does not match with our needs or our recruitment campaign has reached its term.</p>
         <p>If you want more details, feel free to contact us by phone.</p>

From cb15c354dd73e638c1eaf0287d6aabec7f53daea Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 23 Aug 2013 15:06:17 +0530
Subject: [PATCH 391/547] [IMP]:Update label

bzr revid: dbr@tinyerp.com-20130823093617-3aa3h798n6ydt0m1
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 443ec911e0d..00646c2dc46 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -171,7 +171,7 @@ class hr_applicant(osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Subject / Application Name', size=128, required=True),
+        'name': fields.char('Subject', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),

From 93a6e3e4e282ddbb04ab627e81aa6b73ee65acd2 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Mon, 26 Aug 2013 12:56:57 +0530
Subject: [PATCH 392/547] [imp] improve job position onchange and create
 employee behave.

bzr revid: amb@tinyerp.com-20130826072657-g878z32sxr2qbb6i
---
 addons/hr_applicant_document/hr_applicant_document_view.xml | 5 -----
 addons/hr_recruitment/hr_recruitment.py                     | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/hr_applicant_document_view.xml
index 277441d6d50..247c708a138 100644
--- a/addons/hr_applicant_document/hr_applicant_document_view.xml
+++ b/addons/hr_applicant_document/hr_applicant_document_view.xml
@@ -19,11 +19,6 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="document.view_document_file_tree"/>
             <field name="domain">[('res_model','=','hr.applicant')]</field>
-            <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-             Search through resumes and motivation letters.
-            </p>
-            </field>
         </record>
 
         <menuitem
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e1054a368c5..44387098eed 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -262,6 +262,8 @@ class hr_applicant(osv.Model):
             job_record = self.pool.get('hr.job').browse(cr, uid, job_id, context=context)
             if job_record and job_record.department_id:
                 return {'value': {'department_id': job_record.department_id.id}}
+            else:
+                return {'value': {'department_id': False}}
         return {}
 
     def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
@@ -450,7 +452,7 @@ class hr_applicant(osv.Model):
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
                                                      'department_id': applicant.department_id.id or False,
-                                                     'address_id': applicant.job_id and applicant.job_id.company_id and applicant.job_id.company_id.id or False,
+                                                     'address_id': applicant.company_id and applicant.company_id.partner_id and applicant.company_id.partner_id.id or False,
                                                      'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
                                                      'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
                                                      })

From 0121007fc8982e74fce6f374a787fc6ed7171014 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Mon, 26 Aug 2013 16:24:54 +0530
Subject: [PATCH 393/547] [imp] remove arrow from job position menu.

bzr revid: amb@tinyerp.com-20130826105454-4umit3zxy6c3mbah
---
 addons/hr_applicant_document/hr_applicant_document_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/hr_applicant_document_view.xml
index 247c708a138..706a1b4c754 100644
--- a/addons/hr_applicant_document/hr_applicant_document_view.xml
+++ b/addons/hr_applicant_document/hr_applicant_document_view.xml
@@ -19,6 +19,11 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="document.view_document_file_tree"/>
             <field name="domain">[('res_model','=','hr.applicant')]</field>
+            <field name="help" type="html">
+            <p>
+             Search through resumes and motivation letters.
+            </p>
+            </field>
         </record>
 
         <menuitem

From deb6e08d6dc98f8d0afa1d6a54f5be2174aef96a Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Tue, 27 Aug 2013 16:47:46 +0530
Subject: [PATCH 394/547] [FIX] make changes in css/sass according to trunk
 AGAIN.

bzr revid: vme@tinyerp.com-20130827111746-c7z5pb2y4cweb63f
---
 addons/web_kanban/static/src/css/kanban.css  | 1193 ++++++++++--------
 addons/web_kanban/static/src/css/kanban.sass |    6 +
 2 files changed, 677 insertions(+), 522 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 8e4b2a73ae1..3ead4ed7135 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,523 +1,661 @@
-@charset "utf-8";
 .openerp .oe_kanban_view {
   background: white;
-  height: inherit; }
-  .openerp .oe_kanban_view .oe_view_nocontent {
-    position: relative;
-    z-index: 1;
-    max-width: none;
-    height: 100%; }
-    .openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_content {
-      margin-left: 90px;
-      margin-top: 5px;
-      max-width: 700px; }
-    .openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_bg {
-      background: #eeeeee;
-      opacity: 0.7;
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      z-index: -1; }
-  .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
-    background: url(/web/static/src/img/form_sheetbg.png);
-    width: 100%; }
-  .openerp .oe_kanban_view .oe_kanban_group_length {
-    text-align: center;
-    display: none; }
-    .openerp .oe_kanban_view .oe_kanban_group_length .oe_tag {
-      position: relative;
-      top: 8px;
-      font-weight: bold; }
-  .openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
-    display: none; }
-  .openerp .oe_kanban_view .ui-sortable-placeholder {
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    visibility: visible !important; }
-  .openerp .oe_kanban_view .ui-sortable-helper {
-    -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
-    -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
-    -box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
-    -moz-transform: rotate(3deg);
-    -webkit-transform: rotate(3deg);
-    -o-transform: rotate(3deg);
-    -ms-transform: rotate(3deg);
-    -webkit-transition: -webkit-transform 100ms linear;
-    -moz-transition: -moz-transform 100ms linear;
-    transition: transform 100ms linear; }
-  .openerp .oe_kanban_view .oe_kanban_left {
-    float: left; }
-  .openerp .oe_kanban_view .oe_kanban_right {
-    float: right; }
-  .openerp .oe_kanban_view .oe_kanban_clear {
-    clear: both; }
-  .openerp .oe_kanban_view .oe_kanban_content {
-    word-wrap: break-word; }
-    .openerp .oe_kanban_view .oe_kanban_content .oe_star_on, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off {
-      color: #cccccc;
-      text-shadow: 0 0 2px black;
-      vertical-align: top;
-      position: relative;
-      top: -5px; }
-      .openerp .oe_kanban_view .oe_kanban_content .oe_star_on:hover, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off:hover {
-        text-decoration: none; }
-    .openerp .oe_kanban_view .oe_kanban_content .oe_star_on {
-      color: gold; }
-    .openerp .oe_kanban_view .oe_kanban_content div:first-child {
-      margin-right: 16px; }
-  .openerp .oe_kanban_view .oe_kanban_button_new {
-    color: white;
-    background: #dc5f59; }
-  .openerp .oe_kanban_view .oe_kanban_groups {
-    height: inherit; }
-  .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_groups {
-    width: 100%; }
-  .openerp .oe_kanban_view.oe_kanban_grouped_by_m2o .oe_kanban_group_title {
-    cursor: move; }
-  .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban {
-    float: right; }
-  .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban > span {
-    visibility: hidden; }
-  .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban > span {
-    visibility: visible; }
-  .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_menu {
-    font-weight: normal;
-    font-size: 13px; }
-  .openerp .oe_kanban_view .oe_kanban_group_title {
-    position: relative;
-    font-size: 16px;
-    font-weight: bold;
-    color: #333333;
-    text-shadow: 0 1px 0 white;
-    margin-right: 30px;
-    width: 200px; }
-    .openerp .oe_kanban_view .oe_kanban_group_title .oe_kanban_group_title_text {
-      margin-right: 4px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis; }
-  .openerp .oe_kanban_view .oe_fold_column .oe_kanban_group_length {
-    position: absolute;
-    top: -1px;
-    right: -14px;
-    float: right;
-    display: block; }
-  .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
-    width: 185px;
-    min-width: 185px; }
-    .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column.oe_kanban_group_folded, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header.oe_kanban_group_folded {
-      width: auto;
-      min-width: 30px; }
-  .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
-    vertical-align: top;
-    padding: 5px 5px 5px 4px; }
-    .openerp .oe_kanban_view .oe_kanban_column ul, .openerp .oe_kanban_view .oe_kanban_column li, .openerp .oe_kanban_view .oe_kanban_group_header ul, .openerp .oe_kanban_view .oe_kanban_group_header li {
-      margin: 0;
-      padding: 0;
-      list-style-type: none; }
-  .openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group {
-    padding: 0px; }
-  .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
-    background: #f0eeee;
-    border-left: 1px solid #f0f8f8;
-    border-right: 1px solid #b9b9b9; }
-  .openerp .oe_kanban_view .oe_form .oe_kanban_column {
-    padding: 0px;
-    background: white; }
-  .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards {
-    height: 100%; }
-  .openerp .oe_kanban_view .oe_kanban_aggregates {
-    padding: 0;
-    margin: 0px; }
-  .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add {
-    display: none; }
-  .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_length {
-    display: block; }
-  .openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
-    left: -5px; }
-  .openerp .oe_kanban_view .oe_kanban_group_title_undefined {
-    color: #666666; }
-  .openerp .oe_kanban_view .oe_kanban_group_title_vertical {
-    writing-mode: tb-rl;
-    -webkit-transform: rotate(90deg);
-    -moz-transform: rotate(90deg);
-    -o-transform: rotate(90deg);
-    -ms-transform: rotate(90deg);
-    transform: rotate(90deg);
-    width: 30px;
-    font-size: 24px;
-    white-space: nowrap;
-    display: none;
-    position: relative;
-    opacity: 0.75;
-    top: 26px; }
-  .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
-    margin-left: 4px;
-    cursor: pointer;
-    position: relative; }
-  .openerp .oe_kanban_view .oe_kanban_add {
-    top: -8px;
-    z-index: 2; }
-  .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
-    top: -2px;
-    height: 14px; }
-  .openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {
-    cursor: pointer;
-    display: inline-block; }
-  .openerp .oe_kanban_view .oe_kanban_add {
-    float: right; }
-  .openerp .oe_kanban_view .oe_kanban_quick_create_buttons {
-    margin: 4px 0; }
-  .openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
-    width: 185px;
-    padding: 10px; }
-  .openerp .oe_kanban_view .oe_kanban_quick_create {
-    z-index: 2; }
-  .openerp .oe_kanban_view .oe_kanban_quick_create input {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    outline: none;
-    border: 1px solid transparent;
-    display: block;
-    margin-bottom: 8px;
-    font-size: 13px;
-    width: 100%;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    -box-shadow: none; }
-    .openerp .oe_kanban_view .oe_kanban_quick_create input:focus {
-      border: 1px solid #a6a6fe;
-      -moz-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
-      -webkit-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
-      -box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset; }
-  .openerp .oe_kanban_view .oe_kanban_vignette {
-    padding: 8px;
-    min-height: 100px; }
-  .openerp .oe_kanban_view .oe_kanban_image {
-    display: inline-block;
-    vertical-align: top;
-    width: 64px;
-    height: 64px;
-    text-align: center;
-    overflow: hidden;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); }
-  .openerp .oe_kanban_view .oe_kanban_details {
-    display: inline-block;
-    vertical-align: top;
-    width: 240px;
-    font-size: 13px;
-    padding: 0 5px;
-    color: #4c4c4c; }
-    .openerp .oe_kanban_view .oe_kanban_details h4 {
-      margin: 0 0 4px 0; }
-    .openerp .oe_kanban_view .oe_kanban_details .oe_tag {
-      display: inline-block;
-      margin: 0 2px 2px 0; }
-  .openerp .oe_kanban_view .oe_kanban_record {
-    position: relative;
-    display: block;
-    min-height: 20px;
-    margin: 0;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px; }
-    .openerp .oe_kanban_view .oe_kanban_record:last-child {
-      margin-bottom: 0; }
-    .openerp .oe_kanban_view .oe_kanban_record .oe_kanban_title {
-      font-weight: bold;
-      margin: 2px 4px; }
-    .openerp .oe_kanban_view .oe_kanban_record .oe_kanban_alias {
-      margin: 0px 0 8px 0; }
-  .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_record {
-    margin-bottom: 4px; }
-  .openerp .oe_kanban_view .oe_kanban_avatar_smallbox {
-    height: 40px;
-    width: 40px;
-    border: 1px solid;
-    border-color: #e5e5e5 #dbdbdb #d2d2d2;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-    -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); }
-  .openerp .oe_kanban_view .oe_kanban_box {
-    background: white;
-    border: 2px solid #cccccc;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    margin-bottom: 5px; }
-  .openerp .oe_kanban_view .oe_kanban_box_header {
-    border-bottom: 1px solid #cccccc; }
-  .openerp .oe_kanban_view .oe_kanban_title {
-    font-size: 95%;
-    font-weight: bold;
-    padding: 0 4px 0 4px; }
-  .openerp .oe_kanban_view .oe_kanban_small {
-    font-size: 80%;
-    font-weight: normal; }
-  .openerp .oe_kanban_view .oe_kanban_show_more {
-    clear: both;
-    text-align: center; }
-  .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_show_more .oe_button {
-    width: 100%; }
-  .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record {
-    display: inline-block;
-    padding: 2px;
-    vertical-align: top;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box; }
-  .openerp .oe_kanban_view .oe_kanban_action_button {
-    height: 22px;
-    margin: 0; }
-  .openerp .oe_kanban_view .oe_kanban_action_a {
-    text-decoration: none; }
-    .openerp .oe_kanban_view .oe_kanban_action_a:hover {
-      text-decoration: none; }
-  .openerp .oe_kanban_view .oe_kanban_table {
-    width: 100%;
-    border: none;
-    border-collapse: collapse;
-    margin: 0;
-    padding: 0; }
-  .openerp .oe_kanban_view .oe_kanban_table tr td {
-    padding: 0; }
-  .openerp .oe_kanban_view .oe_kanban_table tr td.oe_kanban_title {
-    padding: 2px; }
-  .openerp .oe_kanban_view .oe_kanban_box_content {
-    padding: 4px;
-    font-size: 90%; }
-  .openerp .oe_kanban_view .oe_kanban_button {
-    border: 1px solid #8ec1da;
-    background-color: #ddeef6;
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    color: black;
-    text-shadow: 0 1px white;
-    padding: 0 4px;
-    font-size: 85%;
-    margin: 1px; }
-  .openerp .oe_kanban_view a.oe_kanban_button:hover, .openerp .oe_kanban_view .openerp button.oe_kanban_button:hover {
-    background-color: #eeddf6; }
-  .openerp .oe_kanban_view .oe_kanban_buttons_set {
-    border-top: 1px dotted;
-    white-space: nowrap;
-    padding-top: 2px;
-    position: relative;
-    clear: both; }
-    .openerp .oe_kanban_view .oe_kanban_buttons_set a {
-      padding: 2px; }
-  .openerp .oe_kanban_view .oe_kanban_box_show_onclick {
-    display: none; }
-  .openerp .oe_kanban_view .oe_kanban_draghandle {
-    cursor: move; }
-  .openerp .oe_kanban_view .oe_kanban_color_border {
-    border-color: #cccccc; }
-  .openerp .oe_kanban_view .oe_kanban_color_border {
-    border-color: #cccccc; }
-  .openerp .oe_kanban_view .oe_kanban_tooltip ul, .openerp .oe_kanban_view ul.oe_kanban_tooltip {
-    padding: 0 0 4px 0;
-    margin: 5px 0 0 15px;
-    list-style: circle; }
-  .openerp .oe_kanban_view .oe_kanban_highlight {
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    padding: 1px 5px;
-    margin: 1px 4px;
-    white-space: nowrap;
-    display: inline-block;
-    line-height: 1em; }
-  .openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_kanban_quick_create {
-    margin-bottom: 4px;
-    position: relative;
-    display: block;
-    background: white;
-    border: 1px solid rgba(0, 0, 0, 0.16);
-    border-bottom-color: rgba(0, 0, 0, 0.3);
-    padding: 5px;
-    display: block;
-    -webkit-transition: -webkit-transform, -webkit-box-shadow, border 200ms linear;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px; }
-    .openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover {
-      border: 1px solid #7c7bad;
-      -moz-box-shadow: 0 0 4px #7c7bad;
-      -webkit-box-shadow: 0 0 4px #7c7bad;
-      -box-shadow: 0 0 4px #7c7bad; }
-      .openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span {
-        visibility: visible; }
-    .openerp .oe_kanban_view .oe_kanban_card h3, .openerp .oe_kanban_view .oe_kanban_quick_create h3 {
-      margin: 0 16px 0 0;
-      color: #4c4c4c;
-      text-decoration: none; }
-    .openerp .oe_kanban_view .oe_kanban_card h3:hover, .openerp .oe_kanban_view .oe_kanban_quick_create h3:hover {
-      text-decoration: none; }
-    .openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban .oe_kanban_project_times li {
-      float: left; }
-  .openerp .oe_kanban_view .oe_kanban_star {
-    float: left;
-    position: inline-block;
-    margin: 0 4px 0 0; }
-  .openerp .oe_kanban_view .oe_kanban_avatar {
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-    -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); }
-  .openerp .oe_kanban_view .oe_kanban_footer_left {
-    margin-top: 2px; }
-    .openerp .oe_kanban_view .oe_kanban_footer_left > span {
-      margin-top: 2px;
-      display: inline-block;
-      background: #e6e6e6;
-      border: 1px solid #b9b9b9;
-      color: #666666;
-      padding: 0 2px;
-      line-height: 16px;
-      -moz-border-radius: 3px;
-      -webkit-border-radius: 3px;
-      border-radius: 3px; }
-      .openerp .oe_kanban_view .oe_kanban_footer_left > span .oe_e {
-        line-height: 12px;
-        font-size: 22px; }
-    .openerp .oe_kanban_view .oe_kanban_footer_left .oe_tags {
-      margin-right: 0; }
-      .openerp .oe_kanban_view .oe_kanban_footer_left .oe_tags .oe_tag {
-        display: inline-block;
-        padding: 0 2px;
-        line-height: 14px; }
-    .openerp .oe_kanban_view .oe_kanban_footer_left .oe_kanban_mail_new {
-      line-height: 18px;
-      background-color: #8a89ba;
-      color: white;
-      font-weight: bold;
-      position: relative;
-      top: -1px; }
-  .openerp .oe_kanban_view .oe_kanban_bottom_right {
-    float: right;
-    position: relative;
-    top: 2px; }
-  .openerp .oe_kanban_view .oe_kanban_status {
-    position: relative;
-    top: 4px;
-    display: inline-block;
-    height: 12px;
-    width: 12px;
-    -moz-border-radius: 6px;
-    -webkit-border-radius: 6px;
-    border-radius: 6px;
-    background-position: center center;
-    background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
-    background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
-    background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
-    background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); }
-  .openerp .oe_kanban_view .oe_kanban_status_green {
-    background: green;
-    background-position: center center;
-    background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
-    background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
-    background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
-    background-image: radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%); }
-  .openerp .oe_kanban_view .oe_kanban_status_red {
-    background: red;
-    background-position: center center;
-    background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
-    background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
-    background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
-    background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%); }
-  .openerp .oe_kanban_view .oe_kanban_text_red {
-    color: #a61300;
-    font-weight: bold;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px; }
-  .openerp .oe_kanban_view .oe_kanban_ellipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap; }
-  .openerp .oe_kanban_view .oe_dropdown_kanban {
-    float: right;
-    cursor: pointer;
-    margin-top: -6px; }
-    .openerp .oe_kanban_view .oe_dropdown_kanban:hover {
-      text-decoration: none; }
-    .openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
-      left: 0;
-      top: 28px;
-      min-width: 160px;
-      padding: 2px; }
-      .openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu > li {
-        padding: 3px; }
-  .openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span {
-    visibility: visible; }
-  .openerp .oe_kanban_view .oe_dropdown_kanban > span {
-    visibility: hidden; }
-  .openerp .oe_kanban_view .oe_kanban_colorpicker {
-    white-space: nowrap; }
-  .openerp .oe_kanban_view .oe_kanban_colorpicker li {
-    float: left;
-    margin: 0;
-    padding: 0; }
-    .openerp .oe_kanban_view .oe_kanban_colorpicker li a {
-      display: inline-block;
-      width: 16px;
-      height: 16px;
-      border: 1px solid white; }
-    .openerp .oe_kanban_view .oe_kanban_colorpicker li a:hover {
-      border: 1px solid gray !important; }
-  .openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a {
-    border: 1px solid #cccccc; }
-  .openerp .oe_kanban_view .oe_kanban_color_0 {
-    background-color: white;
-    color: #5a5a5a; }
-  .openerp .oe_kanban_view .oe_kanban_color_1 {
-    background-color: #cccccc;
-    color: #424242; }
-  .openerp .oe_kanban_view .oe_kanban_color_2 {
-    background-color: #ffc7c7;
-    color: #7a3737; }
-  .openerp .oe_kanban_view .oe_kanban_color_3 {
-    background-color: #fff1c7;
-    color: #756832; }
-  .openerp .oe_kanban_view .oe_kanban_color_4 {
-    background-color: #e3ffc7;
-    color: #5d6937; }
-  .openerp .oe_kanban_view .oe_kanban_color_5 {
-    background-color: #c7ffd5;
-    color: #1a7759; }
-  .openerp .oe_kanban_view .oe_kanban_color_6 {
-    background-color: #c7ffff;
-    color: #1a5d83; }
-  .openerp .oe_kanban_view .oe_kanban_color_7 {
-    background-color: #c7d5ff;
-    color: #3b3e75; }
-  .openerp .oe_kanban_view .oe_kanban_color_8 {
-    background-color: #e3c7ff;
-    color: #4c3668; }
-  .openerp .oe_kanban_view .oe_kanban_color_9 {
-    background-color: #ffc7f1;
-    color: #6d2c70; }
+  height: inherit;
+}
+.openerp .oe_kanban_view .oe_kanban_column_higlight {
+  background: #eeddf6 !important;
+}
+.openerp .oe_kanban_view .oe_view_nocontent {
+  position: relative;
+  z-index: 1;
+  max-width: none;
+  height: 100%;
+}
+.openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_content {
+  margin-left: 90px;
+  margin-top: 5px;
+  max-width: 700px;
+}
+.openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_bg {
+  background: #eeeeee;
+  opacity: 0.7;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: -1;
+}
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell {
+  background: url(/web/static/src/img/form_sheetbg.png);
+  width: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_group_length {
+  text-align: center;
+  display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_group_length .oe_tag {
+  position: relative;
+  top: 8px;
+  font-weight: bold;
+}
+.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
+  display: none;
+}
+.openerp .oe_kanban_view .ui-sortable-placeholder {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  visibility: visible !important;
+}
+.openerp .oe_kanban_view .ui-sortable-helper {
+  -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
+  -box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
+  -moz-transform: rotate(3deg);
+  -webkit-transform: rotate(3deg);
+  -o-transform: rotate(3deg);
+  -ms-transform: rotate(3deg);
+  -webkit-transition: -webkit-transform 100ms linear;
+  -moz-transition: -moz-transform 100ms linear;
+  transition: transform 100ms linear;
+}
+.openerp .oe_kanban_view .oe_kanban_left {
+  float: left;
+}
+.openerp .oe_kanban_view .oe_kanban_right {
+  float: right;
+}
+.openerp .oe_kanban_view .oe_kanban_clear {
+  clear: both;
+}
+.openerp .oe_kanban_view .oe_kanban_content {
+  word-wrap: break-word;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off {
+  color: #cccccc;
+  text-shadow: 0 0 2px black;
+  vertical-align: top;
+  position: relative;
+  top: -5px;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on:hover, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_on {
+  color: gold;
+}
+.openerp .oe_kanban_view .oe_kanban_content div:first-child {
+  margin-right: 16px;
+}
+.openerp .oe_kanban_view .oe_kanban_button_new {
+  color: white;
+  background: #dc5f59;
+}
+.openerp .oe_kanban_view .oe_kanban_groups {
+  height: inherit;
+}
+.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_groups {
+  width: 100%;
+}
+.openerp .oe_kanban_view.oe_kanban_grouped_by_m2o .oe_kanban_group_title {
+  cursor: move;
+}
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban {
+  float: right;
+}
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban > span {
+  visibility: hidden;
+}
+.openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban > span {
+  visibility: visible;
+}
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_menu {
+  font-weight: normal;
+  font-size: 13px;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title {
+  position: relative;
+  font-size: 16px;
+  font-weight: bold;
+  color: #333333;
+  text-shadow: 0 1px 0 white;
+  margin-right: 30px;
+  width: 200px;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title .oe_kanban_group_title_text {
+  margin-right: 4px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.openerp .oe_kanban_view .oe_fold_column .oe_kanban_group_length {
+  position: absolute;
+  top: -1px;
+  right: -14px;
+  float: right;
+  display: block;
+}
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
+  width: 185px;
+  min-width: 185px;
+}
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column.oe_kanban_group_folded, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header.oe_kanban_group_folded {
+  width: auto;
+  min-width: 30px;
+}
+.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
+  vertical-align: top;
+  padding: 5px 5px 5px 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_column ul, .openerp .oe_kanban_view .oe_kanban_column li, .openerp .oe_kanban_view .oe_kanban_group_header ul, .openerp .oe_kanban_view .oe_kanban_group_header li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+.openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group {
+  padding: 0px;
+}
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
+  background: #f0eeee;
+  border-left: 1px solid #f0f8f8;
+  border-right: 1px solid #b9b9b9;
+}
+.openerp .oe_kanban_view .oe_form .oe_kanban_column {
+  padding: 0px;
+  background: white;
+}
+.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards {
+  height: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_aggregates {
+  padding: 0;
+  margin: 0px;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add {
+  display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_length {
+  display: block;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
+  left: -5px;
+}
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_folded_column_cards {
+  visibility: visible;
+  display: block !important;
+  height: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title_undefined {
+  color: #666666;
+}
+.openerp .oe_kanban_view .oe_kanban_group_title_vertical {
+  writing-mode: tb-rl;
+  -webkit-transform: rotate(90deg);
+  -moz-transform: rotate(90deg);
+  -o-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  transform: rotate(90deg);
+  width: 30px;
+  font-size: 24px;
+  white-space: nowrap;
+  display: none;
+  position: relative;
+  opacity: 0.75;
+  top: 26px;
+}
+.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
+  margin-left: 4px;
+  cursor: pointer;
+  position: relative;
+}
+.openerp .oe_kanban_view .oe_kanban_add {
+  top: -8px;
+  z-index: 2;
+}
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
+  top: -2px;
+  height: 14px;
+}
+.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {
+  cursor: pointer;
+  display: inline-block;
+}
+.openerp .oe_kanban_view .oe_kanban_add {
+  float: right;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create_buttons {
+  margin: 4px 0;
+}
+.openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
+  width: 185px;
+  padding: 10px;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create {
+  z-index: 2;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create input {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  outline: none;
+  border: 1px solid transparent;
+  display: block;
+  margin-bottom: 8px;
+  font-size: 13px;
+  width: 100%;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -box-shadow: none;
+}
+.openerp .oe_kanban_view .oe_kanban_quick_create input:focus {
+  border: 1px solid #a6a6fe;
+  -moz-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
+  -webkit-box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
+  -box-shadow: 0px 0px 7px rgba(0, 133, 255, 0.3) inset;
+}
+.openerp .oe_kanban_view .oe_kanban_vignette {
+  padding: 8px;
+  min-height: 100px;
+}
+.openerp .oe_kanban_view .oe_kanban_image {
+  display: inline-block;
+  vertical-align: top;
+  width: 64px;
+  height: 64px;
+  text-align: center;
+  overflow: hidden;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+}
+.openerp .oe_kanban_view .oe_kanban_details {
+  display: inline-block;
+  vertical-align: top;
+  width: 240px;
+  font-size: 13px;
+  padding: 0 5px;
+  color: #4c4c4c;
+}
+.openerp .oe_kanban_view .oe_kanban_details h4 {
+  margin: 0 0 4px 0;
+}
+.openerp .oe_kanban_view .oe_kanban_details .oe_tag {
+  display: inline-block;
+  margin: 0 2px 2px 0;
+}
+.openerp .oe_kanban_view .oe_kanban_record {
+  position: relative;
+  display: block;
+  min-height: 20px;
+  margin: 0;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_record:last-child {
+  margin-bottom: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_record .oe_kanban_title {
+  font-weight: bold;
+  margin: 2px 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_record .oe_kanban_alias {
+  margin: 0px 0 8px 0;
+}
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_record {
+  margin-bottom: 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_avatar_smallbox {
+  height: 40px;
+  width: 40px;
+  border: 1px solid;
+  border-color: #e5e5e5 #dbdbdb #d2d2d2;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.openerp .oe_kanban_view .oe_kanban_box {
+  background: white;
+  border: 2px solid #cccccc;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  margin-bottom: 5px;
+}
+.openerp .oe_kanban_view .oe_kanban_box_header {
+  border-bottom: 1px solid #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_title {
+  font-size: 95%;
+  font-weight: bold;
+  padding: 0 4px 0 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_small {
+  font-size: 80%;
+  font-weight: normal;
+}
+.openerp .oe_kanban_view .oe_kanban_show_more {
+  clear: both;
+  text-align: center;
+}
+.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_show_more .oe_button {
+  width: 100%;
+}
+.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record {
+  display: inline-block;
+  padding: 2px;
+  vertical-align: top;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+.openerp .oe_kanban_view .oe_kanban_action_button {
+  height: 22px;
+  margin: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_action_a {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_action_a:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_table {
+  width: 100%;
+  border: none;
+  border-collapse: collapse;
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_table tr td {
+  padding: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_table tr td.oe_kanban_title {
+  padding: 2px;
+}
+.openerp .oe_kanban_view .oe_kanban_box_content {
+  padding: 4px;
+  font-size: 90%;
+}
+.openerp .oe_kanban_view .oe_kanban_button {
+  border: 1px solid #8ec1da;
+  background-color: #ddeef6;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  color: black;
+  text-shadow: 0 1px white;
+  padding: 0 4px;
+  font-size: 85%;
+  margin: 1px;
+}
+.openerp .oe_kanban_view a.oe_kanban_button:hover, .openerp .oe_kanban_view .openerp button.oe_kanban_button:hover {
+  background-color: #eeddf6;
+}
+.openerp .oe_kanban_view .oe_kanban_buttons_set {
+  border-top: 1px dotted;
+  white-space: nowrap;
+  padding-top: 2px;
+  position: relative;
+  clear: both;
+}
+.openerp .oe_kanban_view .oe_kanban_buttons_set a {
+  padding: 2px;
+}
+.openerp .oe_kanban_view .oe_kanban_box_show_onclick {
+  display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_draghandle {
+  cursor: move;
+}
+.openerp .oe_kanban_view .oe_kanban_color_border {
+  border-color: #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_color_border {
+  border-color: #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_tooltip ul, .openerp .oe_kanban_view ul.oe_kanban_tooltip {
+  padding: 0 0 4px 0;
+  margin: 5px 0 0 15px;
+  list-style: circle;
+}
+.openerp .oe_kanban_view .oe_kanban_highlight {
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  padding: 1px 5px;
+  margin: 1px 4px;
+  white-space: nowrap;
+  display: inline-block;
+  line-height: 1em;
+}
+.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_kanban_quick_create {
+  margin-bottom: 4px;
+  position: relative;
+  display: block;
+  background: white;
+  border: 1px solid rgba(0, 0, 0, 0.16);
+  border-bottom-color: rgba(0, 0, 0, 0.3);
+  padding: 5px;
+  display: block;
+  -webkit-transition: -webkit-transform, -webkit-box-shadow, border 200ms linear;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover {
+  border: 1px solid #7c7bad;
+  -moz-box-shadow: 0 0 4px #7c7bad;
+  -webkit-box-shadow: 0 0 4px #7c7bad;
+  -box-shadow: 0 0 4px #7c7bad;
+}
+.openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span {
+  visibility: visible;
+}
+.openerp .oe_kanban_view .oe_kanban_card h3, .openerp .oe_kanban_view .oe_kanban_quick_create h3 {
+  margin: 0 16px 0 0;
+  color: #4c4c4c;
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_card h3:hover, .openerp .oe_kanban_view .oe_kanban_quick_create h3:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban .oe_kanban_project_times li {
+  float: left;
+}
+.openerp .oe_kanban_view .oe_kanban_star {
+  float: left;
+  position: inline-block;
+  margin: 0 4px 0 0;
+}
+.openerp .oe_kanban_view .oe_kanban_avatar {
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left {
+  margin-top: 2px;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left > span {
+  margin-top: 2px;
+  display: inline-block;
+  background: #e6e6e6;
+  border: 1px solid #b9b9b9;
+  color: #666666;
+  padding: 0 2px;
+  line-height: 16px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left > span .oe_e {
+  line-height: 12px;
+  font-size: 22px;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_tags {
+  margin-right: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_tags .oe_tag {
+  display: inline-block;
+  padding: 0 2px;
+  line-height: 14px;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_kanban_mail_new {
+  line-height: 18px;
+  background-color: #8a89ba;
+  color: white;
+  font-weight: bold;
+  position: relative;
+  top: -1px;
+}
+.openerp .oe_kanban_view .oe_kanban_bottom_right {
+  float: right;
+  position: relative;
+  top: 2px;
+}
+.openerp .oe_kanban_view .oe_kanban_status {
+  position: relative;
+  top: 4px;
+  display: inline-block;
+  height: 12px;
+  width: 12px;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+  background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
+}
+.openerp .oe_kanban_view .oe_kanban_status_green {
+  background: green;
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: -moz-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: -ms-radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+  background-image: radial-gradient(#55dd55 0%, #44aa44 40%, #339933 100%);
+}
+.openerp .oe_kanban_view .oe_kanban_status_red {
+  background: red;
+  background-position: center center;
+  background-image: -webkit-radial-gradient(circle, #ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -moz-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: -ms-radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+  background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%);
+}
+.openerp .oe_kanban_view .oe_kanban_text_red {
+  color: #a61300;
+  font-weight: bold;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+.openerp .oe_kanban_view .oe_kanban_ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.openerp .oe_kanban_view .oe_dropdown_kanban {
+  float: right;
+  cursor: pointer;
+  margin-top: -6px;
+}
+.openerp .oe_kanban_view .oe_dropdown_kanban:hover {
+  text-decoration: none;
+}
+.openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
+  left: 0;
+  top: 28px;
+  min-width: 160px;
+  padding: 2px;
+}
+.openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu > li {
+  padding: 3px;
+}
+.openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span {
+  visibility: visible;
+}
+.openerp .oe_kanban_view .oe_dropdown_kanban > span {
+  visibility: hidden;
+}
+.openerp .oe_kanban_view .oe_kanban_colorpicker {
+  white-space: nowrap;
+}
+.openerp .oe_kanban_view .oe_kanban_colorpicker li {
+  float: left;
+  margin: 0;
+  padding: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_colorpicker li a {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  border: 1px solid white;
+}
+.openerp .oe_kanban_view .oe_kanban_colorpicker li a:hover {
+  border: 1px solid gray !important;
+}
+.openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a {
+  border: 1px solid #cccccc;
+}
+.openerp .oe_kanban_view .oe_kanban_color_0 {
+  background-color: white;
+  color: #5a5a5a;
+}
+.openerp .oe_kanban_view .oe_kanban_color_1 {
+  background-color: #cccccc;
+  color: #424242;
+}
+.openerp .oe_kanban_view .oe_kanban_color_2 {
+  background-color: #ffc7c7;
+  color: #7a3737;
+}
+.openerp .oe_kanban_view .oe_kanban_color_3 {
+  background-color: #fff1c7;
+  color: #756832;
+}
+.openerp .oe_kanban_view .oe_kanban_color_4 {
+  background-color: #e3ffc7;
+  color: #5d6937;
+}
+.openerp .oe_kanban_view .oe_kanban_color_5 {
+  background-color: #c7ffd5;
+  color: #1a7759;
+}
+.openerp .oe_kanban_view .oe_kanban_color_6 {
+  background-color: #c7ffff;
+  color: #1a5d83;
+}
+.openerp .oe_kanban_view .oe_kanban_color_7 {
+  background-color: #c7d5ff;
+  color: #3b3e75;
+}
+.openerp .oe_kanban_view .oe_kanban_color_8 {
+  background-color: #e3c7ff;
+  color: #4c3668;
+}
+.openerp .oe_kanban_view .oe_kanban_color_9 {
+  background-color: #ffc7f1;
+  color: #6d2c70;
+}
 
 .openerp .oe_form .oe_kanban_view .oe_kanban_column, .openerp .oe_form .oe_kanban_view .oe_kanban_group_header {
   padding: 0px;
-  background: white; }
+  background: white;
+}
 
 .openerp .oe_popup_form .oe_kanban_buttons .oe_highlight {
   color: #404040;
-  background: none; }
+  background: none;
+}
 .openerp .oe_popup_form .oe_kanban_buttons button.oe_highlight {
   background-color: #efefef;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
@@ -528,7 +666,8 @@
   background-image: linear-gradient(to bottom, #efefef, #d8d8d8);
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; }
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+}
 .openerp .oe_popup_form .oe_kanban_buttons button.oe_highlight:active {
   background-color: #e3e3e3;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
@@ -539,7 +678,8 @@
   background-image: linear-gradient(to bottom, #e3e3e3, #f6f6f6);
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
-  -box-shadow: none; }
+  -box-shadow: none;
+}
 .openerp .oe_popup_form .oe_kanban_buttons button.oe_highlight:hover {
   background-color: #f6f6f6;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
@@ -550,23 +690,32 @@
   background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; }
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+}
 
 .openerp_ie .oe_kanban_view .oe_kanban_group_header .oe_kanban_group_title_vertical {
-  display: none !important; }
+  display: none !important;
+}
 .openerp_ie .oe_kanban_view .oe_kanban_group_header.oe_kanban_group_folded .oe_kanban_group_title_vertical {
-  display: inline-block !important; }
+  display: inline-block !important;
+}
 .openerp_ie .oe_kanban_view .oe_kanban_group_title_vertical {
   -ms-writing-mode: lr-tb !important;
   background: #f0eeee;
-  top: -5px !important; }
+  top: -5px !important;
+}
 .openerp_ie .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header {
-  height: 1%; }
+  height: 1%;
+}
 
 @media print {
   .openerp .oe_kanban_groups button {
-    visibility: hidden; }
+    visibility: hidden;
+  }
   .openerp .oe_kanban_groups a[data-type=object], .openerp .oe_kanban_groups a[data-type=delete] {
-    visibility: hidden; }
+    visibility: hidden;
+  }
   .openerp .oe_kanban_view .oe_kanban_group_title {
-    text-shadow: none !important; } }
+    text-shadow: none !important;
+  }
+}
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 80e48ab8c0c..6348db64937 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -51,6 +51,8 @@
     //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
     background: white
     height: inherit
+    .oe_kanban_column_higlight
+        background: #eeddf6 !important
     .oe_view_nocontent
         position: relative
         z-index: 1
@@ -192,6 +194,10 @@
             display: block
         .oe_dropdown_kanban
             left: -5px
+        .oe_kanban_folded_column_cards
+            visibility: visible
+            display: block !important
+            height: 100%
     .oe_kanban_group_title_undefined
         color: #666666
     .oe_kanban_group_title_vertical

From d7f420c586893ca792b11f4bdad15a9de38382d5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 29 Aug 2013 18:47:19 +0530
Subject: [PATCH 395/547] [IMP]set log_meeting_in_parent method in
 base_calender

bzr revid: dbr@tinyerp.com-20130829131719-2nho1zsqv1ccsj6w
---
 addons/base_calendar/crm_meeting.py     | 23 ++++++++++++++++++-----
 addons/hr_recruitment/hr_recruitment.py |  8 +-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 38d3683fabd..d54df072f0e 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -67,11 +67,24 @@ class crm_meeting(osv.Model):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj = self.browse(cr, uid, res, context=context)
-        if 'active_model' in context and context['active_model'] == 'hr.applicant':
-            self.pool.get('hr.applicant').log_meeting_in_parent(cr, uid, context['active_ids'], vals['name'], vals['date'], vals['duration'], context=context)
-        return res
+        meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        if context.get('log_meeting_in_parent'):
+            self.log_meeting_in_parent(cr, uid, [meeting_id], context=context)
+        return meeting_id
+
+    def log_meeting_in_parent(self, cr, uid, ids, context=None):
+        if context is None: 
+            context = {}
+        parent_model = context.get('active_model',False)
+        parent_ids = context.get('active_ids', False)
+        for meeting in self.browse(cr, uid, ids, context=context):
+            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+            if meeting.duration:
+                message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting.date, meeting.name, str(meeting.duration))
+            if parent_model and parent_ids:
+                self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
+        return True
+
 
     def message_get_subscription_data(self, cr, uid, ids, context=None):
         res = {}
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 00646c2dc46..df55a1942f3 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -281,13 +281,6 @@ class hr_applicant(osv.Model):
             return stage_ids[0]
         return False
 
-    def log_meeting_in_parent(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
-         if not duration:
-             message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting_date, meeting_subject)
-         else:
-             message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, str(duration))
-         return self.message_post(cr, uid, ids, body=message,context=context)
-
     def action_makeMeeting(self, cr, uid, ids, context=None):
         """ This opens Meeting's calendar view to schedule meeting on current applicant
             @return: Dictionary value for created Meeting view
@@ -300,6 +293,7 @@ class hr_applicant(osv.Model):
             'default_user_id': uid,
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,
+            'log_meeting_in_parent': True,
         }
         return res
 

From b93c8e557485a1c7816b452747411e0027aef79b Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Fri, 30 Aug 2013 11:08:58 +0530
Subject: [PATCH 396/547] [imp] improve typo in hr recruitment.

bzr revid: amb@tinyerp.com-20130830053858-ll9a61ff2ads6p18
---
 addons/hr_recruitment/hr_recruitment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 44387098eed..f6a931d0362 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -237,7 +237,7 @@ class hr_applicant(osv.Model):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
-        'emp_id': fields.many2one('hr.employee', 'employee'),
+        'emp_id': fields.many2one('hr.employee', 'Employee'),
         'attachments': fields.function(_compute_attachments, string='Number of Attachments', \
                                  type="integer"),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),

From 1de73ce6dea8b1be5936cb4059d46e76d1c94736 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 30 Aug 2013 13:54:04 +0530
Subject: [PATCH 397/547] [IMP]base_calendar: Improve code

bzr revid: dbr@tinyerp.com-20130830082404-wgk67mq1sltcg2xi
---
 addons/base_calendar/crm_meeting.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index d54df072f0e..ba4b21a65d6 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -77,11 +77,11 @@ class crm_meeting(osv.Model):
             context = {}
         parent_model = context.get('active_model',False)
         parent_ids = context.get('active_ids', False)
-        for meeting in self.browse(cr, uid, ids, context=context):
-            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
-            if meeting.duration:
-                message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting.date, meeting.name, str(meeting.duration))
-            if parent_model and parent_ids:
+        if parent_model and parent_ids:
+            for meeting in self.browse(cr, uid, ids, context=context):
+                message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+                if meeting.duration:
+                    message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
                 self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
         return True
 

From 91fb2510ed3a6e330379a0adbf31f3089cab8a32 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Thu, 5 Sep 2013 11:38:03 +0530
Subject: [PATCH 398/547] [IMP]remove extra code from css

bzr revid: vme@tinyerp.com-20130905060803-n7z3g2xreb39oke6
---
 addons/web_kanban/static/src/css/kanban.css  | 9 ++++++++-
 addons/web_kanban/static/src/css/kanban.sass | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 6f5bf241e17..b16c61b1da8 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,8 +1,10 @@
-@charset "utf-8";
 .openerp .oe_kanban_view {
   background: white;
   height: inherit;
 }
+.openerp .oe_kanban_view .oe_kanban_column_higlight {
+  background: #eeddf6 !important;
+}
 .openerp .oe_kanban_view .oe_view_nocontent {
   position: relative;
   z-index: 1;
@@ -177,6 +179,11 @@
 .openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
   left: -5px;
 }
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_folded_column_cards {
+  visibility: visible;
+  display: block !important;
+  height: 100%;
+}
 .openerp .oe_kanban_view .oe_kanban_group_title_undefined {
   color: #666666;
 }
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index de06990ebb7..1d34497e6e8 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -51,6 +51,8 @@
     //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
     background: white
     height: inherit
+    .oe_kanban_column_higlight
+        background: #eeddf6 !important
     .oe_view_nocontent
         position: relative
         z-index: 1
@@ -192,6 +194,10 @@
             display: block
         .oe_dropdown_kanban
             left: -5px
+        .oe_kanban_folded_column_cards
+            visibility: visible
+            display: block !important
+            height: 100%
     .oe_kanban_group_title_undefined
         color: #666666
     .oe_kanban_group_title_vertical

From 7ecff57509ec7d1e17760341f82c6c0011f097ac Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 6 Sep 2013 16:12:51 +0530
Subject: [PATCH 399/547] [FIX]res_user : replace field to show latest
 connection in tree view

bzr revid: pna@tinyerp.com-20130906104251-lf0584j6q5hm2sfm
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 7e83b43179f..5708dbca21e 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -194,7 +194,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="lang"/>
-                    <field name="date"/>
+                    <field name="login_date"/>
                 </tree>
             </field>
         </record>

From e21681633ce060683ff976b5972c0a76a164d3de Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP)" <dka@tinyerp.com>
Date: Mon, 9 Sep 2013 15:29:57 +0530
Subject: [PATCH 400/547] [IMP]add help,ipmrove code and remove duplication in
 record_ids

bzr revid: dka@tinyerp.com-20130909095957-a2gvivlto7qwv50x
---
 addons/hr_applicant_document/hr_applicant_document.py | 11 ++++++-----
 addons/hr_recruitment/hr_recruitment.py               |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index f5762aabfcc..45931478f26 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -26,12 +26,12 @@ class hr_applicant(osv.osv):
     def _get_index_content(self, cr, uid, ids, fields, args, context=None):
         res = {}
         attachment_pool = self.pool.get('ir.attachment')
-        for applicant in self.browse(cr, uid, ids, context=context):
-            res[applicant.id] = 0
-            attachment_ids = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)], context=context)
+        for id in ids:
+            res[id] = 0
+            attachment_ids = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',id)], context=context)
             if attachment_ids:
                 for attachment in attachment_pool.browse(cr, uid, attachment_ids, context=context):
-                    res[applicant.id] = attachment.index_content
+                    res[id] = attachment.index_content
         return res
 
     def _content_search(self, cursor, user, obj, name, args, context=None):
@@ -40,7 +40,8 @@ class hr_applicant(osv.osv):
         args += [('res_model','=','hr.applicant')]
         attachment_ids = attachment_pool.search(cursor, user, args, context=context)
         for attachment in attachment_pool.browse(cursor, user, attachment_ids, context=context):
-            record_ids.append(attachment.res_id)			
+            if attachment.res_id not in record_ids:
+                record_ids.append(attachment.res_id)
         return [('id', 'in', record_ids)]
 
     _columns = {
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e7a87ce7241..3ca69fc6289 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -239,7 +239,7 @@ class hr_applicant(osv.Model):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
-        'emp_id': fields.many2one('hr.employee', 'Employee'),
+        'emp_id': fields.many2one('hr.employee', string='Employee', help='Employee linked to the applicant.'),
         'attachments': fields.function(_compute_attachments, string='Number of Attachments', \
                                  type="integer"),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),

From efc8bb37a92fe2079eca0d163e7236b1fb33519f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Sep 2013 18:42:05 +0530
Subject: [PATCH 401/547] [IMP]Improve code for crm also

bzr revid: dbr@tinyerp.com-20130910131205-39cwpiik2ncs6wcn
---
 addons/base_calendar/crm_meeting.py     | 4 +++-
 addons/crm/crm_lead.py                  | 8 --------
 addons/crm/crm_meeting.py               | 8 --------
 addons/hr_recruitment/hr_recruitment.py | 1 -
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index ba4b21a65d6..11e1794f862 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -68,7 +68,9 @@ class crm_meeting(osv.Model):
         if context is None:
             context = {}
         meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        if context.get('log_meeting_in_parent'):
+        parent_model = context.get('active_model',False)
+        parent_ids = context.get('active_ids', False)
+        if parent_model and parent_ids:
             self.log_meeting_in_parent(cr, uid, [meeting_id], context=context)
         return meeting_id
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c4e2cbdc91d..260e634af9b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -1008,14 +1008,6 @@ class crm_lead(format_address, osv.osv):
         message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
-    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
-        if not duration:
-            duration = _('unknown')
-        else:
-            duration = str(duration)
-        message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
-        return self.message_post(cr, uid, ids, body=message, context=context)
-
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:
             country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index c31907bebe2..c65576f16c6 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -34,14 +34,6 @@ class crm_meeting(osv.Model):
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
     }
 
-    def create(self, cr, uid, vals, context=None):
-        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj = self.browse(cr, uid, res, context=context)
-        if obj.opportunity_id:
-            self.pool.get('crm.lead').log_meeting(cr, uid, [obj.opportunity_id.id], obj.name, obj.date, obj.duration, context=context)
-        return res
-
-
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 1cb75c37953..344e10260de 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -295,7 +295,6 @@ class hr_applicant(osv.Model):
             'default_user_id': uid,
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,
-            'log_meeting_in_parent': True,
         }
         return res
 

From 1339e242263fd94cf6b3a5658b647a7656a5f1c4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Sep 2013 18:47:04 +0530
Subject: [PATCH 402/547] [IMP] Label name improve

bzr revid: dbr@tinyerp.com-20130910131704-mawfghrz42jow31r
---
 addons/hr_recruitment/hr_recruitment.py       | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 344e10260de..ff922a1cee3 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -171,7 +171,7 @@ class hr_applicant(osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Subject', size=128, required=True),
+        'name': fields.char('Subject / Application Name', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3bf09d21a17..98f1170ecb7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -44,7 +44,7 @@
                 <field name="last_stage_id" invisible="1"/>
                 <field name="create_date"/>
                 <field name="date_last_stage_update" invisible="1"/>
-                <field name="name" string="Subject"/>
+                <field name="name"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="partner_phone"/>

From d0923892c2eb2c2995a3c67191a933273e989935 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Sep 2013 18:55:23 +0530
Subject: [PATCH 403/547] [IMP]Improve code

bzr revid: dbr@tinyerp.com-20130910132523-5xbkmrn1gss7p2tv
---
 addons/base_calendar/crm_meeting.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 11e1794f862..93bbe66389b 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -77,14 +77,13 @@ class crm_meeting(osv.Model):
     def log_meeting_in_parent(self, cr, uid, ids, context=None):
         if context is None: 
             context = {}
-        parent_model = context.get('active_model',False)
-        parent_ids = context.get('active_ids', False)
-        if parent_model and parent_ids:
-            for meeting in self.browse(cr, uid, ids, context=context):
-                message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
-                if meeting.duration:
-                    message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
-                self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
+        parent_model = context.get('active_model')
+        parent_ids = context.get('active_ids')
+        for meeting in self.browse(cr, uid, ids, context=context):
+            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+            if meeting.duration:
+                message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
+            self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
         return True
 
 

From 6f44a53ca847a76dcb74510225365e84cdff1114 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 11 Sep 2013 14:38:55 +0530
Subject: [PATCH 404/547] [IMP] Add condition

bzr revid: dbr@tinyerp.com-20130911090855-98upgcnn57bbx63y
---
 addons/base_calendar/crm_meeting.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 93bbe66389b..b5757f34c3f 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -79,11 +79,12 @@ class crm_meeting(osv.Model):
             context = {}
         parent_model = context.get('active_model')
         parent_ids = context.get('active_ids')
-        for meeting in self.browse(cr, uid, ids, context=context):
-            message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
-            if meeting.duration:
-                message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
-            self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
+        if parent_model in self.pool and hasattr(self.pool[parent_model], 'message_post'):
+            for meeting in self.browse(cr, uid, ids, context=context):
+                message = _("Meeting scheduled at '%s'<br> Subject: %s") % (meeting.date, meeting.name)
+                if meeting.duration:
+                    message = message+_("<br> Duration: %s hour(s)") % (str(meeting.duration))
+                self.pool.get(parent_model).message_post(cr, uid, parent_ids, body=message,context=context)
         return True
 
 

From 780672e9b1657a7e388081d432d7c2c4766e5e3b Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Wed, 11 Sep 2013 15:28:04 +0530
Subject: [PATCH 405/547] [imp] improve code and improve naming conventions.

bzr revid: amb@tinyerp.com-20130911095804-u1dk4kdhwcls2trm
---
 addons/hr_applicant_document/hr_applicant_document.py | 10 +++++-----
 addons/hr_recruitment/hr_recruitment.py               |  9 +++------
 addons/hr_recruitment/hr_recruitment_view.xml         |  6 +++---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index 45931478f26..b201b2b1889 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -27,11 +27,11 @@ class hr_applicant(osv.osv):
         res = {}
         attachment_pool = self.pool.get('ir.attachment')
         for id in ids:
-            res[id] = 0
-            attachment_ids = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',id)], context=context)
-            if attachment_ids:
-                for attachment in attachment_pool.browse(cr, uid, attachment_ids, context=context):
-                    res[id] = attachment.index_content
+            res[id] = ''
+            attachment_ids = attachment_pool.search(cr, uid, [('res_model', '=', 'hr.applicant'), ('res_id', '=', id)], context=context)
+            for attachment in attachment_pool.browse(cr, uid, attachment_ids, context=context):
+                # adding index content of all attachments into one in order to find easily from all attachments 
+                res[id] += attachment.index_content or ''
         return res
 
     def _content_search(self, cursor, user, obj, name, args, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3ca69fc6289..3afce09a2da 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -189,11 +189,8 @@ class hr_applicant(osv.Model):
     def _compute_attachments(self, cr, uid, ids, fields, args, context=None):
         res = {}
         attachment_pool = self.pool.get('ir.attachment')
-        for applicant in self.browse(cr, uid, ids, context=context):
-            res[applicant.id] = 0
-            attach = attachment_pool.search(cr, uid, [('res_model','=','hr.applicant'),('res_id','=',applicant.id)], context=context)
-            if attach:
-                res[applicant.id] = len(attach)
+        for applicant in ids:
+            res[applicant] = attachment_pool.search_count(cr, uid, [('res_model', '=', 'hr.applicant'), ('res_id', '=', applicant)], context=context)
         return res
 
     _columns = {
@@ -240,7 +237,7 @@ class hr_applicant(osv.Model):
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
         'emp_id': fields.many2one('hr.employee', string='Employee', help='Employee linked to the applicant.'),
-        'attachments': fields.function(_compute_attachments, string='Number of Attachments', \
+        'attachment_number': fields.function(_compute_attachments, string='Number of Attachments', \
                                  type="integer"),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8b7a16970d4..dc1a387019e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -242,7 +242,7 @@
                 <field name="department_id"/>
                 <field name="categ_ids"/>
                 <field name="message_summary"/>
-                <field name="attachments"/>
+                <field name="attachment_number"/>
                 <templates>
                     <t t-name="kanban-tooltip">
                         <ul class="oe_kanban_tooltip">
@@ -295,9 +295,9 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
-                                    <a t-if="record.attachments.raw_value == 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Document</a> 
+                                    <a t-if="record.attachment_number.raw_value == 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachment_number"/> Document</a> 
 							
-                                    <a t-if="record.attachments.raw_value gt 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachments"/> Documents</a> 
+                                    <a t-if="record.attachment_number.raw_value gt 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachment_number"/> Documents</a> 
 
                                 </div>
                             

From c39d533d264239f7120a5dd1e2f620f347c78db2 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Thu, 12 Sep 2013 10:32:48 +0530
Subject: [PATCH 406/547] [imp] add stage_id at department onchange.

bzr revid: amb@tinyerp.com-20130912050248-ux9x98i8u8pjgsv0
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index dc1a387019e..a07a2d548dd 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -121,7 +121,7 @@
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
-                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id, stage_id)"/>
                         <field name="company_id" />
                         <label for="availability"/>
                         <div>

From 2d3f170818f127aa92d3b424988d5b3bad740d3c Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Thu, 12 Sep 2013 12:16:07 +0530
Subject: [PATCH 407/547] [imp] improve code at hr_applicant_document.

bzr revid: amb@tinyerp.com-20130912064607-ziw1o0guquzwdq26
---
 addons/hr_applicant_document/hr_applicant_document.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
index b201b2b1889..f1566237f32 100644
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ b/addons/hr_applicant_document/hr_applicant_document.py
@@ -34,12 +34,12 @@ class hr_applicant(osv.osv):
                 res[id] += attachment.index_content or ''
         return res
 
-    def _content_search(self, cursor, user, obj, name, args, context=None):
+    def _content_search(self, cr, user, obj, name, args, context=None):
         record_ids = []
         attachment_pool = self.pool.get('ir.attachment')
         args += [('res_model','=','hr.applicant')]
-        attachment_ids = attachment_pool.search(cursor, user, args, context=context)
-        for attachment in attachment_pool.browse(cursor, user, attachment_ids, context=context):
+        attachment_ids = attachment_pool.search(cr, user, args, context=context)
+        for attachment in attachment_pool.browse(cr, user, attachment_ids, context=context):
             if attachment.res_id not in record_ids:
                 record_ids.append(attachment.res_id)
         return [('id', 'in', record_ids)]

From bfa265d287861a21812ce20af9bab6c34a5542e8 Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP)" <dka@tinyerp.com>
Date: Wed, 18 Sep 2013 11:55:09 +0530
Subject: [PATCH 408/547] [IMP]attached cv and discussion to demo data and
 linked demo data to job position and linked job postion to survey

bzr revid: dka@tinyerp.com-20130918062509-7g8ttro8rkj6sn3c
---
 addons/hr_applicant_document/__openerp__.py   |   2 +-
 .../hr_applicant_document_demo.xml            | 257 ++++++++++++++++++
 addons/hr_recruitment/hr_recruitment_demo.xml |  87 ++++--
 3 files changed, 322 insertions(+), 24 deletions(-)
 create mode 100644 addons/hr_applicant_document/hr_applicant_document_demo.xml

diff --git a/addons/hr_applicant_document/__openerp__.py b/addons/hr_applicant_document/__openerp__.py
index f9034067b00..c79269f5da5 100644
--- a/addons/hr_applicant_document/__openerp__.py
+++ b/addons/hr_applicant_document/__openerp__.py
@@ -35,7 +35,7 @@
     'images': [],
     'depends': ['hr_recruitment','document'],
     'data': ['hr_applicant_document_view.xml'],
-    'demo': [],
+    'demo': ['hr_applicant_document_demo.xml'],
     'test': [],
     'installable': True,
     'auto_install': True,
diff --git a/addons/hr_applicant_document/hr_applicant_document_demo.xml b/addons/hr_applicant_document/hr_applicant_document_demo.xml
new file mode 100644
index 00000000000..46bac2250a0
--- /dev/null
+++ b/addons/hr_applicant_document/hr_applicant_document_demo.xml
@@ -0,0 +1,257 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="applicant_attach1" model="ir.attachment">
+            <field name="datas">JVBERi0xLjQKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0ZURl
+Y29kZT4+CnN0cmVhbQp4nJ1UTWvDMAy951f4PKhnKbEdQyk0TXrYrRDYYey2D9hhsF7292fZtdJk
+djpG4REqS37vSbKSIL6rL6GE8l/aaYmibUC24vxaPd6Jzxjzv/N71Y2VNj5krRHji7g/ggAlxren
+rYIdbhUS1AQNgSYwBHb3PD5Uw1idsuU0Srss2FKeI9jHCh663cYSYglK4UP8KpAA7bz2LIueEgfW
+FhQdPYCKpNKFACx9SHQB11U3sLgNKB+aBPHKS6UAWXk3NPswEG0wHMGcgDo1Cyz7HQ620w09ezAw
+q5ZPTwFXEu5Q1sKik83S6BtiimGg6YBuNixwmNsFk+CrP3vOwXnbiuxj28AuxoTqjR/ZwUI6+zvj
+aUUfBAcDHFPbUEVe/mvaM5dYI/5hxZSRy3HDmm1xvKl6tr3IN8U+66sp34AtjBs5i00cqjVSpkWP
+uY3bM6nLG1La3GBwtk5xG27udHGbvSodM6jMwE7RQTRsVx3C+8ukrRrgHx69fAT6VBLslQGzZf3P
+I4BULQK1El0arvg6kAFItmMX5495n8QPLYlXWAplbmRzdHJlYW0KZW5kb2JqCgozIDAgb2JqCjQx
+MwplbmRvYmoKCjUgMCBvYmoKPDwvTGVuZ3RoIDYgMCBSL0ZpbHRlci9GbGF0ZURlY29kZS9MZW5n
+dGgxIDE4MjEyPj4Kc3RyZWFtCnic3XsJXFTXvf8599w7GwPMDDsIXAZxiQgI4hYThlVRtgBuSY2O
+zCBEYAgzuD4jxocbGJKagKiN1qbG2DRaaw3GFI1iE7PU2GjaxqapjWljQkyedUkNnLzfOfcOW0zS
+z+v//3mfz2PkzrnnnvNbvr/1XBJPXb0TGVEDIshWVm2vvf0+vYYQehMhbClb6pF9ta0/gfFfEBKS
+ymsXV3e7UD5CognWPL+4akX5uuXzcuH+ZYTCxAqn3dE4bkMCQpEn4PmECpiIpjVauP8S7odXVHuW
+/8b/EQmhqGFwf3+Vq8zesfb8Krhfzu6r7ctrP8LPsOfn4V6usVc7L60/dy/cX4fb67Uut+d+tPZr
+hNI+Zs9r65y1jZ2vdiFk0yGkjYA5DB/2Y4Shht0LRJQ0Wp3e4GP09fM3mS0BgUHBIaFh4RHDIqOi
+5Rhr7PC4ESNHjb5rDPq/+dOB3uC/+/ET8F3OZzYIa5DQ9+lAp+C5wNd14DfwJvwSjPeiHriuQ9ew
+gbyKJ8KoE/bOFWNgtgXt5DtbyN9RPXkZvYPOoIsw+jueTGAvfgfF4A+A2qZ+LqQT7k7BdRXpJHNx
+NK5Gz+AXgOIq4OlCawT4FoqB8lviOZh9C22Az1b0DHLBmEm2DuR/Hx1GTeg62iZcQffD+CV0GuSh
+yE/hgS+gm0Bpv3CPUA7rTgO17Wg7XocuILeIsAFWXpIuCGOA6mHQAKFFaKd0QdrG8IDvC9IX8ASc
+VdOhCdTGghYMt734ZTxOKEDvwP5VqJT8gDxMLuJGMVZcRq6gFgGRheghdFa6oAlELdpY1KIpxyvE
+hfyziuknLBMX4v3oCtBcRL6E+xiQbCfXGKHDQrFUIBWAzuUwt5NfW5SrxoTeIrcB9ycEiqeLOSQN
+nqwS89A2tAd2jgRkEHKRVODuQqukLcoH7YfPWGkLaQX6HA2cItyDdgrluAmkvQloukgWmgg8IqWr
+qBEfBrmRdjVySxcQCkQvajWSSASM4mXTQSEu13HQdt9c+bV5MWPjh9zKJq18EBUd9F0hd3z9ddFc
+MUKad1AadpDE6Q6KcbGXvu3hpbHxM4vmyh04JDtLJZu9MAsmS+bCkN3BNMxnZ/FnjOtBKQ7+5S48
+KJdVyJtNm2OnbDY5p4wFm1fQVrFCegaylxZFv4xEDMogDQ48gnXSOkFEiV3nu8ch0/nu891JAeYY
+c1yMOaZCRD1uEtHzEW3V+n15rU4zmsWJAFZBYj2goEMBaIwtFLeZUJt+o8Vk0AEhKdl3khlF6VMC
+TT3dyT3d5pDJ41DidUYXm1OSJ6SOHxEbF5MsBgWKY7A5Frd80vyjnVtoHj58Gwv0668+eV1K7D37
+ZGPj1r0fXnz/r737GE+MHwKe68BPzKjQFqDR+hBkJm1+nfqTWoNGg3QW0/mu7mRgdBk4vWmebJ6c
+ZIszIRM2mWUkY9mchJJwiinJbEM2nGmymYtQES4yFZkt83ECjrVqgsyx5pSge3FKcnCIuO7ulbnP
+Hzl6NOH4uqylE8iKhLv+8GbvO+LCi8vWWIcrGGz6+kNxOsjjg0JQLEjUbEHNxk5Le6je4p9FLEH3
+hpqud/cwSEEi09UkDCwCgxX9RyZbzCYh1iqYTRahovnxx5u3PP74liu3bn5y5eZN8sF77164ePHC
+u+/tpL+jf6WX6Dt4LKSBKJzAsvYpwGEkeGIAGm8Ll0zYqDuiwc1oh5/mpEEI0CK9pPH19wk0nZ/a
+1TO1K3kyA/8ymMF0NdkyeXISDgJdI3FMUAzoG5Makzp+Qoo48lxZPl5L13TQC3jMc7/UBLbft7is
+pSeRnGsp6HhB0fcQ8M0CvnrkixJsYbojyNhl2IFOaoQjIsnzwRopD800aP2A8eXunqmgeGJ38uUe
+rjq4UhDwMsfglKBYKDy/x9U9NbiaXsLRHR3iwp7ElhaSIWReYfrtBj4GTTRwGWEL0CNiOGI8TY5I
+RCMijU+eHuh397zJtQJ0zUyjwOC7mVYjUpk+wpoH5v3+yk9/Rf+IP8Ct//HIzvMnyT8fB/lXgb3m
+gr2C0DCUbRuBggk2NOm3aIKPYE2zL34lrDmg07c9kgjDTPpgDcodZjFNj+Qm7DJbGD9mx8umq/C5
+ftXC/AsHxSgWnRjkh2NlZDahlGSLlnuTVpzb8+HxF+aeqK489QD9ir6H5S/evdUhPrGx8XmT8OD9
+mhdfmzT5xTFj8GQcgI3YRv98es9zB3eC/k2gfw7Elh5V24ZpsYAFjVaToRUIOqyTNFgrmMVxWjNK
+MkB0cQAAiandYOckSAtak3iG/c6zHgrBGM+3jQgRQrWjhRHaSdo5gkN4SFsvrNQaQjUj8GhNDs7V
+zMGLcYVGNx/ND4iB6AQLmWObwEJfnvoaUd0p6cJXKeJbt8eIb32VAhg2Aoax3OdHoxrbXQYtCpeN
+of5adCRU22yJaZKPRzYPZzHgi0PFMD+Dxpgli5qge+8CHLsgGSQr4nZdvt7DYsJ0lcUpYGmBYI1M
+ik6Sk2KSrLvRbrxb2G3Y7bMneHfI7tDdYbvD/ebzEFXQTp1ojk0FxMHi4yfcjVMVwFOV0I3CQuc9
+P/7JyqptL+CjR+/+ZcPP3vzqH7fw+q0Pnnig/NjcptP3jJCFlIdrnbXvvDQ6r3ftXseCV/YcOxm5
+fsWE8R0jRxYXJ2/l+QZVgx1coKsV/cQ2MtTirxe1KDJCow0yNsukM+JkmEmLzP66fE2BOd+/YFho
+fnh2rOn6zIPG0pkHzaUPzD2Kwr8+MWlez1RuJgs309TL18FUTOnJkBWTbNOSxCQpSZOkTdIl6ZMM
+ST5pwWkhaaFpYWnhaRFpw9Ii06IaSIPYIDVoGrQNugZ9g6HBpyW4JaQltCWsJbwlomVYS2RLVCye
+j7n2YTjWDNlVSWZ9AzWrCc9YK2dscO1LzSm6e9/kGbmTn302piwtz0muTs8+Rz/oXSas/cy96qPe
+NcLaL2rZt7hw4dS0HIh9DIEpfCSO5LUjwuYr7EHPi3s0Eo4UkQ7inefd7uuQ31MYO8jpV3rgRxxJ
+z9HJ9KyCJ6sZBeDX4Du2YE2bKLShjbo28RcGLOnHaUkUSjHyetHVxYh185wZwNKU+nuaLO0tFR7r
+rROO9yyTLuynOft7P9yv0GY5MQJsFYDibaF6P4IIxLS503jSANGDZvjqNT45geCDySwfJ4IVWFGC
+AL4DSmLE0YceXtvU0TFun/tnzwlHemcIR9oee/FnvRvEhfsWll1Scj8tFqPFZaDLMJRiGxZq1JNm
+f31zUKd/e8SpsJORoUaNJnwasljuVTJIcjJLH5d5IVBTlloIrRrMPJkVAua9qQy8vA2NjZs2NTZu
+EMLHtjvPXPn4dUd7wtGjwph337t44cLF93o3l8zDE7EZB+Mpc0pa/nlTwQBiM0J8cAgG7QZ80sj0
+nwFAcAx6lCqZrGIQAPZSpGGGU8LqVMeS2kc3Hz067rmHn9+H9zEQGATCiq/27LM7Lqnx8fWH5GWw
+pxn4hRi1OowOiW3+ujbDRv92i14b5YNSLaae8z1d3gp487dM9YmpUZhzY/XApAFu1Q+crGh5mK4T
+pr1za2HnPd333ffUGyRrf4+F/u2TeIXXBdBNA/YdieptNl+j4OcTEh2l0wtaQ0hUdFRGZFSowScq
+WgxCTfiEGNgUdCK02Sw2x3Wa20dFGnyiI7SoMELjl6vVBFqzR5mudwEIl1lS96Z1E71x1XTjqiWE
+pyKeR/0+A3i0/DrPioMS1PzDynBQIBN7pKrI+EQhAbMqmhxM3ircXbJ61Q9enLFpS/fvSo48tPjl
+0pXrb+iyd/3wvdfv3ytOPpyQcF/JzBmxfuE7V+89FhvbmZpaNq9hnOAXvXXNjw/EcN+KA19+HnAV
+kAFts6WjOIxESRTiJFELv5o4SRL1ccSgg18cZyAGFAeNNTFkIKJtwwfJRr2k12k1vDHVS4kGH9Of
+unkDNhVqsVc53Wdak/SZVvk3YKT7DAqHlrDCEW5A/tBFtyCRYB9BJEZRr9Xo1uNNAisWmEApx7Ek
+hsQKFRfwfvqLG/jMuZreG1XnpNhekbxwewxupKuQWnct0DeYIFaSoGNBgeHNfoHNuna/TryDhEBV
+F6aZLT7T+yMlsbs/UPqcUo2QgZFD7u/oSGh3vHHlk9ed26n/xsbGpqbGxo3knJD5z+4tJXMwtAUQ
+JRPnUJ933/vTeYgc5ks31fpqgP4ikLA8JG3UQvuqi9VEERSLfaDB6OpR2hfetEIjLKXGpbAcBLE6
+hb6Ai17HE3pe2y/W53XMuH1BzUHbgG4snIuGoftso9GwOEkjwdmZhETEaTRShsn8rG9bYKuI2gRk
+MgjYEBViNZHhkaYe4HXihFIfGMPrbyomkrj/wVdI8jxrHGufJqCJ92JFc6XYQQet0fphXC+80FN/
+DIemOnK2NjzwWu3iV+0Xsc88x6QL+/fvP40T7l3ZVrj6sYzMN8clX/n1whOe9L8xu7zC+iGwi49i
+l74c1u7fGbEjDHLXNJ7FcphdkpXEOcAuStrkxuClR+lnR4wMgkRKWjc2rt+8eX3jxt4P43eUv/7x
+lTcggXV0CIksgZ3/03vC8uK59Az9nH5KT88p2cKOVRhOb0jUSU9D/hpnC/WTdP7kCDLjk7ojBp2P
+Ho4VGpPFb3BX2319aherpsxNWJEY1Aea4Ri3hz74YP3ZS2f3s7ZWepqebOnd/R+Ltu59Q1jYgu+F
+M8VWekm4hhORhEJtPuQnaI+GiDgSWMEp6E1IDT2spAWR2AB8s+f09jKceJauxWsUezcBfuPA3mHQ
+DYeH/RIdCm4jvr80HjK16VtJe3hAshGN0ySFs5qmHgJ4EryaFOdtFmMg4fPEovj2hIniuPw9D0C/
+fwqn4cgH9uTP2D/7dFfX6bnP5aaOHo1bcS2uwe2jR5+9x0bfpm/R39K3bff01z9+Jhhc/3bcuf51
+37H+mb+n/mkCe5/hBVBAnXS2WAr52KTUv76Y7vRrx6fIyUiI52k8sgd4z8D6F9dXb1W/GeRPy+Dc
+BWH9949fL2/HX2xQfGnDlt4zGkNLyRz6G/oJuM6ZOfiG6k6KPWYDBisgro2o0RavE4igJUQA/bFe
+EHCGgTXQOuihfSA9Qm6U4NAoJho0KMlX6aND1D66izVmSgSe8XbTbAyJ0d+A0XzbcEln0IfgUBKi
+C9VDG01G6EbrJ+DJZIJukt7PXwsfA5mPoZ/WY3bGwrEA82zIHAIWsf8xerOd3nhJutCrE768PUYa
+2fMZCbj9R7Xvnwjya1CqLUyKAwVIHCT+DAn6JCIR2GxF0VoTO45MVg7U3kTBfudZoVcCVjFN5Pne
+T94RdL2p0oXZt9dKY5i9ylkvy2uKL8qwRWNf4gs1wxdqho+2TcJQNLDRgKJ0osbfONzP1NNznrep
+rE9gI8uAswVDAhQjKWDAWH6EFD6go/HvYz559dUzvRukyJ5PyVs9Kc/QndhxHEHHyM4MeRAn/JyM
+DbZw8lO9pS3K2BbaGtU+PCgqQhODIqz+UTHRw0E5SLimq96O4fzVJNu7iSgRJwqJJFFMlBI1idpE
+XaI+0ZDok4bScJqQRtLENClNk6ZN06Xp0wxpPoWoEBcKhYZCnwVoAV4gLDAs8NmFduFdwi6yS9wl
+7dLs0u7S7dLvMuzyOYAO4APCAXJAPCAd0BzQHtAd0B8wHPA5jo7j48Jxclw8Lh3XHNce1x3XHzcc
+98n5NmFUVmSBuEBaoFmgXaBboGeMv43QcHAQzHsGpZkIUHMAC4eBLwfwh/kTJhUVTp40s3FLU9OW
+x5qaHvv8xo3PP79+Xbg6saho4qSCPGEnJIMz9HX6Nk7CE6AvTNpNl9O19FG6HG/Ej+A1eCOPD+jh
+xbn8XDncFqD23+IvdBLmzfd4g9J8K438wNY79gpx9f5AcPbueIN13dP3907s6zfjIAeEoURbuLHJ
+94QJNYWdCG4mpmZ9J0uAFiPS5IRDt+XNfyZ6nXVZd0iA3pOdGDfjR8W0h17EcVi8b3tB7tb5P3/p
+2PMLt6VPhqPyJBwIn0l3xb+SPuUvb5+9dPe9zLfr6TXxB+BfZhSJ7rHJKMpk9o9oI0E8DZujzKEm
+oz8KtSQbJ4Qma1KjvKdmdggDsbq4o8EZFHxcsmpiB9hBG6IN8NoBZoQWbbju9q1bPb23NjW91mba
+sL19w4b27RsiBNyA1+MNuIE20BX0Pdo+vdNBbuFcHE7/Rl+kHfRvOAziYC/g/zB/Z2ZGMkgaG4ba
+DPo2y0bcZvhFtNknLDpAJ0jILypYSh42To+iLEkxygu08zxbT+47Fk3uf49GBrxQY66kZd2pOBrj
+hz8/2Pr0vs8//eG6tU/SGfilj75ct27rs/Qm/SfNEc70vr9qyw83CeX03trVDzv2/uZXm54ODD67
++42zgGcEfUXcLrkhXsejWtu4UWOGh4cQP6M+Yjw5EKI/YDSPHH5gTEjUgXFjUkf6akaBkccEonDf
+BGNgzBjj2IRU6Dd7ukx0aheken60ZyifZ1NdF7rgyD95sjLND/2+6tE2oCGwIUjDYqK/DgT0H/L5
+0Yg9UrxmwsSQfheyBIl+DUuWrF27ZElD8+Nx64p//M47Py5aP/zgEzfp+3gGtkyompyUtmoK3UHn
+4+V46rnbQszaHTvWPrpjB/3YlZZ17eWXr+Xck7azE2LmKNhrZWDQhrBQ/DvcDFb9Lb35F+gT+PkX
+jwMrmo6gPQK0CKLpPO+I+JGXHXfxOH7QFdAaiIscnu+Go7tt1gANagv+mcm3yfiYqc2qaRvWam2P
+C9AQHG3VRxlHhEXHmXoug0v2vSi8yWKEvV3ytrmABuFnDYuZN8Kp4y0psoXpbh0hlK7dunXt+o0b
+LqU9ln/idOL+mj989o8/Y/EafZ9+mvuk0PrSM8+89Iufv3Cwd9NLcSNxDA5zLMGG6/+F9XQzddEN
+1B2N1Pc6LEeHgszgmdrosDZDdJvJ8DMRN6HHxLbgVlN7nDUKjfC1ajXDcAATursb5O5rbD5S3uYk
+YbWh4bU9KFCIlQUl0Ae+/iQfMGl/k8Skvf4+7bkGhStwxpP0/bVPPgnKbJQOg7D0A/p3xxJ66x/X
+6E1cj5/AK/GW6N4qr0I8B7F3sBNB7lFoGvTcAW1Bhib9Xt82TXSTvHdYW2yrpj3oudHBAYgEhkWN
+MEURa3SgPno09NxdalSB/N19nRmPLB5AA493I8bg1L4jR3/jTXRbd9JPbyx+d3H5bxbtPXRo2/bt
+TTufWD+vs2LFr3Pfw9ImEj3y1ad+++mI4WdSx7duebR978pq96pRo16S5Yu/WvWM0rO0gPxjISew
+zGUVtZHhbVpzk+mxwDZflp1927X7oyA3h0RhgxWZoqPYYaFLrY9eX6FdEEc8WTPJUFAgGiQ8k/ms
+cL23a8yc+I+xiX54a9npgh+8ZH/2V8eevW97DsvoT5j86dVPuukXsvxW8riDe3YfiosDT18HshVw
+P45FiSjTFhdqRG0jNW1RY9ssULlHPpcUahx+V1TQ8Ch/fVRQhJVE+cdEJ4GI3VxG3uip8Jp42A96
+Ax7nPTP3Ja1Y63CYCRhwvhMqNmx9qnHj1qfo62ufuPb2uWtPrG3dRenly/TrXfkNK1Y2rFm1okE4
+3bZ5c3tb86ZtpTGH1xw6d+7QmsMxMa/tev3yh2d2n8GLlj/yyPKVDWsVvMHXS1ee+3PxuAX+U2+g
+aB3/s98bzz25o/+PgLRYfF4DQYF0fVOwT1tNIwf8pRAP+cshFs+hCnQaP8T+cocOod1oFfRzjewd
+IuSO0zDH5qvRBTjds781bUOvoHV4K6w5hTqhc22CDq0RKvQpVA91IgL2rIH7TXD6Xsfpj0AL0T50
+Gcu4FIrNecEqbCPgGcRGashe8oU4SnxQPC9Nlf5TOqjRaYo0mzX7NFe1I7S12re1VDdVj/Sj9FX6
+E4ZAw9OGwz5+Pg/5vG4MNT6qahKPUsHeylt+E2pnmktzsBlORSLMBWO/Pn0X9OmOYeUCdSzAOpc6
+hgyJ3OpYhPE6dSxBX75VHWuQH9qljlk1/Lk69oE46FTHvvqt6KI69oPupAYoY1EPd52GPeoYI9ln
+oToWkM6nQR0TmN+ojkUY71PHcMrzeU0da9Awn7+oYx2y+vSoYx80xRiljn0DRhjnqmM/VBH9SKar
+dkVd5eIKjzyqbLScnJSUIi9aIWdUetyeOqe9Ol7OrSlLkNOrquRitsotFzvdzrqlTkeCIcv5kH12
+vVxWYa9Z7HTL9jqnXFkj19Yvqqoskx2uantljXdNib3GLee7alwZLteSoXND72c769yVrho5OSEl
+RXnGHg1YWe6qAUE8IF6Fx1M7JTHRAfNL6xPcrvq6Mme5q26xM6HG6cnhy5hYTLU+leRRbqdTXuSs
+ci0bnSD/C0okGAz9m0E4u6xQ7oPOMPY7fwyG/znI8hDOlSCi7KmzO5zV9rolsqt8KBWDochZV13p
+5gjC6gpnnRN4La6z13icjni5vA6Uh22gMMAUL3tcsr1mhVwLmMMG1yIPKFxZsxi4lIHQbKWnwqki
+bi8rc1XXwnK2wFMB1AEkZ40bALZySKyjgZhDtrvdrrJKO/ADBMvqq501HruHyVNeWQUYj2IU+Qa5
+xFXuWQaYW0dzSeqctXUuR32Zk5NxVIJilYvqPU4uw6AN8WClsqp6B5NkWaWnwlXvAWGqK1VGbH2d
+AiWQrXfDeqZOvFzt5Fpz+7or4gfwiGc8E111stsJdoDVlSCqqv4Q1kw4IFvLgPao0HFGyypc1d/c
+wMxQXl9XAwydfKPDJbtd8bK7ftFDzjIPm1EwrgKXZAqVuWoclUwP9xSDoRQe2Re5ljq5BooXcQH6
+nKDG5QEzuJVZZpXafg9QnsnuCjsotcipogZigJPbB+npqgG/qJOrXXXOO6ote1bUOsvtwChBEWrw
+02r7Cka/2uWoLK9kjmav8oDrwQCI2h0OrrkCHYsvex3IVV9lr+OMHE535eIaLsbiqhW1FW62iXmo
+vQyIuNkOrzzuoZwUj3MogNmrBhAYQkTd55WlnyKIWFO1Qq4c5OqgUp2T/SdIfC0buBmYzDbeEHGC
+3zkVBZa56hxu2doXi1bG2/tAtrLQtXLYwDp5aswsckI0Mar1YAemxFJXZZ9gzuUeiBrZXlsLIWZf
+VOVkDxT9gfIQw1TYPXKF3Q0UnTWDcQF2/R7ukOtrHKrA1sF5xapo+F2WdbuqWGRz0zFD2eUqlkEg
+XrwLa+1lS+yLQTGIxRpXX/741x1rECtIWiCis6qcCTU9W84pLCiVSwpzSuekF2fLuSVyUXHh7Nys
+7CzZml4C99Z4eU5u6fTCWaUyrChOLyidJxfmyOkF8+SZuQVZ8XL23KLi7JISubBYzs0vysvNhrnc
+gsy8WVm5BdPkDNhXUFgq5+Xm55YC0dJCvlUllZtdwojlZxdnTofb9IzcvNzSefFyTm5pAaOZA0TT
+5aL04tLczFl56cVy0aziosKSbKCRBWQLcgtyioFLdn42KAGEMguL5hXnTpteGg+bSmEyXi4tTs/K
+zk8vnhnPJCwElYtlviQBpAQacvZstrlkenpenpyRW1pSWpydns/WMnSmFRTmM4xmFWSll+YWFsgZ
+2aBKekZetiIbqJKZl56bHy9npeenT8su6WfClqnq9MPBNkzLLsguTs+Ll0uKsjNz2QBwzC3Ozizl
+KwF7QCKPi5tZWFCSfd8smIB1XhZgkOnZnAUokA7/MrlkXP0CUJfRKS0sLu0TZU5uSXa8nF6cW8JE
+yCkuBHGZPWEH03EW4MmMV6DKy2zE5r7pHbCK7VYVzMpOzwOCJUyMb6wF78peXuas9TDfVoNbSY88
+lSr5M557rZIEwIWn1UDgKnN8CP4MkcUrj5Lh+oOLleR4Nf2y9AHeDdVISb+OpU7Igm6WSiA+XCyZ
+LKt080iHMljtUuue214FzGBX3yrIl/Yq2ObuE3NwQHkLYm1dJWxZVlfpgWQi2+thtq5ypVqK69RS
+NVQDxmWo/HVOdy1UqsqlzqoVCbC2jtUzLkllDbRb1arqHL4yzxRvDvXIizlxBygOTVmCbPjOfi1x
+WeWSysRKyFHLE2orahPVRIkyoROvRStQHapEi+FM4kEynI7L0Gj4TkZJ8EmB0SJYIaMMWOOBbt0D
+q53IDueTeJjNRTWwPgFG6agKPjIq7qPl5ndO+HbCnqVwdcBKA8qC0UNAYTacX2TYXQHjGtjj5Dvs
+nL4MVGrgWgtrFgHdSlgnw34X8LXzZ0PplHAqjEI+rKqB3wz4daEl37vu+57P5vK7gauLy5QMWqTA
+Z+A+76470yznswoiHhU9hpAH9JsC5+VE0ExZvxTWJ8A6F3zXgc5OvreOo5MANJywJ2cANS9aXqt9
+00rsGbOAk1vSCVi60DJYy2z2/8YSzKaGO3JWkLPDaKDM3/Q6Axr7b3wY9/8NT74z2v06V6ooyvy5
+ndu4mqO6BOZcYNnvk4VpVsTpVXNq/T6o0K7gz5yqXos5lxruYQ5Op5w/dfZxUyyseFM8l8vFJazh
++2tVP1c4uICqR7VwJfcKRZcyFWkvTQ+XYrCP22FVGfeQWpW6lwJbrciueJKTR43iwdYBXmLllmN7
+HfzbzeUqgz12VT/FB8vAK6s5FQ9/4sWnHEZVqh+P6pOxnwOLcya/B2JB8XPGsR8TNlMLVxdwqedy
+9kvj4Bp4uK8tgqce/tTL49s5xKuxVAaS1XMqCibLuA9U8Jj3qMhU87mBGnnp1w3ySkXaeo5h/ADr
+sHE1t6fX1v3x64bd8d+iR3yfnok878icshIPCu1KFdXB1v9urb3IKdLW9nm0Z4jX9Wu0jONR/S9x
+8EZDOc+ZNaqGzgEcHfzKeMTzb4bEQ7CijNNT1gz04yo1S3otVMZ5O7jElaqkU3h0lqq77EDRxTND
+vw0G5qJ+BL6ZCVi98KjR4B601hsr/YgNzAED98lcZ7tqqUV9edvrawoaSia3f4c9XbzGyKrtq/l3
+f/74V2zhAc1red2yqxolDELqu/YyTFb0yV/No6+Sx7I3ozHZPWrWU2YUSRmmjgE2H+h13vrFuCh4
+1QMVO9/n1cjBJWX2qhmAxmJYx7SpUOfqBuRQO/cexXe9PIbi4/5enQbmOMcgD7NzG91Jgu+WZDC/
+objcScZ41e5VfF/ld2T1OjUDObl81YPoemfcfZ7pjZuhVcSp5jvnIAss41o5+H7rHeqitU/voTvY
+em/VtQ7wNiV28obUmUU87l0DZK1X48FriaXwtPIOiDnRco5zjRrRtfBRqpidZ1Zn346B9ldk/u6I
+qeCZXubfblVGJ/eob/cXRbs75XD2tJ6vGozwnVCVByA30Ib/05h18+zprdn9UeeNKNZBVPX1IHXq
+jsEUa7lHL4HrYtViSl2s4dgO7T/+f2Ssb9dqkRojHrUulvchNR1lcz6FqADuGJ9CuCtFc6CfLObP
+cmFOhn6uGJ7MhrssmM3idknnT9hzK4/GOTBmFAvRLE5LoVEMV0Z7Hsww2jK/Z3czYX0B0GJ7s9Fc
+ziMbqJXwlcWcdj7M5sF3trqO7ciEmVlwz8bTEOtGFX4FsKuUxw7bx2RRJC2F+X6ug6XK5Ry9kuXD
+XTHQn64+TQfauZwekz+eI8XGBX1y5qiSpnOMGGVGMxMkyuN3bHYWfBfBuhKOZzrXWZG2gOuQA88V
+XbK5BIolFIky4bsIeLMV00CuUi4F41SqroznGjJ9svh+xnUmn1UkK1StzMb9VBJULBU5GP6z+ziX
+cP3z4CNz/UthppTbJh3oe+l6fWcap5Df50ezuH7pHIdCziGDP2MoMjzz+lYWD7BKJseL2Y1JnsU5
+pXNESu6oiZfaYOvcyTu8HKZx/bI5Unl8dQngmA3rc/tmFH/M5bpmqtgqNBW/V3wibwC6mVxHZtn7
+gGu26lPpHLvBWigRwuTv10KxQLp6zRyAWb/1C1TrZvbZupB72TdRmcNjMZuvSue2LulDIYfHb74q
++awBHua14yzVPwv7JBuMrzeOvOv+ldyh0PLyHmzBLO5PeaqEJX1ofD9dJXdlQ10r4+cdT1/eHly5
+B3aP/V3pwP4zfkCuHdgJKFl4Gl9bPWRd/6ySn5Wa1X/mGdjD3alyeU/JSk/f3/16uw8ldytno4Hd
+r4P36Uov6O7rSpT64errTJbxp/01XTkNVvMVA897bs5X0axe3TGUltJf2nm3wLi574Dmd1WooSfE
+Wl7vFS7L+NijdiZMv3p1LZtfOeRUXDfkVPV9NvDq8n3413F716pnqkqOMOsnE1S6dch7PuvHhCGg
+vN2qHmL1fu9j1KagoX0ow2DxAMkdqsWVN2WMp+HfeL+WyPFeAr+JXEYH7/wSeBdeC3ODO0rlv4VA
+Xz+C7kd3+DkqNOCgQ0/Ol9KH4SDUighcG/j/T0thHMCvFmSBq5mPTfzqj7bD1Y+PfQ99Ok1Kj8O+
+aDXcGVEcXH1QMlwNnJ6er9IhP7hq+VjD10h8LPJ5wmcEPoNt8yihlPSuJj2UfEXJ7WTyz2Pky9Xk
+1s1m6RYlt06IN2/Mk242k5sN4o3rI6Qb88gNm3h9BPnHtUTpH7fJtUTyX5R8QcnnyeRqIPmslXSD
+iN2UdHd8fc72tfjpNPLJFYf0SSu54iAfU/L3v0VIf6fkbxHkI0ouLyEfUvLXY+TSX8KkS7fJX8LI
+B63kz5S8T8mfLgZJf6LkYhB5r5X88Q9B0h8p+cMWH+kPQeT3q8m7U8gFuLkwhZyn5J3fGaR3KPmd
+gZyj5G1Kzm42S2eHkd8Gk7coebOVvNEUJ71ByeuUnFlNXqPkVUp+Q8np7b5SFyWnKDlJySuUnAB6
+JwLJcSPp/PUxqZOSX788X/r1MfLrBvHlY3HSy/PJyzbxWBx5iZKjraSjJV16kZIj8HXkNvkV0DpM
+yS8d5JCD/MKPHLSQA5S8QG295OeUPE/JzyxkPyXP7fOTnksm+/zIs3vN0rOjyF4z+ekzY6WfribP
+jCU/oWQPJT+mZPeuMGm3g+x62iTtCiNPm8iPDGQnJTuAyQ5KtvuS9m0JUjsl2xJIG/BvayWtTx2T
+Wil5CnzrqWPkqQbxycfjpCfnkydt4lZKfkjJE3D/xDHyeBxpATBa0sljoO1jgWSLD2mGiWYHaQLQ
+muLIZjPZRMlGSjZQsr7RLK2npNFM/pOSdZQ8as6QHi0haylpWE7WPLJaWkPJI6vJ6ijyH5Ss8iMr
+KVlGyVJK6j1Gqd6f1HdgZHtP9BiJ54TothC3Tayj5GFKailx1ZRIrlZSUz1Kqikh1aNIFSVLkslD
+lFQmk4rbZPExUk6JkxIHJWWLoqQyShYhk7QoitgpWUjJAkoevN9HetCPzHeQH7xGHoCbBwLJ/T4E
+PHpuIJlDyWxKZkWESbOSSSklJZQUU3LfalJESWEgKaAkH4+V8inJO0ZmjiIzckOlGRNJbqZFyg0l
+07NDpemUTIO7aQ6SA3c5x0h2KMmCiayJJDPDLGVaSGaHYLPpxYx0fynDTDI6BAR36TY/Kd2fpHfg
+E3BnSzNKNj9i68ANcJdm1EtpRpLWgW02h3gvJfeACPfcJlMpuXsUmULJZAB4soNMGhcuTZpJJlIy
+YWygNIGS1JlkfFK4NH4mSYGvFEqSYWEyJePg8bhwkhROEmGUGEoS9MFSwjEyNj5AGhtIxnYIjG28
+ySzFB5B4Jm6rOOauOGkMJXfByrviyGhhijSaklGUjKRkhD+JC86Q4rLJcH8SS4nV31+yUhIjj5Vi
+VhN5LImeSaKAcxQlkZQMA2yHURIBVokII+GUhFESSkkIUAjJIcFBY6XgDBIUaJKCxpJAEwmAdQGB
+xAL7LZSYQXNzBjEBB5OZmBTs/P2Mkr8/8Vew8/M1SH5G4qdg5wvY+RqIL2B3WDTqiZH51kTRhxID
+aGKgRB9MdCaipUQDpDWUSIGEgHLkNhFgQphCMAiAxxJkIrgDOxq34DH/d37Q/7YA/+ZPJPpvgO3r
+dQplbmRzdHJlYW0KZW5kb2JqCgo2IDAgb2JqCjEwNDEzCmVuZG9iagoKNyAwIG9iago8PC9UeXBl
+L0ZvbnREZXNjcmlwdG9yL0ZvbnROYW1lL0JBQUFBQStEZWphVnVTYW5zTW9ubwovRmxhZ3MgNQov
+Rm9udEJCb3hbLTU1NyAtMzc0IDcxNiAxMDQxXS9JdGFsaWNBbmdsZSAwCi9Bc2NlbnQgOTI4Ci9E
+ZXNjZW50IC0yMzUKL0NhcEhlaWdodCAxMDQxCi9TdGVtViA4MAovRm9udEZpbGUyIDUgMCBSCj4+
+CmVuZG9iagoKOCAwIG9iago8PC9MZW5ndGggNDE2L0ZpbHRlci9GbGF0ZURlY29kZT4+CnN0cmVh
+bQp4nF2TzW7iMBSF93kKLzuLKvEPCZVQJAaKxKIz1dA+QEgME2lwIhMWvH197klbaRagz/G9l8/m
+JN/st/vQT/lrHNqDn9SpD1301+EWW6+O/tyHTBvV9e00r+S7vTRjlqfew/06+cs+nIbVKsv/pL3r
+FO/qYd0NR/8jy3/Hzsc+nNXD++aQ1ofbOP7zFx8mVWR1rTp/SnNemvFXc/G5dD3uu7TdT/fH1PJd
+8HYfvTKy1lRph85fx6b1sQlnn62Kolar3a7OfOj+23OWLcdT+7eJqVSn0qJYFHViI1wZsBUud2BH
+LsEL8hO4JG/AFXkBXgq7Z/ATn2vwmrwF/xQ28rsbYbsGb9krc55ZL3N2dMMcXZBRo+nv0Ktnfwum
+v5P62d+B6W/lOf0tzqtnf2H6V1JPf4Mzavo7mU//cgmmf4Wz6NkfZ9T0txWY/hYzDf0t6s3sj7s1
+9C8x39B/AU9Dfwc3Q38nvfQ3uB9Df4v/xdDfykz6W5lJf4t7M/S3SwnJnAbEBXn+jKFqbzGmCEro
+JXtIXR/813sxDiO65PMBZrbPkAplbmRzdHJlYW0KZW5kb2JqCgo5IDAgb2JqCjw8L1R5cGUvRm9u
+dC9TdWJ0eXBlL1RydWVUeXBlL0Jhc2VGb250L0JBQUFBQStEZWphVnVTYW5zTW9ubwovRmlyc3RD
+aGFyIDAKL0xhc3RDaGFyIDQzCi9XaWR0aHNbNjAyIDYwMiA2MDIgNjAyIDYwMiA2MDIgNjAyIDYw
+MiA2MDIgNjAyIDYwMiA2MDIgNjAyIDYwMiA2MDIgNjAyCjYwMiA2MDIgNjAyIDYwMiA2MDIgNjAy
+IDYwMiA2MDIgNjAyIDYwMiA2MDIgNjAyIDYwMiA2MDIgNjAyIDYwMgo2MDIgNjAyIDYwMiA2MDIg
+NjAyIDYwMiA2MDIgNjAyIDYwMiA2MDIgNjAyIDYwMiBdCi9Gb250RGVzY3JpcHRvciA3IDAgUgov
+VG9Vbmljb2RlIDggMCBSCj4+CmVuZG9iagoKMTAgMCBvYmoKPDwvRjEgOSAwIFIKPj4KZW5kb2Jq
+CgoxMSAwIG9iago8PC9Gb250IDEwIDAgUgovUHJvY1NldFsvUERGL1RleHRdCj4+CmVuZG9iagoK
+MSAwIG9iago8PC9UeXBlL1BhZ2UvUGFyZW50IDQgMCBSL1Jlc291cmNlcyAxMSAwIFIvTWVkaWFC
+b3hbMCAwIDU5NSA4NDJdL0dyb3VwPDwvUy9UcmFuc3BhcmVuY3kvQ1MvRGV2aWNlUkdCL0kgdHJ1
+ZT4+L0NvbnRlbnRzIDIgMCBSPj4KZW5kb2JqCgo0IDAgb2JqCjw8L1R5cGUvUGFnZXMKL1Jlc291
+cmNlcyAxMSAwIFIKL01lZGlhQm94WyAwIDAgNTk1IDg0MiBdCi9LaWRzWyAxIDAgUiBdCi9Db3Vu
+dCAxPj4KZW5kb2JqCgoxMiAwIG9iago8PC9UeXBlL0NhdGFsb2cvUGFnZXMgNCAwIFIKL09wZW5B
+Y3Rpb25bMSAwIFIgL1hZWiBudWxsIG51bGwgMF0KL0xhbmcoZW4tSU4pCj4+CmVuZG9iagoKMTMg
+MCBvYmoKPDwvQ3JlYXRvcjxGRUZGMDA1NzAwNzIwMDY5MDA3NDAwNjUwMDcyPgovUHJvZHVjZXI8
+RkVGRjAwNEMwMDY5MDA2MjAwNzIwMDY1MDA0RjAwNjYwMDY2MDA2OTAwNjMwMDY1MDAyMDAwMzMw
+MDJFMDAzNj4KL0NyZWF0aW9uRGF0ZShEOjIwMTMwOTE3MTA1MjE5KzA1JzMwJyk+PgplbmRvYmoK
+CnhyZWYKMCAxNAowMDAwMDAwMDAwIDY1NTM1IGYgCjAwMDAwMTIxNDEgMDAwMDAgbiAKMDAwMDAw
+MDAxOSAwMDAwMCBuIAowMDAwMDAwNTAzIDAwMDAwIG4gCjAwMDAwMTIyODQgMDAwMDAgbiAKMDAw
+MDAwMDUyMyAwMDAwMCBuIAowMDAwMDExMDIxIDAwMDAwIG4gCjAwMDAwMTEwNDMgMDAwMDAgbiAK
+MDAwMDAxMTIzOCAwMDAwMCBuIAowMDAwMDExNzIzIDAwMDAwIG4gCjAwMDAwMTIwNTQgMDAwMDAg
+biAKMDAwMDAxMjA4NiAwMDAwMCBuIAowMDAwMDEyMzgzIDAwMDAwIG4gCjAwMDAwMTI0ODAgMDAw
+MDAgbiAKdHJhaWxlcgo8PC9TaXplIDE0L1Jvb3QgMTIgMCBSCi9JbmZvIDEzIDAgUgovSUQgWyA8
+MUQ3RURGOENDMTExODZGOUQwNERCQTNCNTIxRUIwRUQ+CjwxRDdFREY4Q0MxMTE4NkY5RDA0REJB
+M0I1MjFFQjBFRD4gXQovRG9jQ2hlY2tzdW0gL0FGQTcyQ0IwMzY4QzE1RjAyN0YxODgxNDAxQkM3
+QkQ0Cj4+CnN0YXJ0eHJlZgoxMjY1NQolJUVPRgo=</field>
+            <field name="datas_fname">Jones_CV.pdf</field>
+            <field name="name">Jones_CV.pdf</field>
+            <field name="res_id" ref="hr_recruitment.hr_case_salesman0"/>
+            <field name="res_model">hr.applicant</field>
+        </record>
+        <record id="applicant_attach2" model="ir.attachment">
+            <field name="datas">UFJPRklMRSANCg0KTmFtZSAgICAgICAgICAgIDogU2hhbmUgV2lsbGlhbXMgIA0KQWRkcmVzcyAgICAgICAgIDogODEgQWNhZGVteSBBdmVudWUsIA0KICAgICAgICAgICAgICAgICAgICAgOkJpcm1pbmdoYW1CNDYgM0FHLCANCiAgICAgICAgICAgICAgICAgICAgIDpVbml0ZWQgS2luZ2RvbSwgDQpRdWFsaWZpY2F0aW9uICAgOiBNQ0EgDQpFbWFpbCAgICAgICAgICAgICA6IFNoYW5lV2lsbGlhbXNAaW5mby5jb20gDQpNb2JpbGUgICAgICAgICAgIDogOTk2MzIxNDU4NyA=</field>
+            <field name="datas_fname">Williams_CV.doc</field>
+            <field name="name">Williams_CV.doc</field>
+            <field name="res_id" ref="hr_recruitment.hr_case_programmer"/>
+            <field name="res_model">hr.applicant</field>
+        </record>
+        <record id="applicant_attach3" model="ir.attachment">
+            <field name="datas">UHJvZmlsZQ0KDQpOYW1lICAgICAgICAgIDpKb3NlDQpBZGRyZXNzICAgICAgIDo5MywgUHJlc3MgQXZlbnVlDQogICAgICAgICAgICAgICAgICAgOkxlIEJvdXJnZXQgZHUgTGFjLCA3MzM3NywNCiAgICAgICAgICAgICAgICAgICA6IEZyYW5jZSANClF1YWxpZmljYXRpb24gOk1DQQ0KRW1haWwgICAgICAgICAgIDpKb3NlQGdtYWlsLmNvbQ0KTW9iaWxlICAgICAgICAgIDo5OTY4NTEzNTg3</field>
+            <field name="datas_fname">Jose_CV.txt</field>
+            <field name="name">Jose_CV.txt</field>
+            <field name="res_id" ref="hr_recruitment.hr_case_fresher0"/>
+            <field name="res_model">hr.applicant</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index fb54eaab1e3..ebf16cb9b94 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -3,9 +3,10 @@
   <data noupdate="1">
     <record id="hr_case_salesman0" model="hr.applicant">
         <field name="name">Salesperson</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_marketing"/>
         <field name="type_id" ref="degree_graduate"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field name="user_id" ref="base.user_demo"/>
         <field eval= "time.strftime('%Y-%m-01 10:35:50')" name="date"/>
         <field name="priority">2</field>
         <field name="partner_name">Enrique Jones</field>
@@ -35,7 +36,7 @@
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-        <field name="user_id" ref="base.user_root"/>
+        <field name="user_id" ref="base.user_demo"/>
         <field name="priority">1</field>
         <field name="partner_name">Jose</field>
         <field name="stage_id" ref="stage_job3"/>
@@ -45,7 +46,7 @@
     </record>
     <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
         <field name="name">Marketing Job</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_marketing"/>
         <field name="type_id" ref="degree_bac5"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
         <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
@@ -69,7 +70,7 @@
     </record>
     <record id="hr_case_financejob0" model="hr.applicant">
         <field name="name">Finance Job</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_hrm"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
@@ -110,7 +111,7 @@
     </record>
     <record id="hr_case_advertisement" model="hr.applicant">
         <field name="name">Advertisement</field>
-        <field name="job_id" ref="hr.job_developer"/>
+        <field name="job_id" ref="hr.job_consultant"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
@@ -125,28 +126,68 @@
     <record id="hr.job_developer" model="hr.job">
         <field name="survey_id" ref="survey_job_0"/>
     </record>
+    <record id="hr.job_ceo" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+    <record id="hr.job_cto" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+    <record id="hr.job_consultant" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+    <record id="hr.job_hrm" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+    <record id="hr.job_marketing" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+    <record id="hr.job_trainee" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
 
-     <record id="message_application_demo" model="mail.message">
-            <field name="model">hr.applicant</field>
-            <field name="res_id" ref="hr_case_advertisement"/>
-            <field name="body">Please do refer to this application for sure.</field>
-            <field name="type">comment</field>
-            <field name="author_id" ref="base.res_partner_2"/>
-        </record>
-         <record id="msg_case18_aplicant" model="mail.message">
-            <field name="subject">Regarding reference</field>
-            <field name="model">hr.applicant</field>
-            <field name="res_id" ref="hr_case_advertisement"/>
-            <field name="body"><![CDATA[<p>Hello!<br />
+    <record id="message_application_demo" model="mail.message">
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_advertisement"/>
+        <field name="body">Please do refer to this application for sure.</field>
+        <field name="type">comment</field>
+        <field name="author_id" ref="base.res_partner_2"/>
+    </record>
+    <record id="msg_case18_aplicant" model="mail.message">
+        <field name="subject">Regarding reference</field>
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_advertisement"/>
+        <field name="body"><![CDATA[<p>Hello!<br />
             I will surely refer to this application as it is by your reference and <br />
             will try to conduct an interview within a very short time<br />
             Thanks,</p>]]></field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mail.mt_comment"/>
-            <field name="author_id" ref="base.partner_demo"/>
-        </record>
-       <function model="mail.message" name="set_message_starred"
+        <field name="type">comment</field>
+        <field name="subtype_id" ref="mail.mt_comment"/>
+        <field name="author_id" ref="base.partner_demo"/>
+    </record>
+    <function model="mail.message" name="set_message_starred"
             eval="[ ref('msg_case18_aplicant')], True, {}"
-        />
+    />
+    <record id="msg_case_salesman0_aplicant" model="mail.message">
+        <field name="subject">Refuse Application</field>
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_salesman0"/>
+        <field name="body"><![CDATA[<p>Hello,</p>
+        <p>I have checked this application but It's not match with our requirement. so no need to process further and we should refuse this application.</p>
+        <p>Kind regards,</p>]]></field>
+        <field name="type">comment</field>
+        <field name="subtype_id" ref="mail.mt_comment"/>
+        <field name="author_id" ref="base.partner_demo"/>
+    </record>
+    <record id="msg_case_fresher0_aplicant" model="mail.message">
+        <field name="model">hr.applicant</field>
+        <field name="res_id" ref="hr_case_fresher0"/>
+        <field name="body"><![CDATA[<p>Hello,</p>
+        <p>We should move further for this application as early as possible..</p>
+        <p>Kind regards,</p>]]></field>
+        <field name="type">comment</field>
+        <field name="subtype_id" ref="mail.mt_comment"/>
+        <field name="author_id" ref="base.partner_demo"/>
+    </record>
+
   </data>
 </openerp>

From 4da8f14e0cadec975c9808281968e94745e21441 Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP)" <dka@tinyerp.com>
Date: Fri, 20 Sep 2013 15:58:18 +0530
Subject: [PATCH 409/547] [IMP]add template_id in hr_recruitment_stage for mail
 functionality.

bzr revid: dka@tinyerp.com-20130920102818-xj7ua08i5406wi16
---
 addons/hr_recruitment/hr_recruitment.py       | 14 ++++
 addons/hr_recruitment/hr_recruitment_data.xml | 79 ++++++++++---------
 addons/hr_recruitment/hr_recruitment_view.xml |  1 +
 3 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index fbbe5305ef9..9903fa09d23 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -54,6 +54,7 @@ class hr_recruitment_stage(osv.osv):
         'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
         'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
         'requirements': fields.text('Requirements'),
+        'template_id': fields.many2one('email.template', 'Use template', help="Use this email template, so that an email will be sent to applicant if application stage is changed to this stage.")
     }
     _defaults = {
         'sequence': 1,
@@ -255,6 +256,16 @@ class hr_applicant(osv.Model):
     _group_by_full = {
         'stage_id': _read_group_stage_ids
     }
+    
+    def _get_mail_template(self, cr, uid, ids, template, context):
+        mail_obj = self.pool.get('mail.mail')
+        assert template._name == 'email.template'
+        for applications in self.browse(cr, uid, ids, context):
+            if applications.email_from:
+                mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, applications.id, True, context=context)
+                mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context)
+                if mail_state and mail_state['state'] == 'exception':
+                    raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context)
 
     def onchange_job(self, cr, uid, ids, job_id=False, context=None):
         if job_id:
@@ -429,6 +440,9 @@ class hr_applicant(osv.Model):
         # stage_id: track last stage before update
         if 'stage_id' in vals:
             vals['date_last_stage_update'] = fields.datetime.now()
+            stage_obj = self.pool.get('hr.recruitment.stage').browse(cr, uid, vals.get('stage_id'), context=context)
+            if stage_obj and stage_obj.template_id:
+                self._get_mail_template(cr, uid, ids, stage_obj.template_id, context)
             for applicant in self.browse(cr, uid, ids, context=None):
                 vals['last_stage_id'] = applicant.stage_id.id
                 res = super(hr_applicant, self).write(cr, uid, [applicant.id], vals, context=context)
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index d3cbc9fff0e..9cd32139598 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -17,6 +17,44 @@
         <field name="name">Interview</field>
     </record>
 
+<!-- Templates DATA for  refuse and approve -->
+    <record id="email_template_refuse_applicant" model="email.template">
+        <field name="name">Refuse Application</field>
+        <field name="email_from">${user.email or ''}</field>
+        <field name="subject">We refuse your application</field>
+        <field name="email_to">${object.email_from}</field>
+        <field name="lang">${object.lang}</field>
+        <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
+        <field eval="0" name="user_signature"/>
+        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
+        <p>We thank you for your interest in our company and for your application.
+        Unfortunately, your profile does not match with our needs or our recruitment campaign has reached its term.</p>
+        <p>If you want more details, feel free to contact us by phone.</p>
+        <p>Kind regards,</p>
+        <br/>
+         ${object.user_id.signature}
+        <br/>]]></field>
+    </record>
+
+    <record id="email_template_approve_applicant" model="email.template">
+        <field name="name">Interested in Application</field>
+        <field name="email_from">${user.email or ''}</field>
+        <field name="email_to">${object.email_from}</field>
+        <field name="subject">We are interested in your application</field>
+        <field name="lang">${object.lang}</field>
+        <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
+        <field eval="0" name="user_signature"/>
+        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
+        <p>Congrats! Your resume's got our interest!
+        I will call you as soon as possible to make a 10 minutes phone interview and  plan a first meeting.</p>
+        <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030
+        If I do not answer, please let me a message with some schedules to call you back.</p>
+        <p>Kind regards,</p>
+        <br/>
+         ${object.user_id.signature}
+        <br/>]]></field>
+    </record>
+
         <!--    HR Recruitment Source        -->
 
     <record model="hr.recruitment.source" id="source_linkedin">
@@ -70,11 +108,13 @@
     </record>
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
+        <field name="template_id" ref="email_template_approve_applicant"/>
         <field name="sequence">5</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
         <field name="sequence">6</field>
+        <field name="template_id" ref="email_template_refuse_applicant"/>
         <field name="fold" eval="True"/>
     </record>
     <record id="survey_job_0" model="survey">
@@ -211,45 +251,6 @@
         <field eval="0" name="allow_comment"/>
     </record>
 
-	<!-- Templates DATA for  refuse and approve -->
-		 
-    <record id="email_template_refuse_applicant" model="email.template">
-        <field name="name">Refuse Application</field>
-        <field name="email_from">${user.email or ''}</field>
-        <field name="subject">We refuse your application</field>
-        <field name="email_to">${object.email_from}</field>
-        <field name="lang">${object.lang}</field>
-        <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field eval="0" name="user_signature"/>
-        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
-        <p>We thank you for your interest in our company and for your application.
-        Unfortunately, your profile does not match with our needs or our recruitment campaign has reached its term.</p>
-        <p>If you want more details, feel free to contact us by phone.</p>
-        <p>Kind regards,</p>
-        <br/>
-         ${object.user_id.signature}
-        <br/>]]></field>
-    </record>
-
-    <record id="email_template_approve_applicant" model="email.template">
-        <field name="name">Interested in Application</field>
-        <field name="email_from">${user.email or ''}</field>
-        <field name="email_to">${object.email_from}</field>
-        <field name="subject">We are interested in your application</field>
-        <field name="lang">${object.lang}</field>
-        <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field eval="0" name="user_signature"/>
-        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
-        <p>Congrats! Your resume's got our interest!
-        I will call you as soon as possible to make a 10 minutes phone interview and  plan a first meeting.</p>
-        <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030
-        If I do not answer, please let me a message with some schedules to call you back.</p>
-        <p>Kind regards,</p>
-        <br/>
-         ${object.user_id.signature}
-        <br/>]]></field>
-    </record>
-            
     <record id="survey_answer_job_70" model="survey.answer">
         <field name="in_visible_answer_type">1</field>
         <field name="answer">Male</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a07a2d548dd..ea3b6166d25 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -371,6 +371,7 @@
                     <group>
                         <field name="sequence"/>
                         <field name="fold"/>
+                        <field name="template_id" domain= "[('model_id.model', '=', 'hr.applicant')]"/>
                     </group>
                 </group>
                 <separator string="Requirements"/>

From 3c77dc301899aae1e7a7fe3badbf4c8ea901efe8 Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP)" <dka@tinyerp.com>
Date: Fri, 27 Sep 2013 16:06:31 +0530
Subject: [PATCH 410/547] [IMP]improve demo data of applicant and job postion
 in hr

bzr revid: dka@tinyerp.com-20130927103631-14esjbqvcg1ocrxc
---
 addons/hr_recruitment/hr_recruitment_data.xml |  2 +-
 addons/hr_recruitment/hr_recruitment_demo.xml | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 9cd32139598..1ac494d10cf 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -96,6 +96,7 @@
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
+        <field name="template_id" ref="email_template_approve_applicant"/>
         <field name="sequence">2</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
@@ -108,7 +109,6 @@
     </record>
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
-        <field name="template_id" ref="email_template_approve_applicant"/>
         <field name="sequence">5</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index ebf16cb9b94..dd11345a579 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
   <data noupdate="1">
     <record id="hr_case_salesman0" model="hr.applicant">
-        <field name="name">Salesperson</field>
+        <field name="name">Sales Manager</field>
         <field name="job_id" ref="hr.job_marketing"/>
         <field name="type_id" ref="degree_graduate"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
@@ -17,8 +17,8 @@
     </record>
     <record id="hr_case_traineemca0" model="hr.applicant">
         <field name="name">Trainee - MCA</field>
-        <field name="job_id" ref="hr.job_developer"/>
-        <field name="type_id" ref="degree_bac5"/>
+        <field name="job_id" ref="hr.job_trainee"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -32,8 +32,8 @@
     </record>
     <record id="hr_case_fresher0" model="hr.applicant">
         <field name="name">Fresher</field>
-        <field name="job_id" ref="hr.job_developer"/>
-        <field name="type_id" ref="degree_licenced"/>
+        <field name="job_id" ref="hr.job_trainee"/>
+        <field name="type_id" ref="degree_bachelor"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -47,7 +47,7 @@
     <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
         <field name="name">Marketing Job</field>
         <field name="job_id" ref="hr.job_marketing"/>
-        <field name="type_id" ref="degree_bac5"/>
+        <field name="type_id" ref="degree_graduate"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
         <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
         <field name="user_id" ref="base.user_root"/>
@@ -69,7 +69,7 @@
         <field name="title_action">Send mail regarding our interview</field>
     </record>
     <record id="hr_case_financejob0" model="hr.applicant">
-        <field name="name">Finance Job</field>
+        <field name="name">Finance Manager</field>
         <field name="job_id" ref="hr.job_hrm"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
@@ -84,8 +84,8 @@
     </record>
     <record id="hr_case_traineemca1" model="hr.applicant">
         <field name="name">Trainee - MCA</field>
-        <field name="job_id" ref="hr.job_developer"/>
-        <field name="type_id" ref="degree_bac5"/>
+        <field name="job_id" ref="hr.job_trainee"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
         <field name="partner_name">Tina Augustie</field>
@@ -98,7 +98,7 @@
     <record id="hr_case_programmer" model="hr.applicant">
         <field name="name">Programmer</field>
         <field name="job_id" ref="hr.job_developer"/>
-        <field name="type_id" ref="degree_bac5"/>
+        <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
         <field name="partner_name">Shane Williams</field>
@@ -124,6 +124,8 @@
     </record>
 
     <record id="hr.job_developer" model="hr.job">
+        <field name="state">recruit</field>
+        <field name="no_of_recruitment">4</field>
         <field name="survey_id" ref="survey_job_0"/>
     </record>
     <record id="hr.job_ceo" model="hr.job">
@@ -133,15 +135,23 @@
         <field name="survey_id" ref="survey_job_0"/>
     </record>
     <record id="hr.job_consultant" model="hr.job">
+        <field name="state">recruit</field>
+        <field name="no_of_recruitment">1</field>
         <field name="survey_id" ref="survey_job_0"/>
     </record>
     <record id="hr.job_hrm" model="hr.job">
+        <field name="no_of_recruitment">1</field>
+        <field name="state">recruit</field>
         <field name="survey_id" ref="survey_job_0"/>
     </record>
     <record id="hr.job_marketing" model="hr.job">
+        <field name="state">recruit</field>
+        <field name="no_of_recruitment">3</field>
         <field name="survey_id" ref="survey_job_0"/>
     </record>
     <record id="hr.job_trainee" model="hr.job">
+        <field name="state">recruit</field>
+        <field name="no_of_recruitment">6</field>
         <field name="survey_id" ref="survey_job_0"/>
     </record>
 

From ba64b6e3e6e65f5c6720af301fafe3322a7aff5d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 2 Oct 2013 17:05:07 +0200
Subject: [PATCH 411/547] [FIX] gamification: use gauge merged in web and
 instead of own version

bzr revid: mat@openerp.com-20131002150507-ea76au2frffvfd0r
---
 addons/gamification/__openerp__.py            |   4 +-
 addons/gamification/goal_view.xml             |   2 +-
 .../static/lib/justgage/justgage.js           | 946 ------------------
 .../static/src/js/gamification.js             |  31 -
 4 files changed, 2 insertions(+), 981 deletions(-)
 delete mode 100644 addons/gamification/static/lib/justgage/justgage.js

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 444299b9ffb..12e069d5f92 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'author': 'OpenERP SA',
     'category': 'Human Ressources',
-    'depends': ['mail', 'email_template'],
+    'depends': ['mail', 'email_template', 'web_kanban_gauge'],
     'description': """
 Gamification process
 ====================
@@ -56,8 +56,6 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
     'css': ['static/src/css/gamification.css'],
     'js': [
         'static/src/js/gamification.js',
-        # conficting with justgage from sale_crm
-        # 'static/lib/justgage/justgage.js',
     ],
     'qweb': ['static/src/xml/gamification.xml'],
 }
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 9e1e692359f..8ff34b4e03a 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -163,7 +163,7 @@
                                         </t>
                                         <t t-if="record.type_display.raw_value == 'progress'">
                                             <t t-if="record.type_condition.raw_value =='higher'">
-                                                <field name="current" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}" />
+                                                <field name="current" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}" />
                                             </t>
                                             <t t-if="record.type_condition.raw_value != 'higher'">
                                                 <div t-attf-class="oe_goal_state #{record.current.raw_value == record.target_goal.raw_value+1 ? 'oe_orange' : record.current.raw_value &gt; record.target_goal.raw_value ? 'oe_red' : 'oe_green'}">
diff --git a/addons/gamification/static/lib/justgage/justgage.js b/addons/gamification/static/lib/justgage/justgage.js
deleted file mode 100644
index 865a04054a4..00000000000
--- a/addons/gamification/static/lib/justgage/justgage.js
+++ /dev/null
@@ -1,946 +0,0 @@
-/**
- * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
- * Check http://www.justgage.com for official releases
- * Licensed under MIT.
- * @author Bojan Djuricic  (@Toorshia)
- *
- * LATEST UPDATES
-
- * -----------------------------
- * April 18, 2013.
- * -----------------------------
-     * parentNode - use this instead of id, to attach gauge to node which is outside of DOM tree - https://github.com/toorshia/justgage/issues/48
-     * width - force gauge width
-     * height - force gauge height
-
- * -----------------------------
- * April 17, 2013.
- * -----------------------------
-     * fix - https://github.com/toorshia/justgage/issues/49
-
- * -----------------------------
- * April 01, 2013.
- * -----------------------------
-     * fix - https://github.com/toorshia/justgage/issues/46
-
- * -----------------------------
- * March 26, 2013.
- * -----------------------------
-     * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
-
- * -----------------------------
- * March 23, 2013.
- * -----------------------------
-     * counter - option to animate value  in counting fashion
-     * fix - https://github.com/toorshia/justgage/issues/45
-
- * -----------------------------
- * March 13, 2013.
- * -----------------------------
-     * refresh method - added optional 'max' parameter to use when you need to update max value
-
- * -----------------------------
- * February 26, 2013.
- * -----------------------------
-     * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
-     * fixed a missing parameters bug when calling generateShadow()  for IE < 9
-
- * -----------------------------
- * December 31, 2012.
- * -----------------------------
-     * fixed text y-position for hidden divs - workaround for Raphael <tspan> 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
-     * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
-     * Min and Max labels are now auto-off when in donut mode
-     * Start angle in donut mode is now 90
-     * donutStartAngle - option to define start angle for donut
-
- * -----------------------------
- * November 25, 2012.
- * -----------------------------
-     * Option to define custom rendering function for displayed value
-
- * -----------------------------
- * November 19, 2012.
- * -----------------------------
-     * Config.value is now updated after gauge refresh
-
- * -----------------------------
- * November 13, 2012.
- * -----------------------------
-     * Donut display mode added
-     * Option to hide value label
-     * Option to enable responsive gauge size
-     * Removed default title attribute
-     * Option to accept min and max defined as string values
-     * Option to configure value symbol
-     * Fixed bad aspect ratio calculations
-     * Option to configure minimum font size for all texts
-     * Option to show shorthand big numbers (human friendly)
-     */
-
- JustGage = function(config) {
-
-  // if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
-  // if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
-
-  var obj = this;
-
-  // configurable parameters
-  obj.config =
-  {
-    // id : string
-    // this is container element id
-    id : config.id,
-
-    // parentNode : node object
-    // this is container element
-    parentNode : (config.parentNode) ? config.parentNode : null,
-
-    // width : int
-    // gauge width
-    width : (config.width) ? config.width : null,
-
-    // height : int
-    // gauge height
-    height : (config.height) ? config.height : null,
-
-    // title : string
-    // gauge title
-    title : (config.title) ? config.title : "",
-
-    // titleFontColor : string
-    // color of gauge title
-    titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
-
-    // value : int
-    // value gauge is showing
-    value : (config.value) ? config.value : 0,
-
-    // valueFontColor : string
-    // color of label showing current value
-    valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
-
-    // symbol : string
-    // special symbol to show next to value
-    symbol : (config.symbol) ? config.symbol : "",
-
-    // min : int
-    // min value
-    min : (config.min) ? parseFloat(config.min) : 0,
-
-    // max : int
-    // max value
-    max : (config.max) ? parseFloat(config.max) : 100,
-
-    // humanFriendlyDecimal : int
-    // number of decimal places for our human friendly number to contain
-    humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
-
-    // textRenderer: func
-    // function applied before rendering text
-    textRenderer  : (config.textRenderer) ? config.textRenderer : null,
-
-    // gaugeWidthScale : float
-    // width of the gauge element
-    gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
-
-    // gaugeColor : string
-    // background color of gauge element
-    gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
-
-    // label : string
-    // text to show below value
-    label : (config.label) ? config.label : "",
-
-    // labelFontColor : string
-    // color of label showing label under value
-    labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
-
-    // shadowOpacity : int
-    // 0 ~ 1
-    shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
-
-    // shadowSize: int
-    // inner shadow size
-    shadowSize : (config.shadowSize) ? config.shadowSize : 5,
-
-    // shadowVerticalOffset : int
-    // how much shadow is offset from top
-    shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
-
-    // levelColors : string[]
-    // colors of indicator, from lower to upper, in RGB format
-    levelColors : (config.levelColors) ? config.levelColors : [
-    "#a9d70b",
-    "#f9c802",
-    "#ff0000"
-    ],
-
-    // startAnimationTime : int
-    // length of initial animation
-    startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
-
-    // startAnimationType : string
-    // type of initial animation (linear, >, <,  <>, bounce)
-    startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
-
-    // refreshAnimationTime : int
-    // length of refresh animation
-    refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
-
-    // refreshAnimationType : string
-    // type of refresh animation (linear, >, <,  <>, bounce)
-    refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
-
-    // donutStartAngle : int
-    // angle to start from when in donut mode
-    donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
-
-    // valueMinFontSize : int
-    // absolute minimum font size for the value
-    valueMinFontSize : config.valueMinFontSize || 16,
-
-    // titleMinFontSize
-    // absolute minimum font size for the title
-    titleMinFontSize : config.titleMinFontSize || 10,
-
-    // labelMinFontSize
-    // absolute minimum font size for the label
-    labelMinFontSize : config.labelMinFontSize || 10,
-
-    // minLabelMinFontSize
-    // absolute minimum font size for the minimum label
-    minLabelMinFontSize : config.minLabelMinFontSize || 10,
-
-    // maxLabelMinFontSize
-    // absolute minimum font size for the maximum label
-    maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
-
-    // hideValue : bool
-    // hide value text
-    hideValue : (config.hideValue) ? config.hideValue : false,
-
-    // hideMinMax : bool
-    // hide min and max values
-    hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
-
-    // hideInnerShadow : bool
-    // hide inner shadow
-    hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
-
-    // humanFriendly : bool
-    // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
-    humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
-
-    // noGradient : bool
-    // whether to use gradual color change for value, or sector-based
-    noGradient : (config.noGradient) ? config.noGradient : false,
-
-    // donut : bool
-    // show full donut gauge
-    donut : (config.donut) ? config.donut : false,
-
-    // relativeGaugeSize : bool
-    // whether gauge size should follow changes in container element size
-    relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
-
-    // counter : bool
-    // animate level number change
-    counter : (config.counter) ? config.counter : false,
-
-    // decimals : int
-    // number of digits after floating point
-    decimals : (config.decimals) ? config.decimals : 0,
-
-    // customSectors : [] of objects
-    // number of digits after floating point
-    customSectors : (config.customSectors) ? config.customSectors : []
-  };
-
-  // variables
-  var
-  canvasW,
-  canvasH,
-  widgetW,
-  widgetH,
-  aspect,
-  dx,
-  dy,
-  titleFontSize,
-  titleX,
-  titleY,
-  valueFontSize,
-  valueX,
-  valueY,
-  labelFontSize,
-  labelX,
-  labelY,
-  minFontSize,
-  minX,
-  minY,
-  maxFontSize,
-  maxX,
-  maxY;
-
-  // overflow values
-  if (obj.config.value > obj.config.max) obj.config.value = obj.config.max;
-  if (obj.config.value < obj.config.min) obj.config.value = obj.config.min;
-  obj.originalValue = config.value;
-
-  // create canvas
-  if (obj.config.id !== null && (document.getElementById(obj.config.id)) !== null) {
-    obj.canvas = Raphael(obj.config.id, "100%", "100%");
-  } else if (obj.config.parentNode !== null) {
-    obj.canvas = Raphael(obj.config.parentNode, "100%", "100%");
-  }
-
-  if (obj.config.relativeGaugeSize === true) {
-    obj.canvas.setViewBox(0, 0, 200, 150, true);
-  }
-
-  // canvas dimensions
-  if (obj.config.relativeGaugeSize === true) {
-    canvasW = 200;
-    canvasH = 150;
-  } else if (obj.config.width !== null && obj.config.height !== null) {
-    canvasW = obj.config.width;
-    canvasH = obj.config.height;
-  } else if (obj.config.parentNode !== null) {
-    obj.canvas.setViewBox(0, 0, 200, 150, true);
-    canvasW = 200;
-    canvasH = 150;
-  } else {
-    canvasW = getStyle(document.getElementById(obj.config.id), "width").slice(0, -2) * 1;
-    canvasH = getStyle(document.getElementById(obj.config.id), "height").slice(0, -2) * 1;
-  }
-
-  // widget dimensions
-  if (obj.config.donut === true) {
-
-    // DONUT *******************************
-
-    // width more than height
-    if(canvasW > canvasH) {
-      widgetH = canvasH;
-      widgetW = widgetH;
-    // width less than height
-  } else if (canvasW < canvasH) {
-    widgetW = canvasW;
-    widgetH = widgetW;
-      // if height don't fit, rescale both
-      if(widgetH > canvasH) {
-        aspect = widgetH / canvasH;
-        widgetH = widgetH / aspect;
-        widgetW = widgetH / aspect;
-      }
-    // equal
-  } else {
-    widgetW = canvasW;
-    widgetH = widgetW;
-  }
-
-    // delta
-    dx = (canvasW - widgetW)/2;
-    dy = (canvasH - widgetH)/2;
-
-    // title
-    titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
-    titleX = dx + widgetW / 2;
-    titleY = dy + widgetH / 11;
-
-    // value
-    valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
-    valueX = dx + widgetW / 2;
-    if(obj.config.label !== '') {
-      valueY = dy + widgetH / 1.85;
-    } else {
-      valueY = dy + widgetH / 1.7;
-    }
-
-    // label
-    labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    labelX = dx + widgetW / 2;
-    labelY = valueY + labelFontSize;
-
-    // min
-    minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
-    minY = labelY;
-
-    // max
-    maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
-    maxY = labelY;
-
-  } else {
-    // HALF *******************************
-
-    // width more than height
-    if(canvasW > canvasH) {
-      widgetH = canvasH;
-      widgetW = widgetH * 1.25;
-      //if width doesn't fit, rescale both
-      if(widgetW > canvasW) {
-        aspect = widgetW / canvasW;
-        widgetW = widgetW / aspect;
-        widgetH = widgetH / aspect;
-      }
-    // width less than height
-  } else if (canvasW < canvasH) {
-    widgetW = canvasW;
-    widgetH = widgetW / 1.25;
-      // if height don't fit, rescale both
-      if(widgetH > canvasH) {
-        aspect = widgetH / canvasH;
-        widgetH = widgetH / aspect;
-        widgetW = widgetH / aspect;
-      }
-    // equal
-  } else {
-    widgetW = canvasW;
-    widgetH = widgetW * 0.75;
-  }
-
-    // delta
-    dx = (canvasW - widgetW)/2;
-    dy = (canvasH - widgetH)/2;
-
-    // title
-    titleFontSize = ((widgetH / 8) > obj.config.titleMinFontSize) ? (widgetH / 10) : obj.config.titleMinFontSize;
-    titleX = dx + widgetW / 2;
-    titleY = dy + widgetH / 6.4;
-
-    // value
-    valueFontSize = ((widgetH / 6.5) > obj.config.valueMinFontSize) ? (widgetH / 6.5) : obj.config.valueMinFontSize;
-    valueX = dx + widgetW / 2;
-    valueY = dy + widgetH / 1.275;
-
-    // label
-    labelFontSize = ((widgetH / 16) > obj.config.labelMinFontSize) ? (widgetH / 16) : obj.config.labelMinFontSize;
-    labelX = dx + widgetW / 2;
-    labelY = valueY + valueFontSize / 2 + 5;
-
-    // min
-    minFontSize = ((widgetH / 16) > obj.config.minLabelMinFontSize) ? (widgetH / 16) : obj.config.minLabelMinFontSize;
-    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
-    minY = labelY;
-
-    // max
-    maxFontSize = ((widgetH / 16) > obj.config.maxLabelMinFontSize) ? (widgetH / 16) : obj.config.maxLabelMinFontSize;
-    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * obj.config.gaugeWidthScale) / 2 ;
-    maxY = labelY;
-  }
-
-  // parameters
-  obj.params  = {
-    canvasW : canvasW,
-    canvasH : canvasH,
-    widgetW : widgetW,
-    widgetH : widgetH,
-    dx : dx,
-    dy : dy,
-    titleFontSize : titleFontSize,
-    titleX : titleX,
-    titleY : titleY,
-    valueFontSize : valueFontSize,
-    valueX : valueX,
-    valueY : valueY,
-    labelFontSize : labelFontSize,
-    labelX : labelX,
-    labelY : labelY,
-    minFontSize : minFontSize,
-    minX : minX,
-    minY : minY,
-    maxFontSize : maxFontSize,
-    maxX : maxX,
-    maxY : maxY
-  };
-
-  // var clear
-  canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
-
-  // pki - custom attribute for generating gauge paths
-  obj.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
-
-    var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
-
-    if (donut) {
-      alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
-      Ro = w / 2 - w / 7;
-      Ri = Ro - w / 6.666666666666667 * gws;
-
-      Cx = w / 2 + dx;
-      Cy = h / 1.95 + dy;
-
-      Xo = w / 2 + dx + Ro * Math.cos(alpha);
-      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
-      Xi = w / 2 + dx + Ri * Math.cos(alpha);
-      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
-
-      path += "M" + (Cx - Ri) + "," + Cy + " ";
-      path += "L" + (Cx - Ro) + "," + Cy + " ";
-      if (value > ((max - min) / 2)) {
-        path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
-      }
-      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
-      path += "L" + Xi + "," + Yi + " ";
-      if (value > ((max - min) / 2)) {
-        path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
-      }
-      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
-      path += "Z ";
-
-      return { path: path };
-
-    } else {
-      alpha = (1 - (value - min) / (max - min)) * Math.PI;
-      Ro = w / 2 - w / 10;
-      Ri = Ro - w / 6.666666666666667 * gws;
-
-      Cx = w / 2 + dx;
-      Cy = h / 1.25 + dy;
-
-      Xo = w / 2 + dx + Ro * Math.cos(alpha);
-      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
-      Xi = w / 2 + dx + Ri * Math.cos(alpha);
-      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
-
-      path += "M" + (Cx - Ri) + "," + Cy + " ";
-      path += "L" + (Cx - Ro) + "," + Cy + " ";
-      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
-      path += "L" + Xi + "," + Yi + " ";
-      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
-      path += "Z ";
-
-      return { path: path };
-    }
-
-    // var clear
-    alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
-  };
-
-  // gauge
-  obj.gauge = obj.canvas.path().attr({
-      "stroke": "none",
-      "fill": obj.config.gaugeColor,
-      pki: [
-        obj.config.max,
-        obj.config.min,
-        obj.config.max,
-        obj.params.widgetW,
-        obj.params.widgetH,
-        obj.params.dx,
-        obj.params.dy,
-        obj.config.gaugeWidthScale,
-        obj.config.donut
-      ]
-  });
-
-  // level
-  obj.level = obj.canvas.path().attr({
-    "stroke": "none",
-    "fill": getColor(obj.config.value, (obj.config.value - obj.config.min) / (obj.config.max - obj.config.min), obj.config.levelColors, obj.config.noGradient, obj.config.customSectors),
-    pki: [
-      obj.config.min,
-      obj.config.min,
-      obj.config.max,
-      obj.params.widgetW,
-      obj.params.widgetH,
-      obj.params.dx,
-      obj.params.dy,
-      obj.config.gaugeWidthScale,
-      obj.config.donut
-    ]
-  });
-  if(obj.config.donut) {
-    obj.level.transform("r" + obj.config.donutStartAngle + ", " + (obj.params.widgetW/2 + obj.params.dx) + ", " + (obj.params.widgetH/1.95 + obj.params.dy));
-  }
-
-  // title
-  obj.txtTitle = obj.canvas.text(obj.params.titleX, obj.params.titleY, obj.config.title);
-  obj.txtTitle.attr({
-    "font-size":obj.params.titleFontSize,
-    "font-weight":"bold",
-    "font-family":"Arial",
-    "fill":obj.config.titleFontColor,
-    "fill-opacity":"1"
-  });
-  setDy(obj.txtTitle, obj.params.titleFontSize, obj.params.titleY);
-
-  // value
-  obj.txtValue = obj.canvas.text(obj.params.valueX, obj.params.valueY, 0);
-  obj.txtValue.attr({
-    "font-size":obj.params.valueFontSize,
-    "font-weight":"bold",
-    "font-family":"Arial",
-    "fill":obj.config.valueFontColor,
-    "fill-opacity":"0"
-  });
-  setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-
-  // label
-  obj.txtLabel = obj.canvas.text(obj.params.labelX, obj.params.labelY, obj.config.label);
-  obj.txtLabel.attr({
-    "font-size":obj.params.labelFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":obj.config.labelFontColor,
-    "fill-opacity":"0"
-  });
-  setDy(obj.txtLabel, obj.params.labelFontSize, obj.params.labelY);
-
-  // min
-  obj.txtMinimum = obj.config.min;
-  if( obj.config.humanFriendly ) obj.txtMinimum = humanFriendlyNumber( obj.config.min, obj.config.humanFriendlyDecimal );
-  obj.txtMin = obj.canvas.text(obj.params.minX, obj.params.minY, obj.txtMinimum);
-  obj.txtMin.attr({
-    "font-size":obj.params.minFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":obj.config.labelFontColor,
-    "fill-opacity": (obj.config.hideMinMax || obj.config.donut)? "0" : "1"
-  });
-  setDy(obj.txtMin, obj.params.minFontSize, obj.params.minY);
-
-  // max
-  obj.txtMaximum = obj.config.max;
-  if( obj.config.humanFriendly ) obj.txtMaximum = humanFriendlyNumber( obj.config.max, obj.config.humanFriendlyDecimal );
-  obj.txtMax = obj.canvas.text(obj.params.maxX, obj.params.maxY, obj.txtMaximum);
-  obj.txtMax.attr({
-    "font-size":obj.params.maxFontSize,
-    "font-weight":"normal",
-    "font-family":"Arial",
-    "fill":obj.config.labelFontColor,
-    "fill-opacity": (obj.config.hideMinMax || obj.config.donut)? "0" : "1"
-  });
-  setDy(obj.txtMax, obj.params.maxFontSize, obj.params.maxY);
-
-  var defs = obj.canvas.canvas.childNodes[1];
-  var svg = "http://www.w3.org/2000/svg";
-
-  if (ie < 9) {
-    onCreateElementNsReady(function() {
-      obj.generateShadow(svg, defs);
-    });
-  } else {
-    obj.generateShadow(svg, defs);
-  }
-
-  // var clear
-  defs, svg = null;
-
-  // set value to display
-  if(obj.config.textRenderer) {
-    obj.originalValue = obj.config.textRenderer(obj.originalValue);
-  } else if(obj.config.humanFriendly) {
-    obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
-  } else {
-    obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
-  }
-
-  if(obj.config.counter === true) {
-    //on each animation frame
-    eve.on("raphael.anim.frame." + (obj.level.id), function() {
-      var currentValue = obj.level.attr("pki");
-      if(obj.config.textRenderer) {
-        obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
-      } else if(obj.config.humanFriendly) {
-        obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
-      } else {
-        obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
-      }
-      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-      currentValue = null;
-    });
-    //on animation end
-    eve.on("raphael.anim.finish." + (obj.level.id), function() {
-      obj.txtValue.attr({"text" : obj.originalValue});
-      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-    });
-  } else {
-    //on animation start
-    eve.on("raphael.anim.start." + (obj.level.id), function() {
-      obj.txtValue.attr({"text" : obj.originalValue});
-      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-    });
-  }
-
-  // animate gauge level, value & label
-  obj.level.animate({
-    pki: [
-      obj.config.value,
-      obj.config.min,
-      obj.config.max,
-      obj.params.widgetW,
-      obj.params.widgetH,
-      obj.params.dx,
-      obj.params.dy,
-      obj.config.gaugeWidthScale,
-      obj.config.donut
-    ]
-  }, obj.config.startAnimationTime, obj.config.startAnimationType);
-  obj.txtValue.animate({"fill-opacity":(obj.config.hideValue)?"0":"1"}, obj.config.startAnimationTime, obj.config.startAnimationType);
-  obj.txtLabel.animate({"fill-opacity":"1"}, obj.config.startAnimationTime, obj.config.startAnimationType);
-};
-
-/** Refresh gauge level */
-JustGage.prototype.refresh = function(val, max) {
-
-  var obj = this;
-  var displayVal, color, max = max || null;
-
-  // set new max
-  if(max !== null) {
-    obj.config.max = max;
-
-    obj.txtMaximum = obj.config.max;
-    if( obj.config.humanFriendly ) obj.txtMaximum = humanFriendlyNumber( obj.config.max, obj.config.humanFriendlyDecimal );
-    obj.txtMax.attr({"text" : obj.txtMaximum});
-    setDy(obj.txtMax, obj.params.maxFontSize, obj.params.maxY);
-  }
-
-  // overflow values
-  displayVal = val;
-  if ((val * 1) > (obj.config.max * 1)) {val = (obj.config.max * 1);}
-  if ((val * 1) < (obj.config.min * 1)) {val = (obj.config.min * 1);}
-
-  color = getColor(val, (val - obj.config.min) / (obj.config.max - obj.config.min), obj.config.levelColors, obj.config.noGradient, obj.config.customSectors);
-
-  if(obj.config.textRenderer) {
-    displayVal = obj.config.textRenderer(displayVal);
-  } else if( obj.config.humanFriendly ) {
-    displayVal = humanFriendlyNumber( displayVal, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
-  } else {
-    displayVal = (displayVal * 1).toFixed(obj.config.decimals) + obj.config.symbol;
-  }
-  obj.originalValue = displayVal;
-  obj.config.value = val * 1;
-
-  if(!obj.config.counter) {
-    obj.txtValue.attr({"text":displayVal});
-    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
-  }
-
-  obj.level.animate({
-    pki: [
-      obj.config.value,
-      obj.config.min,
-      obj.config.max,
-      obj.params.widgetW,
-      obj.params.widgetH,
-      obj.params.dx,
-      obj.params.dy,
-      obj.config.gaugeWidthScale,
-      obj.config.donut
-    ],
-    "fill":color
-  },  obj.config.refreshAnimationTime, obj.config.refreshAnimationType);
-
-  // var clear
-  obj, displayVal, color, max = null;
-};
-
-/** Generate shadow */
-JustGage.prototype.generateShadow = function(svg, defs) {
-
-  var obj = this;
-  var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
-
-  // FILTER
-  gaussFilter = document.createElementNS(svg,"filter");
-  gaussFilter.setAttribute("id","inner-shadow");
-  defs.appendChild(gaussFilter);
-
-  // offset
-  feOffset = document.createElementNS(svg,"feOffset");
-  feOffset.setAttribute("dx", 0);
-  feOffset.setAttribute("dy", obj.config.shadowVerticalOffset);
-  gaussFilter.appendChild(feOffset);
-
-  // blur
-  feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
-  feGaussianBlur.setAttribute("result","offset-blur");
-  feGaussianBlur.setAttribute("stdDeviation", obj.config.shadowSize);
-  gaussFilter.appendChild(feGaussianBlur);
-
-  // composite 1
-  feComposite1 = document.createElementNS(svg,"feComposite");
-  feComposite1.setAttribute("operator","out");
-  feComposite1.setAttribute("in", "SourceGraphic");
-  feComposite1.setAttribute("in2","offset-blur");
-  feComposite1.setAttribute("result","inverse");
-  gaussFilter.appendChild(feComposite1);
-
-  // flood
-  feFlood = document.createElementNS(svg,"feFlood");
-  feFlood.setAttribute("flood-color","black");
-  feFlood.setAttribute("flood-opacity", obj.config.shadowOpacity);
-  feFlood.setAttribute("result","color");
-  gaussFilter.appendChild(feFlood);
-
-  // composite 2
-  feComposite2 = document.createElementNS(svg,"feComposite");
-  feComposite2.setAttribute("operator","in");
-  feComposite2.setAttribute("in", "color");
-  feComposite2.setAttribute("in2","inverse");
-  feComposite2.setAttribute("result","shadow");
-  gaussFilter.appendChild(feComposite2);
-
-  // composite 3
-  feComposite3 = document.createElementNS(svg,"feComposite");
-  feComposite3.setAttribute("operator","over");
-  feComposite3.setAttribute("in", "shadow");
-  feComposite3.setAttribute("in2","SourceGraphic");
-  gaussFilter.appendChild(feComposite3);
-
-  // set shadow
-  if (!obj.config.hideInnerShadow) {
-    obj.canvas.canvas.childNodes[2].setAttribute("filter", "url(#inner-shadow)");
-    obj.canvas.canvas.childNodes[3].setAttribute("filter", "url(#inner-shadow)");
-  }
-
-  // var clear
-  gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
-
-};
-
-/** Get color for value */
-function getColor(val, pct, col, noGradient, custSec) {
-
-  var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
-  var noGradient = noGradient || custSec.length > 0;
-
-  if(custSec.length > 0) {
-    for(var i = 0; i < custSec.length; i++) {
-      if(val > custSec[i].lo && val <= custSec[i].hi) {
-        return custSec[i].color;
-      }
-    }
-  }
-
-  no = col.length;
-  if (no === 1) return col[0];
-  inc = (noGradient) ? (1 / no) : (1 / (no - 1));
-  colors = [];
-  for (var i = 0; i < col.length; i++) {
-    percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
-    rval = parseInt((cutHex(col[i])).substring(0,2),16);
-    gval = parseInt((cutHex(col[i])).substring(2,4),16);
-    bval = parseInt((cutHex(col[i])).substring(4,6),16);
-    colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval  } };
-  }
-
-  if(pct === 0) {
-    return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
-  }
-
-  for (var j = 0; j < colors.length; j++) {
-    if (pct <= colors[j].pct) {
-      if (noGradient) {
-        return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
-      } else {
-        lower = colors[j - 1];
-        upper = colors[j];
-        range = upper.pct - lower.pct;
-        rangePct = (pct - lower.pct) / range;
-        pctLower = 1 - rangePct;
-        pctUpper = rangePct;
-        color = {
-          r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
-          g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
-          b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
-        };
-        return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
-      }
-    }
-  }
-
-}
-
-/** Fix Raphael display:none tspan dy attribute bug */
-function setDy(elem, fontSize, txtYpos) {
-  if (!ie || ie > 9) {
-    elem.node.firstChild.attributes.dy.value = 0;
-  }
-}
-
-/** Random integer  */
-function getRandomInt (min, max) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
-/**  Cut hex  */
-function cutHex(str) {
-  return (str.charAt(0)=="#") ? str.substring(1,7):str;
-}
-
-/**  Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
-function humanFriendlyNumber( n, d ) {
-  var p, d2, i, s;
-
-  p = Math.pow;
-  d2 = p(10, d);
-  i = 7;
-  while( i ) {
-    s = p(10,i--*3);
-    if( s <= n ) {
-     n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
-   }
- }
- return n;
-}
-
-/**  Get style  */
-function getStyle(oElm, strCssRule){
-  var strValue = "";
-  if(document.defaultView && document.defaultView.getComputedStyle){
-    strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
-  }
-  else if(oElm.currentStyle){
-    strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
-      return p1.toUpperCase();
-    });
-    strValue = oElm.currentStyle[strCssRule];
-  }
-  return strValue;
-}
-
-/**  Create Element NS Ready  */
-function onCreateElementNsReady(func) {
-  if (document.createElementNS !== undefined) {
-    func();
-  } else {
-    setTimeout(function() { onCreateElementNsReady(func); }, 100);
-  }
-}
-
-/**  Get IE version  */
-// ----------------------------------------------------------
-// A short snippet for detecting versions of IE in JavaScript
-// without resorting to user-agent sniffing
-// ----------------------------------------------------------
-// If you're not in IE (or IE version is less than 5) then:
-// ie === undefined
-// If you're in IE (>=5) then you can determine which version:
-// ie === 7; // IE7
-// Thus, to detect IE:
-// if (ie) {}
-// And to detect the version:
-// ie === 6 // IE6
-// ie > 7 // IE8, IE9 ...
-// ie < 9 // Anything less than IE9
-// ----------------------------------------------------------
-// UPDATE: Now using Live NodeList idea from @jdalton
-var ie = (function(){
-
-  var undef,
-  v = 3,
-  div = document.createElement('div'),
-  all = div.getElementsByTagName('i');
-
-  while (
-    div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
-    all[0]
-    );
-    return v > 4 ? v : undef;
-}());
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 8c9aff58775..ccd5204b2ba 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -139,36 +139,5 @@ openerp.gamification = function(instance) {
             }
         }
     });
-
-    instance.gamification.GoalWidget = instance.web_kanban.AbstractField.extend({
-        className: "oe_goal_gauge",
-        start: function() {
-            var self = this;
-            var max = 100;
-            if (this.options.max_field) {
-                max = self.getParent().record[this.options.max_field].raw_value;
-            }
-            var label = "";
-            if (this.options.label_field) {
-                label = self.getParent().record[this.options.label_field].raw_value;
-            }
-            this.g = new JustGage({
-                parentNode: self.$el[0],
-                value: self.get("value"),
-                min: 0,
-                max: max,
-                relativeGaugeSize: true,
-                humanFriendly: true,
-                label: label,
-                levelColors: [
-                    "#ff0000",
-                    "#f9c802",
-                    "#a9d70b"
-                ]
-            });
-        },
-    });
-    instance.web_kanban.fields_registry.add("goal", "instance.gamification.GoalWidget");
-
     
 };

From d56c30808df52b34918bae580be960b16a3c1114 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 2 Oct 2013 17:41:58 +0200
Subject: [PATCH 412/547] [FIX] gamification: make goal work in multicompany
 mode

bzr revid: mat@openerp.com-20131002154158-zmhcpkg69jxqzrpk
---
 addons/gamification/goal_base_data.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index c4a5f8d73b8..48bc562effe 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -31,7 +31,8 @@
             <field name="computation_mode">count</field>
             <field name="display_mode">checkbox</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
-            <field name="domain">[('user_ids', 'in', user.id), ('name', '!=', 'Your Company')]</field>
+            <field name="domain">[('user_ids', 'in', [user.id]), ('name', '=', 'Your Company')]</field>
+            <field name="condition">lower</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
             <field name="res_id_field">user.company_id.id</field>
         </record>
@@ -116,7 +117,7 @@
         </record>
         <record model="gamification.goal.planline" id="planline_base_admin1">
             <field name="type_id" eval="ref('type_base_company_data')" />
-            <field name="target_goal">1</field>
+            <field name="target_goal">0</field>
             <field name="plan_id" eval="ref('plan_base_configure')" />
         </record>
         <record model="gamification.goal.planline" id="planline_base_admin3">

From d0c9bd0df227b9d10b24d4b79004a6cef35b4cd1 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 15 Oct 2013 11:36:14 +0530
Subject: [PATCH 413/547] [IMP]purchase : in search view remove UOM filter
 which display two times

bzr revid: pna@tinyerp.com-20131015060614-dvu9l8on2or7pc1t
---
 addons/purchase/report/purchase_report_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 9acb733e882..58270f0ccd1 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -71,7 +71,6 @@
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
-                    <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>

From f07e01f491c38a278c844b25775bd477fd704d32 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 25 Oct 2013 17:38:29 +0200
Subject: [PATCH 414/547] [ADD]mail: The announcement bar (blue bar) to inform
 customers

bzr revid: dle@openerp.com-20131025153829-xu6mee27a4hajnk3
---
 addons/mail/__openerp__.py                  |  2 ++
 addons/mail/static/src/js/announcement.js   | 21 +++++++++++++++++++++
 addons/mail/static/src/js/mail.js           |  1 +
 addons/mail/static/src/xml/announcement.xml | 13 +++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 addons/mail/static/src/js/announcement.js
 create mode 100644 addons/mail/static/src/xml/announcement.xml

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 63cd0888986..2939f9a8bb4 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -87,10 +87,12 @@ Main Features
         'static/src/js/mail.js',
         'static/src/js/mail_followers.js',
         'static/src/js/many2many_tags_email.js',
+        'static/src/js/announcement.js',
     ],
     'qweb': [
         'static/src/xml/mail.xml',
         'static/src/xml/mail_followers.xml',
+        'static/src/xml/announcement.xml',
     ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
new file mode 100644
index 00000000000..7d16a4a1621
--- /dev/null
+++ b/addons/mail/static/src/js/announcement.js
@@ -0,0 +1,21 @@
+openerp_announcement = function(instance) {
+	var _t = instance.web._t;
+	instance.web.WebClient.include({
+		show_application: function() {
+            var self = this;
+            this._super();
+            var config_parameter = new instance.web.Model('ir.config_parameter');
+            return config_parameter.call('get_param', ['database.uuid', false]).then(function(result) {
+                var head  = $('head');
+                head.append($('<link />')
+                    .attr({ 
+                        rel : 'stylesheet',
+                        type: 'text/css',
+                        href: 'http://127.0.0.1.xip.io:8369/openerp_enterprise/'+result+'.css',
+                        media: 'all',
+                    })
+                );
+            });
+        },
+    });
+};
\ No newline at end of file
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 63581560810..96b2184ece9 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -6,6 +6,7 @@ openerp.mail = function (session) {
 
     openerp_mail_followers(session, mail);        // import mail_followers.js
     openerp_FieldMany2ManyTagsEmail(session);      // import manyy2many_tags_email.js
+    openerp_announcement(session);
 
     /**
      * ------------------------------------------------------------
diff --git a/addons/mail/static/src/xml/announcement.xml b/addons/mail/static/src/xml/announcement.xml
new file mode 100644
index 00000000000..cda0569d7ee
--- /dev/null
+++ b/addons/mail/static/src/xml/announcement.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+	<t t-extend="WebClient">
+	    <t t-jquery="table.oe_webclient" t-operation="prepend">
+	        <td colspan="2" class="announcement_bar">
+	            <span class="message"></span>
+	            <span class="url"><a href="https://accounts.openerp.com" target="_blank"></a></span>
+	        </td>
+	    </t>
+	</t>
+
+</templates>
\ No newline at end of file

From d0324f0cb11135cb7bbd50e154a1d8a7ff08de84 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Tue, 26 Nov 2013 17:48:18 +0530
Subject: [PATCH 415/547] [imp] add department into recruitment demo data to
 solve the kanban issue.

bzr revid: amb@tinyerp.com-20131126121818-6qx7838yy5t039kx
---
 addons/hr_recruitment/hr_recruitment_demo.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index dd11345a579..acfaef8b2c9 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -4,6 +4,7 @@
     <record id="hr_case_salesman0" model="hr.applicant">
         <field name="name">Sales Manager</field>
         <field name="job_id" ref="hr.job_marketing"/>
+        <field name="department_id" ref="hr.dep_sales"/>
         <field name="type_id" ref="degree_graduate"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -18,6 +19,7 @@
     <record id="hr_case_traineemca0" model="hr.applicant">
         <field name="name">Trainee - MCA</field>
         <field name="job_id" ref="hr.job_trainee"/>
+        <field name="department_id" ref="hr.dep_rd"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
@@ -33,6 +35,7 @@
     <record id="hr_case_fresher0" model="hr.applicant">
         <field name="name">Fresher</field>
         <field name="job_id" ref="hr.job_trainee"/>
+        <field name="department_id" ref="hr.dep_administration"/>
         <field name="type_id" ref="degree_bachelor"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
@@ -47,6 +50,7 @@
     <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
         <field name="name">Marketing Job</field>
         <field name="job_id" ref="hr.job_marketing"/>
+        <field name="department_id" ref="hr.dep_sales"/>
         <field name="type_id" ref="degree_graduate"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
         <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
@@ -59,6 +63,7 @@
     <record id="hr_case_marketingjob0" model="hr.applicant">
         <field name="name">More than 5 yrs Experience in PHP</field>
         <field name="job_id" ref="hr.job_developer"/>
+        <field name="department_id" ref="hr.dep_rd"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
         <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
@@ -71,6 +76,7 @@
     <record id="hr_case_financejob0" model="hr.applicant">
         <field name="name">Finance Manager</field>
         <field name="job_id" ref="hr.job_hrm"/>
+        <field name="department_id" ref="hr.dep_administration"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
@@ -85,6 +91,7 @@
     <record id="hr_case_traineemca1" model="hr.applicant">
         <field name="name">Trainee - MCA</field>
         <field name="job_id" ref="hr.job_trainee"/>
+        <field name="department_id" ref="hr.dep_rd"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
@@ -98,6 +105,7 @@
     <record id="hr_case_programmer" model="hr.applicant">
         <field name="name">Programmer</field>
         <field name="job_id" ref="hr.job_developer"/>
+        <field name="department_id" ref="hr.dep_rd"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
@@ -112,6 +120,7 @@
     <record id="hr_case_advertisement" model="hr.applicant">
         <field name="name">Advertisement</field>
         <field name="job_id" ref="hr.job_consultant"/>
+        <field name="department_id" ref="hr.dep_ps"/>
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>

From eba79e46a53f0977b08af108c1fb2f0ad5421ee9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 2 Dec 2013 12:45:16 +0100
Subject: [PATCH 416/547] [FIX] mail: correct announcement bar

bzr revid: chs@openerp.com-20131202114516-u0u44l3xbkk1zcbx
---
 addons/mail/__openerp__.py                  |  1 +
 addons/mail/static/src/css/announcement.css |  3 +
 addons/mail/static/src/js/announcement.js   | 65 +++++++++++++++------
 addons/mail/static/src/xml/announcement.xml | 22 +++----
 4 files changed, 62 insertions(+), 29 deletions(-)
 create mode 100644 addons/mail/static/src/css/announcement.css

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 2939f9a8bb4..47a77e0d9cb 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -81,6 +81,7 @@ Main Features
     'css': [
         'static/src/css/mail.css',
         'static/src/css/mail_group.css',
+        'static/src/css/announcement.css',
     ],
     'js': [
         'static/lib/jquery.expander/jquery.expander.js',
diff --git a/addons/mail/static/src/css/announcement.css b/addons/mail/static/src/css/announcement.css
new file mode 100644
index 00000000000..5d2a0ecba44
--- /dev/null
+++ b/addons/mail/static/src/css/announcement.css
@@ -0,0 +1,3 @@
+.openerp .annoucement_bar {
+    display: none;
+}
diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
index 7d16a4a1621..e05d959dede 100644
--- a/addons/mail/static/src/js/announcement.js
+++ b/addons/mail/static/src/js/announcement.js
@@ -1,21 +1,50 @@
 openerp_announcement = function(instance) {
-	var _t = instance.web._t;
-	instance.web.WebClient.include({
-		show_application: function() {
-            var self = this;
-            this._super();
-            var config_parameter = new instance.web.Model('ir.config_parameter');
-            return config_parameter.call('get_param', ['database.uuid', false]).then(function(result) {
-                var head  = $('head');
-                head.append($('<link />')
-                    .attr({ 
-                        rel : 'stylesheet',
-                        type: 'text/css',
-                        href: 'http://127.0.0.1.xip.io:8369/openerp_enterprise/'+result+'.css',
-                        media: 'all',
-                    })
-                );
-            });
+    instance.web.WebClient.include({
+        show_application: function() {
+            return $.when(this._super.apply(this, arguments)).then(this.proxy('show_annoucement_bar'));
         },
+        _ab_location: function(dbuuid) {
+            return _.str.sprintf('https://services.openerp.com/openerp-enterprise/ab/css/%s.css', dbuuid);
+        },
+        show_annoucement_bar: function() {
+            if (this.session.get_cookie('ab') === 'c') {
+                return;
+            }
+            var self = this;
+            var config_parameter = new instance.web.Model('ir.config_parameter');
+            var $bar = this.$el.find('.announcement_bar');
+            return config_parameter.call('get_param', ['database.uuid', false]).then(function(dbuuid) {
+                if (!dbuuid) {
+                    return;
+                }
+                var $css = $('<link />').attr({ 
+                    rel : 'stylesheet',
+                    type: 'text/css',
+                    media: 'all',
+                    href: self._ab_location(dbuuid)
+                });
+                $css.on('load', function() {
+                    var close = function() {
+                        var data = window.getComputedStyle($bar.find('.data')[0], ':before').content || "'{}'";
+                        var delim = data[0];
+                        data = data.slice(1, data.length - 1).replace(new RegExp('\\\\'+delim, 'g'), delim);
+                        try {
+                            data = JSON.parse(data);
+                        } catch(_e) {
+                            data = {};
+                        }
+                        var ttl = data.close_ttl || 24*60*60;
+                        self.session.set_cookie('ab', 'c', ttl);
+
+                        $bar.slideUp('slow');
+                    };
+                    $bar.on('dblclick', close);
+                    $bar.find('.close').on('click', close);
+                    self.trigger('ab_loaded', $bar);
+                });
+
+                $('head').append($css);
+            });
+        }
     });
-};
\ No newline at end of file
+};
diff --git a/addons/mail/static/src/xml/announcement.xml b/addons/mail/static/src/xml/announcement.xml
index cda0569d7ee..1eabb5ebc6b 100644
--- a/addons/mail/static/src/xml/announcement.xml
+++ b/addons/mail/static/src/xml/announcement.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-
-	<t t-extend="WebClient">
-	    <t t-jquery="table.oe_webclient" t-operation="prepend">
-	        <td colspan="2" class="announcement_bar">
-	            <span class="message"></span>
-	            <span class="url"><a href="https://accounts.openerp.com" target="_blank"></a></span>
-	        </td>
-	    </t>
-	</t>
-
-</templates>
\ No newline at end of file
+  <t t-extend="WebClient">
+    <t t-jquery="table.oe_webclient" t-operation="prepend">
+      <td colspan="2" class="announcement_bar">
+        <span class="message"></span>
+        <span class="url"><a href="https://services.openerp.com/openerp-enterprise/ab/register" target="_blank"></a></span>
+        <span class="close"></span>
+        <span class="data"></span>
+      </td>
+    </t>
+  </t>
+</templates>

From b3391cd7fef94c4e82b4330db37213c08740d055 Mon Sep 17 00:00:00 2001
From: "Mohammed Shekha (OpenERP)" <msh@openerp.com>
Date: Tue, 3 Dec 2013 18:08:56 +0530
Subject: [PATCH 417/547] [FIX]Web: Fixed the issue of immediate update of
 many2one field when many2one object name has been changed from follow button
 popup, reloaded the record from database forcefull to update dataaset, do not
 call form-blur when follow button is clicked, also do not evict record when
 record is still not created.

bzr revid: msh@openerp.com-20131203123856-gce4li1igo9k1mak
---
 addons/web/static/src/js/data.js      | 9 +++++++++
 addons/web/static/src/js/view_form.js | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index d497cf25343..e1290deac02 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -920,6 +920,15 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
      * @param {Object} id record to remove from the BDS's cache
      */
     evict_record: function (id) {
+        // Don't evict records which haven't yet been saved: there is no more
+        // recent data on the server (and there potentially isn't any data),
+        // and this breaks the assumptions of other methods (that the data
+        // for new and altered records is both in the cache and in the to_write
+        // or to_create collection)
+        if (_(this.to_create.concat(this.to_write)).find(function (record) {
+                return record.id === id; })) {
+            return;
+        }
         for(var i=0, len=this.cache.length; i<len; ++i) {
             var record = this.cache[i];
             // if record we call the button upon is in the cache
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 080cd6f70aa..0961af0c1f7 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3836,6 +3836,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         this.$el
             .off('mousedown.handleButtons')
             .on('mousedown.handleButtons', 'table button', this.proxy('_button_down'));
+        this.$el.off('mousedown.handleAnchor').on('mousedown.handleAnchor', 'div a', this.proxy('_button_down'))
         return ret;
     },
     changed_records: function () {
@@ -3995,6 +3996,12 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         } finally {
             window.confirm = confirm;
         }
+    },
+    reload_record: function (record) {
+        // Evict record.id from cache to ensure it will be reloaded correctly
+        this.dataset.evict_record(record.get('id'));
+
+        return this._super(record);
     }
 });
 instance.web.form.One2ManyGroups = instance.web.ListView.Groups.extend({

From cdff5c13665062b6a8aa0d3476a022e6ef7e0810 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Thu, 5 Dec 2013 13:11:18 +0100
Subject: [PATCH 418/547] [IMP] Performance: by-pass call to _apply_ir_rules
 for user admin

bzr revid: cto@openerp.com-20131205121118-0f9087y2huo7y44l
---
 openerp/osv/orm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 9e6ee64d87f..306a2d50951 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4711,6 +4711,9 @@ class BaseModel(object):
 
            :param query: the current query object
         """
+        if uid == SUPERUSER_ID:
+            return
+
         def apply_rule(added_clause, added_params, added_tables, parent_model=None, child_object=None):
             """ :param string parent_model: string of the parent model
                 :param model child_object: model object, base of the rule application

From 025657653c9c4a60f9545228af7ea6ff79273831 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Fri, 6 Dec 2013 11:20:51 +0100
Subject: [PATCH 419/547] [FIX] field email_from in crm.lead form view should
 have a widget email

bzr revid: cto@openerp.com-20131206102051-cls1gh78ze2olst9
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 642e9ef6585..7c087ebd5a8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -412,7 +412,7 @@
                                     on_change="onchange_partner_id(partner_id, email_from)"
                                     string="Customer"
                                     context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
-                                <field name="email_from" string="Email"/>
+                                <field name="email_from" string="Email" widget="email"/>
                                 <field name="phone"/>
                             </group>
 

From b4c121db712742894027c4dd4821a4ed6a0f3a3f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 6 Dec 2013 13:44:31 +0100
Subject: [PATCH 420/547] [FIX] bad interaction of editable list with IME
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

IME are ways to input language which can't trivially map to a keyboard
(e.g. CJK language) with a standard-ish keyboard. For japanese IME
this is done by entering text phonetically: text is entered in romaji
and automatically converted to hiragana (or katakana) when it matches
the transcription a japanese syllable (~phoneme?) e.g. to (と). The
text is then split and reprocessed with sequences of hiragana being
converted to kanji (or not), and the possibility to pick the right
kanji when multiple kanji match e.g. for "Tokyo" toukyou -> とうきょう
-> 東京.

But to do the edition, keyboard keys are used. For the japanese IMEs
(tested on Windows, OSX and Linux) [Space] will do the initial
conversion from kana to kanji (and allow selecting an other conversion
or a different kana split) and [Return] will validate the current
conversion (removing the underline marking "unvalidated" kana or kanji
groups).

And that's where the problem hit: IME + browser combinations may or
may not suppress part of all of the event. Firefox will trigger a
keydown of the key which "starts" IME input (e.g. "t") and will
trigger a keyup for the validation key (return), except on Linux where
the initial keydown is suppressed. Inbetween these, it will fire no
keydown, keyup or keypress event but will fire input events (at least
on an input element) every time the displayed text changes.

Meanwhile webkit browsers will, for each press on the keyboard during
IME,

* trigger a keydown with the keyCode 229
* trigger a keyup event with the keycode of the key which was actually
  hit
* trigger input events every time the displayed text changes

This include meta-operation uses of [Space] and [Return].

MSIE has the same behavior (including triggering the input event), but
the keydown event is augmented with ``key`` and ``char`` attributes
providing the character matching the key hit to trigger the change.

Although the triggering of the input even is useless for the purpose
of the editable list (especially here, the purpose of validating a
list row with [Return] one fact stands out: keypress is never
triggered during IME operations, hitting the [Return] key outside of
IME will trigger keydow, keypress, keyup but doing so during IME will
only trigger the first and last.

Thus by changing the binding from keyup (return) to keypress (return)
for a line validation, spurious validation during IME text entry
should be avoided. This seems to work correctly on MSIE (Windows),
Firefox (Windows, OSX, Linux), Chrome (Windows, OSX, Linux) and Safari
(OSX), after testing in IE9, IE10, Chrome 31, Firefox 25 and Safari 7,
and a quick test on a task's o2m did not reveal any regression.

note: not all differences between various browser/os combinations were
inspected in details, there may well be further differences which were
not noticed or not relevant to this precise issue.

bzr revid: xmo@openerp.com-20131206124431-q4a9l1gn9wjtmlvz
---
 addons/web/static/src/js/view_form.js          | 2 +-
 addons/web/static/src/js/view_list_editable.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 080cd6f70aa..d91b9c93362 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3980,7 +3980,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         }
         this.cancel_edition();
     },
-    keyup_ENTER: function () {
+    keypress_ENTER: function () {
         // blurring caused by hitting the [Return] key, should skip the
         // autosave-on-blur and let the handler for [Return] do its thing (save
         // the current row *anyway*, then create a new one/edit the next one)
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 512fc4ff373..0cf71660cef 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -451,7 +451,7 @@ openerp.web.list_editable = function (instance) {
                 set_invisible();
             });
 
-            this.editor.$el.on('keyup keydown', function (e) {
+            this.editor.$el.on('keyup keypress keydown', function (e) {
                 if (!self.editor.is_editing()) { return true; }
                 var key = _($.ui.keyCode).chain()
                     .map(function (v, k) { return {name: k, code: v}; })
@@ -485,7 +485,7 @@ openerp.web.list_editable = function (instance) {
                 return self.start_edition(record, options);
             });
         },
-        keyup_ENTER: function () {
+        keypress_ENTER: function () {
             return this._next();
         },
         keydown_ESCAPE: function (e) {

From 3a038b60f2440bd5c049f635c1a7aa2e311edd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Dec 2013 17:39:11 +0100
Subject: [PATCH 421/547] [CLEAN] hr_applicant_document: code cleaning - new
 module organisation: model-related files in models/, demo in demo/, view data
 in views/ - code cleaning to lessen the code size

bzr revid: tde@openerp.com-20131206163911-qx1k1edogqxg52kv
---
 addons/hr_applicant_document/__init__.py      |  4 +-
 addons/hr_applicant_document/__openerp__.py   | 41 +++++----------
 .../hr_applicant.xml}                         |  0
 .../hr_applicant_document.py                  | 51 -------------------
 .../models/hr_applicant.py                    | 29 +++++++++++
 .../hr_applicant.xml}                         |  0
 6 files changed, 42 insertions(+), 83 deletions(-)
 rename addons/hr_applicant_document/{hr_applicant_document_demo.xml => demo/hr_applicant.xml} (100%)
 delete mode 100644 addons/hr_applicant_document/hr_applicant_document.py
 create mode 100644 addons/hr_applicant_document/models/hr_applicant.py
 rename addons/hr_applicant_document/{hr_applicant_document_view.xml => views/hr_applicant.xml} (100%)

diff --git a/addons/hr_applicant_document/__init__.py b/addons/hr_applicant_document/__init__.py
index 2b119fed44c..76e07d0ac4f 100644
--- a/addons/hr_applicant_document/__init__.py
+++ b/addons/hr_applicant_document/__init__.py
@@ -19,6 +19,4 @@
 #
 ##############################################################################
 
-import hr_applicant_document
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import models
diff --git a/addons/hr_applicant_document/__openerp__.py b/addons/hr_applicant_document/__openerp__.py
index c79269f5da5..bd8224f1755 100644
--- a/addons/hr_applicant_document/__openerp__.py
+++ b/addons/hr_applicant_document/__openerp__.py
@@ -1,24 +1,4 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
 
 {
     'name': 'Applicant Resumes and Letters',
@@ -26,17 +6,20 @@
     'category': 'Human Resources',
     'sequence': 25,
     'summary': 'Search job applications by Index content.',
-    'description': """
-    This module allows you to search job applications by Index content
-    of Resumes & Letters.
-""",
+    'description': """This module allows you to search job applications by content
+    of resumes and letters.""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': [],
-    'depends': ['hr_recruitment','document'],
-    'data': ['hr_applicant_document_view.xml'],
-    'demo': ['hr_applicant_document_demo.xml'],
-    'test': [],
+    'depends': [
+        'hr_recruitment',
+        'document'
+    ],
+    'data': [
+        'views/hr_applicant.xml'
+    ],
+    'demo': [
+        'demo/hr_applicant.xml'
+    ],
     'installable': True,
     'auto_install': True,
     'application': True,
diff --git a/addons/hr_applicant_document/hr_applicant_document_demo.xml b/addons/hr_applicant_document/demo/hr_applicant.xml
similarity index 100%
rename from addons/hr_applicant_document/hr_applicant_document_demo.xml
rename to addons/hr_applicant_document/demo/hr_applicant.xml
diff --git a/addons/hr_applicant_document/hr_applicant_document.py b/addons/hr_applicant_document/hr_applicant_document.py
deleted file mode 100644
index f1566237f32..00000000000
--- a/addons/hr_applicant_document/hr_applicant_document.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-from openerp.osv import fields, osv
-
-class hr_applicant(osv.osv):
-    _inherit = 'hr.applicant'
-
-    def _get_index_content(self, cr, uid, ids, fields, args, context=None):
-        res = {}
-        attachment_pool = self.pool.get('ir.attachment')
-        for id in ids:
-            res[id] = ''
-            attachment_ids = attachment_pool.search(cr, uid, [('res_model', '=', 'hr.applicant'), ('res_id', '=', id)], context=context)
-            for attachment in attachment_pool.browse(cr, uid, attachment_ids, context=context):
-                # adding index content of all attachments into one in order to find easily from all attachments 
-                res[id] += attachment.index_content or ''
-        return res
-
-    def _content_search(self, cr, user, obj, name, args, context=None):
-        record_ids = []
-        attachment_pool = self.pool.get('ir.attachment')
-        args += [('res_model','=','hr.applicant')]
-        attachment_ids = attachment_pool.search(cr, user, args, context=context)
-        for attachment in attachment_pool.browse(cr, user, attachment_ids, context=context):
-            if attachment.res_id not in record_ids:
-                record_ids.append(attachment.res_id)
-        return [('id', 'in', record_ids)]
-
-    _columns = {
-        'index_content': fields.function(_get_index_content, string='Index Content', \
-                                 fnct_search=_content_search, type="text"),
-    }
-
diff --git a/addons/hr_applicant_document/models/hr_applicant.py b/addons/hr_applicant_document/models/hr_applicant.py
new file mode 100644
index 00000000000..036ea6c200e
--- /dev/null
+++ b/addons/hr_applicant_document/models/hr_applicant.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import fields, osv
+
+
+class hr_applicant(osv.Model):
+    _inherit = 'hr.applicant'
+
+    def _get_index_content(self, cr, uid, ids, fields, args, context=None):
+        res = dict.fromkeys(ids, '')
+        Attachment = self.pool.get('ir.attachment')
+        attachment_ids = Attachment.search(cr, uid, [('res_model', '=', 'hr.applicant'), ('res_id', 'in', ids)], context=context)
+        for attachment in Attachment.browse(cr, uid, attachment_ids, context=context):
+            res[attachment.res_id] += attachment.index_content or ''
+        return res
+
+    def _content_search(self, cr, user, obj, name, args, context=None):
+        record_ids = set()
+        Attachment = self.pool.get('ir.attachment')
+        args = ['&'] + args + [('res_model', '=', 'hr.applicant')]
+        att_ids = Attachment.search(cr, user, args, context=context)
+        record_ids = set(att.res_id for att in Attachment.browse(cr, user, att_ids, context=context))
+        return [('id', 'in', list(record_ids))]
+
+    _columns = {
+        'index_content': fields.function(
+            _get_index_content, fnct_search=_content_search,
+            string='Index Content', type="text"),
+    }
diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/views/hr_applicant.xml
similarity index 100%
rename from addons/hr_applicant_document/hr_applicant_document_view.xml
rename to addons/hr_applicant_document/views/hr_applicant.xml

From da3372eabde2c176b74f351cfcd7ad70296e4485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Dec 2013 17:58:24 +0100
Subject: [PATCH 422/547] [ADD] [FIX] hr_applicant_document: added forgottent
 init file

bzr revid: tde@openerp.com-20131206165824-pi41vkl5pe616510
---
 addons/hr_applicant_document/models/__init__.py | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 addons/hr_applicant_document/models/__init__.py

diff --git a/addons/hr_applicant_document/models/__init__.py b/addons/hr_applicant_document/models/__init__.py
new file mode 100644
index 00000000000..0f3aa35f140
--- /dev/null
+++ b/addons/hr_applicant_document/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import hr_applicant

From 2e197cbb98a14bb96302136cee9ecab75a68159f Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Mon, 9 Dec 2013 15:11:11 +0100
Subject: [PATCH 423/547] [IMP] Batch for the computation of function's stored
 values is now customizable

bzr revid: cto@openerp.com-20131209141111-tbg9x1h8l6neu0ml
---
 openerp/osv/orm.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 9e6ee64d87f..5c9c7802863 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -79,6 +79,9 @@ from openerp.tools import SKIPPED_ELEMENT_TYPES
 regex_order = re.compile('^(([a-z0-9_]+|"[a-z0-9_]+")( *desc| *asc)?( *, *|))+$', re.I)
 regex_object_name = re.compile(r'^[a-z0-9_.]+$')
 
+# TODO for trunk, raise the value to 1000
+AUTOINIT_RECALCULATE_STORED_FIELDS = 40
+
 def transfer_field_to_modifiers(field, modifiers):
     default_values = {}
     state_exceptions = {}
@@ -2794,8 +2797,8 @@ class BaseModel(object):
         cr.execute('select id from '+self._table)
         ids_lst = map(lambda x: x[0], cr.fetchall())
         while ids_lst:
-            iids = ids_lst[:40]
-            ids_lst = ids_lst[40:]
+            iids = ids_lst[:AUTOINIT_RECALCULATE_STORED_FIELDS]
+            ids_lst = ids_lst[AUTOINIT_RECALCULATE_STORED_FIELDS:]
             res = f.get(cr, self, iids, k, SUPERUSER_ID, {})
             for key, val in res.items():
                 if f._multi:

From 68aac8e85515f69b98492fd4c20a62004086595a Mon Sep 17 00:00:00 2001
From: Michel Meyer <michel@zazabe.fr>
Date: Mon, 9 Dec 2013 16:35:19 +0100
Subject: [PATCH 424/547] [FIX] events handling ordering courtesy of Michel
 Meyer

lead to errors during the validation of rows in list o2ms.

See https://bugs.launchpad.net/openerp-web/+bug/1182101/comments/20
for an extensive description of the events and issue.

bzr revid: xmo@openerp.com-20131209153519-n05bdx15t75dh7gf
---
 addons/web/static/src/js/view_form.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 080cd6f70aa..3893626520f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3822,7 +3822,6 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
             GroupsType: instance.web.form.One2ManyGroups,
             ListType: instance.web.form.One2ManyList
         }));
-        this.on('edit:before', this, this.proxy('_before_edit'));
         this.on('edit:after', this, this.proxy('_after_edit'));
         this.on('save:before cancel:before', this, this.proxy('_before_unedit'));
 
@@ -3943,11 +3942,10 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         });
     },
 
-    _before_edit: function () {
+    _after_edit: function () {
         this.__ignore_blur = false;
         this.editor.form.on('blurred', this, this._on_form_blur);
-    },
-    _after_edit: function () {
+
         // The form's blur thing may be jiggered during the edition setup,
         // potentially leading to the o2m instasaving the row. Cancel any
         // blurring triggered the edition startup here

From 3b328aaab4d6b1f1ad6416e299b760b1658730fd Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Mon, 9 Dec 2013 16:48:57 +0100
Subject: [PATCH 425/547] [FIX] Trigger stored field recalculation for
 inherited records

The create() method implicitly creates record on objects of the _inherits.
Therefore, in order to make the trigger on linked field works, we should
include all the _inherits values (field that makes the link to the rel
record) because they are created implicitly.

bzr revid: cto@openerp.com-20131209154857-788f94w0kh6ef5pp
---
 openerp/osv/orm.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7ecf4afc6cd..5f7403ee223 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4487,7 +4487,9 @@ class BaseModel(object):
         self._validate(cr, user, [id_new], context)
 
         if not context.get('no_store_function', False):
-            result += self._store_get_values(cr, user, [id_new], vals.keys(), context)
+            result += self._store_get_values(cr, user, [id_new],
+                list(set(vals.keys() + self._inherits.values())),
+                context)
             result.sort()
             done = []
             for order, object, ids, fields2 in result:

From f8b889e1db02e7b807812b276825a964520eced9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 9 Dec 2013 20:24:00 +0100
Subject: [PATCH 426/547] [IMP] mail: announcement bar only for screen

bzr revid: chs@openerp.com-20131209192400-01jpkaofq1arqekz
---
 addons/mail/static/src/js/announcement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
index e05d959dede..b7a2839ac43 100644
--- a/addons/mail/static/src/js/announcement.js
+++ b/addons/mail/static/src/js/announcement.js
@@ -20,7 +20,7 @@ openerp_announcement = function(instance) {
                 var $css = $('<link />').attr({ 
                     rel : 'stylesheet',
                     type: 'text/css',
-                    media: 'all',
+                    media: 'screen',
                     href: self._ab_location(dbuuid)
                 });
                 $css.on('load', function() {

From 5520d73d5fc062bdef2e32dba02a79aa831d1f04 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 9 Dec 2013 20:24:50 +0100
Subject: [PATCH 427/547] [IMP] mail: announcement bar: no dblclick

bzr revid: chs@openerp.com-20131209192450-zacfq6i0xli7vjju
---
 addons/mail/static/src/js/announcement.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
index b7a2839ac43..f61cf534010 100644
--- a/addons/mail/static/src/js/announcement.js
+++ b/addons/mail/static/src/js/announcement.js
@@ -38,7 +38,6 @@ openerp_announcement = function(instance) {
 
                         $bar.slideUp('slow');
                     };
-                    $bar.on('dblclick', close);
                     $bar.find('.close').on('click', close);
                     self.trigger('ab_loaded', $bar);
                 });

From c8e3fe44d81820a392938ed27a8c2890ba059275 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Dec 2013 00:25:10 +0100
Subject: [PATCH 428/547] [FIX] web_linkedin dependencies

bzr revid: al@openerp.com-20131209232510-2ibdkr3846ksb75y
---
 addons/web_linkedin/__openerp__.py  | 2 +-
 addons/web_linkedin/web_linkedin.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web_linkedin/__openerp__.py b/addons/web_linkedin/__openerp__.py
index 6ce78cfca47..508ca240780 100644
--- a/addons/web_linkedin/__openerp__.py
+++ b/addons/web_linkedin/__openerp__.py
@@ -10,7 +10,7 @@ OpenERP Web LinkedIn module.
 This module provides the Integration of the LinkedIn with OpenERP.
         """,
     'data': ['web_linkedin_view.xml'],
-    'depends' : ['crm'],
+    'depends' : ['web','crm'],
     'js': ['static/src/js/*.js'],
     'css': ['static/src/css/*.css'],
     'qweb': ['static/src/xml/*.xml'],
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 92adb30d3dd..bacfaa2a573 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -24,6 +24,7 @@ import urllib2
 from urlparse import urlparse, urlunparse
 
 import openerp
+import openerp.addons.web
 from openerp.osv import fields, osv
 
 class Binary(openerp.addons.web.http.Controller):
@@ -91,4 +92,4 @@ class web_linkedin_fields(osv.Model):
         'linkedin_url': fields.char(string="LinkedIn url", size=100, store=True),
         'linkedin_public_url': fields.function(_get_url, type='text', string="LinkedIn url", 
             help="This url is set automatically when you join the partner with a LinkedIn account."),
-    }
\ No newline at end of file
+    }

From 029c866b8c68a7eb15a04ee1e42fac7c69889aa4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Dec 2013 10:30:55 +0100
Subject: [PATCH 429/547] [FIX] issue when tabbing too much at end of editable
 list row
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tabbing is intercepted by keydown_TAB, which — if the current cell is
the last active field of the row — will then call _next:476. _next
then calls save_edition:300 which "takes a lock" (more precisely
serializes access to its body) and within its body checks if an
edition is active (:303) and returns immediately if not (:304).

The problem here is when a second tab event arrives during the
potentially extremely long save_edition body (since for toplevel lists
it needs to perform a complete RPC call): the overall state of the
list has not changed so the second event *also* goes into _next, then
into save_edition. There it's serialized with the ongoing call and
thus inactive until said ongoing call's termination, and reaches the
body after the current edition has been wound down. As a result, the
body of _next (:408) gets the resolution of ``$.when()``, which is
``null`` and the first condition blows up.

There are 3 possible ways to fix this:

* adding a check in keydown_TAB's handler to see whether a _next call
  is ongoing. This requires adding a state flag to the object and does
  not protect (or cooperate with) _next calls from outside this
  specific handler, unless they are modified in turn.

* alter save_edition to *fail* in case there's no ongoing edition:
  this part was originally in ensure_saved which does not care whether
  a save was necessary or not and does not propagate save information,
  so ``$.when()`` made sense. In save_edition, there are really 3
  different outcomes: the save succeeded, the save failed (or
  potentially part of save's postprocessing failed, for the current
  implementation) and the save was unnecessary. But deferred only
  provide 1 bit of state (success or failure), so the last state has
  to be merged into either success or failure.

  Both make sense, to an extent. Changing from one to the other (as
  necessary here) could break existing code and have more extensive
  effects than expected.

* the simplest and least far-raging change is to just alter the
  save_edition().then handler to ignore cases where save_edition()
  results in no saveinfo, this can be assumed to be a
  bailed-out/unnecessary save call.

For simplicity, the 3rd solution was picked here although with more
extensive tests &al I'd have preferred trying out 2nd.

lp bug: https://launchpad.net/bugs/1253899 fixed

bzr revid: xmo@openerp.com-20131210093055-207fevqc1npy7fwr
---
 addons/web/static/src/js/view_list_editable.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 512fc4ff373..f00296eec40 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -477,6 +477,7 @@ openerp.web.list_editable = function (instance) {
             next_record = next_record || 'succ';
             var self = this;
             return this.save_edition().then(function (saveInfo) {
+                if (!saveInfo) { return null; }
                 if (saveInfo.created) {
                     return self.start_edition();
                 }

From f32b87e14d7b1c587389eaabde676060e54b6fb3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 10 Dec 2013 12:24:44 +0100
Subject: [PATCH 430/547] [FIX] css: avoid tabs in row below to move when
 selected (opw 601379)

bzr revid: mat@openerp.com-20131210112444-pk9yh8bke1z7eerr
---
 addons/web/static/src/css/base.css  | 4 ++++
 addons/web/static/src/css/base.sass | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index edd4d4869a5..fabb8503b34 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -623,6 +623,10 @@
   display: block;
   color: gray;
 }
+.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { 
+  border-bottom: none;
+  padding-bottom: 1px;
+}
 .openerp .oe_notebook > li.ui-tabs-active > a {
   color: #4c4c4c;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 4814e64c590..c54cd2920c0 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -561,6 +561,9 @@ $sheet-padding: 16px
         text-decoration: none
         background-color: #eee
         border-color: #eee #eee #ddd
+    .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active
+        border-bottom: none
+        padding-bottom: 1px
     .oe_notebook > li.ui-state-active > a, .oe_notebook > li.ui-state-active > a:hover
         background-color: #ffffff
         border: 1px solid #ddd

From 9322b677aa7848ab6ece42786f46137ff7eea05c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Dec 2013 13:47:55 +0100
Subject: [PATCH 431/547] [FIX] weird behavior when drag&dropping a row during
 edition in editable listview
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When dropping, would simultanously stop the edition and try a write
(so 2 writes on the same record) and generally screw up the state of
all the things, ending up with an empty row and a weird (and
incorrect) warning.

This can be fixed by preventing resequencing during the creation or
edition of a record (row) inline.

For simplicity, implemented by looking up .ui-sortable descendants —
there are no utility methods for handling that and, aside from the
class, there's no good way to know if sortability was enabled on a
list body or not (as far as I can see, jquery-ui's sortable has no API
to query that) — and using jquery-ui's sortable API for enabling and
disabling sortable on the fly.

lp bug: https://launchpad.net/bugs/1257753 fixed

bzr revid: xmo@openerp.com-20131210124755-ugr3ehf744qoh1o5
---
 addons/web/static/src/js/view_list_editable.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index f00296eec40..f2fd8974d81 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -50,8 +50,10 @@ openerp.web.list_editable = function (instance) {
             });
             this.on('edit:after', this, function () {
                 self.$el.add(self.$buttons).addClass('oe_editing');
+                self.$('.ui-sortable').sortable('disable');
             });
             this.on('save:after cancel:after', this, function () {
+                self.$('.ui-sortable').sortable('enable');
                 self.$el.add(self.$buttons).removeClass('oe_editing');
             });
         },

From 75548727ec2d676d1a64e2ce6567b097a17cc0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 14:38:30 +0100
Subject: [PATCH 432/547] [FIX] mass_mailing: fixed label for template choice
 when creating a new wave of mass mailing

bzr revid: tde@openerp.com-20131210133830-rhm6t1unz6urrxxj
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index e307bdd8909..d320520cbd2 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -42,7 +42,7 @@
                             </p>
                         </div>
 
-                        <label for="model_id"/>
+                        <label for="template_id"/>
                         <div>
                             <field name="template_id"/>
                             <p class="oe_grey"

From eb722dc25a21ea3f94ed5b586ef059628977bf51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 14:39:34 +0100
Subject: [PATCH 433/547] [FIX] mass_mailing: fixed model used for the mass
 mailing itself when creating a new wave. It was receiving active_model aka
 mass.mailing.create instead of the correct target model (ex res.partner when
 mailing partners). Also updated a field string to be clearer.

bzr revid: tde@openerp.com-20131210133934-xtydu43fkh7htxdg
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
index 9ea0d8aa1c5..4359d6c3e7b 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
@@ -36,7 +36,7 @@ class MailMassMailingCreate(osv.TransientModel):
             required=True,
         ),
         'model_id': fields.many2one(
-            'ir.model', 'Document',
+            'ir.model', 'Document Type',
             required=True,
             help='Document on which the mass mailing will run. This must be a '
                  'valid OpenERP model.',
@@ -116,6 +116,7 @@ class MailMassMailingCreate(osv.TransientModel):
             'default_template_id': wizard.template_id.id,
             'default_use_mass_mailing_campaign': True,
             'default_use_active_domain': True,
+            'default_model': wizard.model_id.model,
             'default_active_domain': wizard.domain,
             'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
             'default_mass_mailing_id': wizard.mass_mailing_id.id,

From 7f7e698febb7813bbd38bab6920fd0f12ced5ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 15:16:46 +0100
Subject: [PATCH 434/547] [FIX] mass_mailing: wave creation wizard: fixed
 closing button jumping after setting the wave name

bzr revid: tde@openerp.com-20131210141646-17y49b7xvckepogz
---
 .../mass_mailing/wizard/mail_mass_mailing_create_segment.xml   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index d320520cbd2..ac313dea78b 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -55,8 +55,7 @@
                         <label for="name"/>
                         <div>
                             <field name="name"/>
-                            <p class="oe_grey"
-                                attrs="{'invisible': [('name', '!=', False)]}">
+                            <p class="oe_grey">
                                 Please choose the name of the mailing.
                             </p>
                         </div>

From 989a0d78902885b8faa73f3ddbf72e43c8655f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 15:17:04 +0100
Subject: [PATCH 435/547] [IMP] mass_mailing: added a link to create a wave
 directly from the kanban view

bzr revid: tde@openerp.com-20131210141704-u9t6zlfypmi1wba3
---
 addons/mass_mailing/mass_mailing_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index f0c27f42a4a..c9594179a72 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -252,6 +252,9 @@
                                         <t t-if="widget.view.is_action_enabled('edit')">
                                             <li><a type="edit">Settings</a></li>
                                         </t>
+                                        <t t-if="widget.view.is_action_enabled('edit')">
+                                            <li><a name="%(action_mail_mass_mailing_create)d" type="action">New Wave</a></li>
+                                        </t>
                                         <t t-if="widget.view.is_action_enabled('delete')">
                                             <li><a type="delete">Delete</a></li>
                                         </t>

From 19eeff611edf6800263b12a659205409cadfdd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 15:45:03 +0100
Subject: [PATCH 436/547] [FIX] mass_mailing: fixed previous fixes, because of
 order of loaded files

bzr revid: tde@openerp.com-20131210144503-ftg1y7xvs7smh269
---
 addons/mass_mailing/__openerp__.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index db7ac54263a..92f8b1fc3e8 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -21,7 +21,11 @@
 
 {
     'name': 'Mass Mailing Campaigns',
-    'description': """TODO""",
+    'description': """
+Easily send mass mailing to your leads, opportunities or customers. Track
+marketing campaigns performance to improve conversion rates. Design
+professional emails and reuse templates in a few clicks.
+    """,
     'version': '1.0',
     'author': 'OpenERP',
     'website': 'http://www.openerp.com',
@@ -34,9 +38,9 @@
     ],
     'data': [
         'mail_data.xml',
-        'mass_mailing_view.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_mass_mailing_create_segment.xml',
+        'mass_mailing_view.xml',
         'security/ir.model.access.csv',
     ],
     'js': [

From 7b23df235be21ed630bf8f70fee063f3b25d44c7 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 10 Dec 2013 16:29:57 +0100
Subject: [PATCH 437/547] [FIX] account: move purchase journal from demo to
 data

bzr revid: dle@openerp.com-20131210152957-hn0c3zvli62vhi0a
---
 addons/account/data/account_data.xml    | 6 ++++++
 addons/account/project/project_demo.xml | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 8119e9f1002..723ec6da155 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -3,9 +3,15 @@
     <data noupdate="1">
 
         <record id="analytic_journal_sale" model="account.analytic.journal">
+            <field name="code">SAL</field>
             <field name="name">Sales</field>
             <field name="type">sale</field>
         </record>
+        <record id="exp" model="account.analytic.journal">
+            <field name="code">PUR</field>
+            <field name="name">Purchases</field>
+            <field name="type">purchase</field>
+        </record>
 
         <!--
         Payment term
diff --git a/addons/account/project/project_demo.xml b/addons/account/project/project_demo.xml
index dcb894bc940..5ce34521b45 100644
--- a/addons/account/project/project_demo.xml
+++ b/addons/account/project/project_demo.xml
@@ -6,11 +6,6 @@
             <field name="name">Sales</field>
             <field name="type">sale</field>
         </record>
-        <record id="exp" model="account.analytic.journal">
-            <field name="code">PUR</field>
-            <field name="name">Purchases</field>
-            <field name="type">purchase</field>
-        </record>
         <record id="sit" model="account.analytic.journal">
             <field name="code">START</field>
             <field name="name">Miscellaneous Operation</field>

From 5de64b65c6dfba8c3423ce9185fcf87441342c62 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Tue, 10 Dec 2013 16:35:19 +0100
Subject: [PATCH 438/547] [FIX] Calling read() on a not-existing user id crash
 instead of returning False

bzr revid: cto@openerp.com-20131210153519-4yx724gffll27fb5
---
 openerp/addons/base/res/res_users.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index b1aeaf28107..4eb8d873f48 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -808,8 +808,9 @@ class users_view(osv.osv):
         if not 'groups_id' in fields:
             fields.append('groups_id')
         res = super(users_view, self).read(cr, uid, ids, fields, context=context, load=load)
-        for values in (res if isinstance(res, list) else [res]):
-            self._get_reified_groups(group_fields, values)
+        if res:
+            for values in (res if isinstance(res, list) else [res]):
+                self._get_reified_groups(group_fields, values)
         return res
 
     def _get_reified_groups(self, fields, values):

From 762774df3749ae6c1205878f430f0d886c42ea55 Mon Sep 17 00:00:00 2001
From: xmo <>
Date: Tue, 10 Dec 2013 16:57:03 +0100
Subject: [PATCH 439/547] [FIX] prevent field going to be misplaced when going
 from readonly to writable in editable list view

bzr revid: mat@openerp.com-20131210155703-2mzqa2mch46nxpcj
---
 addons/web/static/src/js/view_list_editable.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index f2fd8974d81..bd9cee06797 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -451,6 +451,13 @@ openerp.web.list_editable = function (instance) {
                 field.on("change:effective_readonly", self, set_invisible);
                 field.on("change:invisible", self, set_invisible);
                 set_invisible();
+                field.on('change:invisible', self, function () {
+                    if (field.get('invisible')) { return; }
+                    var item = _(self.fields_for_resize).find(function (item) {
+                        return item.field === field;
+                    });
+                    if (item) { self.resize_field(item.field, item.cell); }
+                });
             });
 
             this.editor.$el.on('keyup keydown', function (e) {

From 5cecb92cf82c5191226d3fd0fc2ca757da7f2b67 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 10 Dec 2013 17:05:05 +0100
Subject: [PATCH 440/547] [FIX] stock: incoming shipment supplier quick create
 was creating a customer instead of a supplier

bzr revid: dle@openerp.com-20131210160505-xdeeyooj07im8vz3
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ac769271dbc..72adde4ef20 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1034,7 +1034,7 @@
                     <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
                 </xpath>
                 <xpath expr="//field[@name='partner_id']" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Supplier" domain="[('supplier','=',True)]" />
+                    <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Supplier" domain="[('supplier','=',True)]" context="{'default_supplier':1,'default_customer':0}"/>
                 </xpath>
                 <xpath expr="//field[@name='move_lines']" position="replace">
                     <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}" options='{"reload_on_button": true}'/>

From b2eb65f04eab1514204fb6a9db3c26b854dd6852 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 10 Dec 2013 17:56:27 +0100
Subject: [PATCH 441/547] [FIX] purchase: set readonly on warehouse_id related
 field in stock.picking.in

bzr revid: dle@openerp.com-20131210165627-7uy323jt6k1302kz
---
 addons/purchase/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 60b439a2097..e4a3252eef2 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -141,6 +141,6 @@ class stock_picking_in(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
-        'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Destination Warehouse'),
+        'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Destination Warehouse', readonly=True),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 15e39ebb3bbee86e2952918eab9918ea3f156f3b Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 10 Dec 2013 18:38:28 +0100
Subject: [PATCH 442/547] [FIX] stock: stock picking workflow signaling on the
 wrong model

Since 7.0, signaling has changed, and the change was not wrongly done here, on the wrong model (self.signal_ instead of self.pool.get('stock.picking').signal_)
Therefore, created chained picking were not confirmed and were left in draft.
For instance, push rules were creating internal moves in draft state instead of confirmed state

bzr revid: dle@openerp.com-20131210173828-bah4lllgvi61r1s3
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 69d2c6e4791..1484397b5a8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2106,7 +2106,7 @@ class stock_move(osv.osv):
                 })
                 new_moves.append(self.browse(cr, uid, [new_id])[0])
             if pickid:
-                self.signal_button_confirm(cr, uid, [pickid])
+                self.pool.get('stock.picking').signal_button_confirm(cr, uid, [pickid])
         if new_moves:
             new_moves += self.create_chained_picking(cr, uid, new_moves, context)
         return new_moves

From 0d02d066756b98ec4bb08178746ba00a4bbcba1b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 10 Dec 2013 18:47:28 +0100
Subject: [PATCH 443/547] [IMP] mail: announcement bar: hardcode close ttl +
 update link with dbuuid

bzr revid: chs@openerp.com-20131210174728-hgkbv609mwq8iuu5
---
 addons/mail/static/src/js/announcement.js   | 15 ++++-----------
 addons/mail/static/src/xml/announcement.xml |  1 -
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
index f61cf534010..0dd438d13af 100644
--- a/addons/mail/static/src/js/announcement.js
+++ b/addons/mail/static/src/js/announcement.js
@@ -17,7 +17,9 @@ openerp_announcement = function(instance) {
                 if (!dbuuid) {
                     return;
                 }
-                var $css = $('<link />').attr({ 
+                var $link = $bar.find('.url a');
+                $link.attr('href', _.str.sprintf('%s/%s', $link.attr('href'), dbuuid));
+                var $css = $('<link />').attr({
                     rel : 'stylesheet',
                     type: 'text/css',
                     media: 'screen',
@@ -25,17 +27,8 @@ openerp_announcement = function(instance) {
                 });
                 $css.on('load', function() {
                     var close = function() {
-                        var data = window.getComputedStyle($bar.find('.data')[0], ':before').content || "'{}'";
-                        var delim = data[0];
-                        data = data.slice(1, data.length - 1).replace(new RegExp('\\\\'+delim, 'g'), delim);
-                        try {
-                            data = JSON.parse(data);
-                        } catch(_e) {
-                            data = {};
-                        }
-                        var ttl = data.close_ttl || 24*60*60;
+                        var ttl = 7*24*60*60;
                         self.session.set_cookie('ab', 'c', ttl);
-
                         $bar.slideUp('slow');
                     };
                     $bar.find('.close').on('click', close);
diff --git a/addons/mail/static/src/xml/announcement.xml b/addons/mail/static/src/xml/announcement.xml
index 1eabb5ebc6b..84dfa426796 100644
--- a/addons/mail/static/src/xml/announcement.xml
+++ b/addons/mail/static/src/xml/announcement.xml
@@ -6,7 +6,6 @@
         <span class="message"></span>
         <span class="url"><a href="https://services.openerp.com/openerp-enterprise/ab/register" target="_blank"></a></span>
         <span class="close"></span>
-        <span class="data"></span>
       </td>
     </t>
   </t>

From 34c6eb963a1c0173a49cfe23186d773863900757 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 10 Dec 2013 19:17:33 +0100
Subject: [PATCH 444/547] [FIX] point_of_sale: fix default destination(or
 source, for returns) location for pos order moves

For instance, the source location of moves of returned products was output instead of partners locations / customers

bzr revid: dle@openerp.com-20131210181733-2rjw6cas8bjypp2p
---
 addons/point_of_sale/point_of_sale.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 7b181b40eb2..805bfce4515 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -698,13 +698,14 @@ class pos_order(osv.osv):
             }, context=context)
             self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
             location_id = order.shop_id.warehouse_id.lot_stock_id.id
-            output_id = order.shop_id.warehouse_id.lot_output_id.id
+            if order.partner_id:
+                destination_id = order.partner_id.property_stock_customer.id
+            else:
+                destination_id = partner_obj.default_get(cr, uid, ['property_stock_customer'], context=context)['property_stock_customer']
 
             for line in order.lines:
                 if line.product_id and line.product_id.type == 'service':
                     continue
-                if line.qty < 0:
-                    location_id, output_id = output_id, location_id
 
                 move_obj.create(cr, uid, {
                     'name': line.name,
@@ -716,11 +717,9 @@ class pos_order(osv.osv):
                     'product_qty': abs(line.qty),
                     'tracking_id': False,
                     'state': 'draft',
-                    'location_id': location_id,
-                    'location_dest_id': output_id,
+                    'location_id': location_id if line.qty >= 0 else destination_id,
+                    'location_dest_id': destination_id if line.qty >= 0 else location_id,
                 }, context=context)
-                if line.qty < 0:
-                    location_id, output_id = output_id, location_id
 
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)

From 767207aa23e852f7c1044a315d0b1bf70db00e23 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 11 Dec 2013 06:28:08 +0000
Subject: [PATCH 445/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062724-zxcigdht6w71xy7v
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062802-mh61vodnsw0sr8im
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062808-o9fkpg2cg9cb403z
---
 addons/account/i18n/es_PE.po                  | 10935 +++++++++++
 addons/account/i18n/hr.po                     |     8 +-
 addons/base_vat/i18n/es_PE.po                 |    80 +
 addons/idea/i18n/ar.po                        |    14 +-
 addons/portal_hr_employees/i18n/pt_BR.po      |    12 +-
 addons/purchase/i18n/es_PE.po                 |  2218 +++
 addons/purchase_analytic_plans/i18n/es_PE.po  |    33 +
 .../purchase_double_validation/i18n/es_PE.po  |    49 +
 addons/sale/i18n/es_PE.po                     |  2172 +++
 addons/sale/i18n/hu.po                        |   162 +-
 addons/sale_journal/i18n/es_PE.po             |   139 +
 addons/sale_order_dates/i18n/es_PE.po         |    58 +
 addons/sale_stock/i18n/es_PE.po               |   616 +
 addons/stock/i18n/es_PE.po                    |  4801 +++++
 addons/stock/i18n/ro.po                       |    18 +-
 addons/web/i18n/es_PE.po                      |  2865 +++
 addons/web/i18n/fi.po                         |    14 +-
 addons/web_calendar/i18n/es_PE.po             |   217 +
 addons/web_diagram/i18n/es_PE.po              |    99 +
 openerp/addons/base/i18n/es_PE.po             | 15557 ++++++++++++++++
 20 files changed, 39955 insertions(+), 112 deletions(-)
 create mode 100644 addons/account/i18n/es_PE.po
 create mode 100644 addons/base_vat/i18n/es_PE.po
 create mode 100644 addons/purchase/i18n/es_PE.po
 create mode 100644 addons/purchase_analytic_plans/i18n/es_PE.po
 create mode 100644 addons/purchase_double_validation/i18n/es_PE.po
 create mode 100644 addons/sale/i18n/es_PE.po
 create mode 100644 addons/sale_journal/i18n/es_PE.po
 create mode 100644 addons/sale_order_dates/i18n/es_PE.po
 create mode 100644 addons/sale_stock/i18n/es_PE.po
 create mode 100644 addons/stock/i18n/es_PE.po
 create mode 100644 addons/web/i18n/es_PE.po
 create mode 100644 addons/web_calendar/i18n/es_PE.po
 create mode 100644 addons/web_diagram/i18n/es_PE.po
 create mode 100644 openerp/addons/base/i18n/es_PE.po

diff --git a/addons/account/i18n/es_PE.po b/addons/account/i18n/es_PE.po
new file mode 100644
index 00000000000..de7bfddc4a5
--- /dev/null
+++ b/addons/account/i18n/es_PE.po
@@ -0,0 +1,10935 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-12-09 17:00+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.fiscal.position.account:0
+msgid ""
+"An account fiscal position could be defined only once time on same accounts."
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sequence:0
+msgid ""
+"Determine the display order in the report 'Accounting \\ Reporting \\ "
+"Generic Reporting \\ Taxes \\ Taxes Report'"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "the parent company"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma/Open/Paid Invoices"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:369
+#, python-format
+msgid "Journal item \"%s\" is not valid."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#: code:addons/account/account_move_line.py:1210
+#, python-format
+msgid "Bad Account!"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"Error!\n"
+"You cannot create recursive account templates."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: view:account.automatic.reconcile:0
+#: field:account.move.line,reconcile_id:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
+#, python-format
+msgid "Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,name:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+#: xsl:account.transfer:0
+#: field:cash.box.in,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1058
+#: code:addons/account/account_invoice.py:820
+#: code:addons/account/account_invoice.py:823
+#: code:addons/account/account_invoice.py:826
+#: code:addons/account/account_invoice.py:1545
+#: code:addons/account/account_move_line.py:98
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#: code:addons/account/account_move_line.py:864
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3197
+#, python-format
+msgid "Miscellaneous Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid ""
+"You have to set the 'End  of Year Entries Journal' for this Fiscal Year "
+"which is set after generating opening entries from 'Generate Opening "
+"Entries'."
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a fiscal period.\n"
+"              </p><p>\n"
+"                An accounting period typically is a month or a quarter. It\n"
+"                usually corresponds to the periods of the tax declaration.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,label_filter:0
+msgid "Column Label"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,code_digits:0
+msgid "No. of digits to use for account code"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When it needs for a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_analytic_collected_id:0
+msgid ""
+"Set the analytic account that will be used by default on the invoice tax "
+"lines for invoices. Leave empty if you don't want to use an analytic account "
+"on the invoice tax lines by default."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_income_view1
+msgid "Income View"
+msgstr ""
+
+#. module: account
+#: help:account.account,user_type:0
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening "
+"entries."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_sequence_next:0
+msgid "Next credit note number"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_voucher:0
+msgid ""
+"This includes all the basic requirements of voucher entries for bank, cash, "
+"sales, purchase, expense, contra, etc.\n"
+"                This installs the module account_voucher."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
+msgid "Manual Recurring"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a customer refund. \n"
+"              </p><p>\n"
+"                A refund is a document that credits an invoice completely "
+"or\n"
+"                partially.\n"
+"              </p><p>\n"
+"                Instead of manually creating a customer refund, you\n"
+"                can generate it directly from the related customer invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_budget:0
+msgid "Budget management"
+msgstr ""
+
+#. module: account
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,style_overwrite:0
+msgid ""
+"You can set up here the format you want this record to be displayed. If you "
+"leave the automatic formatting, it will be computed based on the financial "
+"reports hierarchy (auto-computed field 'level')."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_multi_currency:0
+msgid "Allow multi currencies"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:77
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#, python-format
+msgid "You must select accounts to reconcile."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_analytic_accounting:0
+msgid "Allows you to use the analytic accounting."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Cancel Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_asset:0
+msgid ""
+"This allows you to manage the assets owned by a company or a person.\n"
+"                It keeps track of the depreciation occurred on those assets, "
+"and creates account move for those depreciation lines.\n"
+"                This installs the module account_asset. If you do not check "
+"this box, you will be able to do invoicing & payments,\n"
+"                but not accounting (Journal Items, Chart of Accounts, ...)"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
+#, python-format
+msgid "Period :"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,chart_template_id:0
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,tax_calculation_rounding_method:0
+msgid ""
+"If you select 'Round per line' : for each tax, the tax amount will first be "
+"computed and rounded for each PO/SO/invoice line and then these rounded "
+"amounts will be summed, leading to the total amount for that tax. If you "
+"select 'Round globally': for each tax, the tax amount will be computed for "
+"each PO/SO/invoice line, then these amounts will be summed and eventually "
+"this total tax amount will be rounded. If you sell with tax included, you "
+"should choose 'Round per line' because you certainly want the sum of your "
+"tax-included line subtotals to be equal to the total amount with taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Available Coins"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,enable_filter:0
+msgid "Enable Comparison"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,journal_id:0
+#: view:account.invoice:0
+#: field:account.invoice,journal_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,journal_id:0
+#: view:account.journal:0
+#: field:account.journal.cashbox.line,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: field:validate.account.move,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence of this line when displaying the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,chart_account_id:0
+#: help:account.balance.report,chart_account_id:0
+#: help:account.central.journal,chart_account_id:0
+#: help:account.common.account.report,chart_account_id:0
+#: help:account.common.journal.report,chart_account_id:0
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: help:account.general.journal,chart_account_id:0
+#: help:account.partner.balance,chart_account_id:0
+#: help:account.partner.ledger,chart_account_id:0
+#: help:account.print.journal,chart_account_id:0
+#: help:account.report.general.ledger,chart_account_id:0
+#: help:account.vat.declaration,chart_account_id:0
+#: help:accounting.report,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,decimal_precision:0
+msgid "Decimal precision on journal entries"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,period:0
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_report_id:0
+#: selection:account.financial.report,type:0
+msgid "Report Value"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid ""
+"Specified journal does not have any account move entries in draft state for "
+"this period."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly."
+msgstr ""
+
+#. module: account
+#: field:account.journal,profit_account_id:0
+msgid "Profit Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1156
+#, python-format
+msgid "No period found or more than one period found for the given date."
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were fully reconciled last "
+"time. It differs from the last date where a reconciliation has been made for "
+"this partner, as here we depict the fact that nothing more was to be "
+"reconciled at this date. This can be achieved in 2 different ways: either "
+"the last unreconciled debit/credit entry of this partner was reconciled, "
+"either the user pressed the button \"Nothing more to reconcile\" during the "
+"manual reconciliation process."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3201
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1591
+#, python-format
+msgid "Cannot create move with currency different from .."
+msgstr ""
+
+#. module: account
+#: model:email.template,report_name:account.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The amount expressed in the secondary currency must be positive when the "
+"journal item is a debit and negative when if it is a credit."
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on a centralized journal."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_analytic_paid_id:0
+msgid ""
+"Set the analytic account that will be used by default on the invoice tax "
+"lines for refunds. Leave empty if you don't want to use an analytic account "
+"on the invoice tax lines by default."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:297
+#: code:addons/account/report/account_partner_ledger.py:272
+#, python-format
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Configure your company bank accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1361
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:111
+#, python-format
+msgid ""
+"Cannot %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only refund this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Account code"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children with hierarchy"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/project/wizard/project_account_analytic_line.py:47
+#: model:ir.model,name:account.model_project_account_analytic_line
+#, python-format
+msgid "Analytic Entries by line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Method"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report
+msgid "Financial Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.financial.report,type:0
+#: field:account.invoice,type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,type:0
+#: view:account.journal:0
+#: field:account.journal,type:0
+#: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:826
+#, python-format
+msgid ""
+"Taxes are missing!\n"
+"Click on compute button."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Supplier Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:851
+#, python-format
+msgid "Entry is already reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency differs from the "
+"company currency."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Account Code and Name"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
+#, python-format
+msgid "Latest Manual Reconciliation Processed:"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_manual_reconcile
+msgid ""
+"<p>\n"
+"                    No journal items found.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1677
+#, python-format
+msgid ""
+"You cannot unreconcile journal items if they has been generated by the       "
+"                                                  opening/closing fiscal "
+"year process."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: field:account.journal.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_chart
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_journal_id:0
+msgid "Purchase journal"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,supplier_invoice_number:0
+msgid "The reference of this invoice as provided by the supplier."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_liability
+#: model:account.financial.report,name:account.account_financial_report_liability0
+#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:899
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is a tax code account, this field will contain the taxed "
+"amount.If the tax account is base tax code, this field will contain the "
+"basic amount(without tax)."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Features"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_bank_statement.py:424
+#: code:addons/account/account_invoice.py:77
+#: code:addons/account/account_invoice.py:775
+#: code:addons/account/account_move_line.py:195
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add an account.\n"
+"              </p><p>\n"
+"                When doing multi-currency transactions, you may loose or "
+"gain\n"
+"                some amount due to changes of exchange rate. This menu "
+"gives\n"
+"                you a forecast of the Gain or Loss you'd realized if those\n"
+"                transactions were ended today. Only for accounts having a\n"
+"                secondary currency set.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr ""
+
+#. module: account
+#: field:account.journal,with_last_closing_balance:0
+msgid "Opening With Last Closing Balance"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+msgid ""
+"Check this box if you don't want any tax related to this tax code to appear "
+"on invoices"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contains more "
+"information about the account and its specificities."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Refund "
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
+#: model:ir.ui.menu,name:account.journal_cash_move_lines
+msgid "Cash Registers"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_journal_id:0
+msgid "Sale refund journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cash log.\n"
+"              </p><p>\n"
+"                A Cash Register allows you to manage cash entries in your "
+"cash\n"
+"                journals. This feature provides an easy way to follow up "
+"cash\n"
+"                payments on a daily basis. You can enter the coins that are "
+"in\n"
+"                your cash box, and then post entries when money comes in or\n"
+"                goes out of the cash box.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_bank
+#: selection:account.bank.accounts.wizard,account_type:0
+#: code:addons/account/account.py:3092
+#, python-format
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Refunds"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr ""
+
+#. module: account
+#: help:account.account,foreign_balance:0
+msgid ""
+"Total amount (in Secondary currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_dest_id:0
+#: field:account.fiscal.position.tax.template,tax_dest_id:0
+msgid "Replacement Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.journal,code:0
+msgid "The code will be displayed on reports."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: view:account.tax.code:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.config.settings,chart_template_id:0
+msgid "Template"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Draft Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.action_account_entries_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
+msgid "Entries Analysis"
+msgstr ""
+
+#. module: account
+#: field:account.account,level:0
+#: field:account.financial.report,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_financial_report.py:70
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
+msgid "Profit and Loss"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_reconcile_select
+#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
+msgid "Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to Close"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_sequence_prefix:0
+msgid "Invoice sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the status will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' "
+"status."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Closing Entries"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:612
+#: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1483
+#, python-format
+msgid ""
+"There is no default debit account defined \n"
+"on journal \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:10
+#, python-format
+msgid ""
+"There is nothing to reconcile. All invoices and payments\n"
+"                    have been reconciled, your partner balance is clean."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,code_digits:0
+#: field:account.config.settings,code_digits:0
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_report_common.py:164
+#, python-format
+msgid "Not implemented."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Credit Note"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "eInvoicing & Payments"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: help:account.fiscal.position,active:0
+msgid ""
+"By unchecking the active field, you may hide a fiscal position without "
+"deleting it."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
+msgid "Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,company_footer:0
+msgid "Bank accounts footer preview"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "TIN :"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Advanced Settings"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unposted Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new account type.\n"
+"              </p><p>\n"
+"                An account type is used to determine how an account is used "
+"in\n"
+"                each journal. The deferral method of an account type "
+"determines\n"
+"                the process for the annual closing. Reports such as the "
+"Balance\n"
+"                Sheet and the Profit and Loss report use the category\n"
+"                (profit/loss or balance sheet).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: code:addons/account/account_invoice.py:1157
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.move,balance:0
+msgid "balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_analytic_accounting:0
+msgid "Analytic accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: help:res.company,tax_calculation_rounding_method:0
+msgid ""
+"If you select 'Round per Line' : for each tax, the tax amount will first be "
+"computed and rounded for each PO/SO/invoice line and then these rounded "
+"amounts will be summed, leading to the total amount for that tax. If you "
+"select 'Round Globally': for each tax, the tax amount will be computed for "
+"each PO/SO/invoice line, then these amounts will be summed and eventually "
+"this total tax amount will be rounded. If you sell with tax included, you "
+"should choose 'Round per line' because you certainly want the sum of your "
+"tax-included line subtotals to be equal to the total amount with taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+#: view:report.account_type.sales:0
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
+#, python-format
+msgid ""
+"The journal must have centralized counterpart without the Skipping draft "
+"state option checked."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:854
+#, python-format
+msgid "Some entries are already reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"Select a configuration package to setup automatically your\n"
+"                        taxes and chart of accounts."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending Accounts"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_payment:0
+msgid "Manage payment orders"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Duration"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,last_closing_balance:0
+msgid "Last Closing Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the tax declaration."
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_check_writing:0
+msgid "Pay your suppliers by check"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_ids:0
+#: field:account.invoice,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a tax declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1071
+#: code:addons/account/account.py:1073
+#: code:addons/account/account.py:1116
+#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1356
+#: code:addons/account/account.py:1363
+#: code:addons/account/account.py:1587
+#: code:addons/account/account.py:1591
+#: code:addons/account/account.py:1677
+#: code:addons/account/account.py:2358
+#: code:addons/account/account.py:2678
+#: code:addons/account/account.py:3465
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
+#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:419
+#: code:addons/account/account_cash_statement.py:256
+#: code:addons/account/account_cash_statement.py:300
+#: code:addons/account/account_invoice.py:899
+#: code:addons/account/account_invoice.py:933
+#: code:addons/account/account_invoice.py:1124
+#: code:addons/account/account_move_line.py:579
+#: code:addons/account/account_move_line.py:828
+#: code:addons/account/account_move_line.py:851
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/account_move_line.py:1121
+#: code:addons/account/account_move_line.py:1156
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_invoice_refund.py:109
+#: code:addons/account/wizard/account_invoice_refund.py:111
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
+#: code:addons/account/wizard/account_use_model.py:44
+#: code:addons/account/wizard/pos_box.py:31
+#: code:addons/account/wizard/pos_box.py:35
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to record a new supplier invoice.\n"
+"              </p><p>\n"
+"                You can control the invoice from your supplier according to\n"
+"                what you purchased or received. OpenERP can also generate\n"
+"                draft invoices automatically from purchase orders or "
+"receipts.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1058
+#, python-format
+msgid ""
+"This journal already contains items for this period, therefore you cannot "
+"modify its company field."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a bank statement.\n"
+"              </p><p>\n"
+"                A bank statement is a summary of all financial transactions\n"
+"                occurring over a given period of time on a bank account. "
+"You\n"
+"                should receive this periodicaly from your bank.\n"
+"              </p><p>\n"
+"                OpenERP allows you to reconcile a statement line directly "
+"with\n"
+"                the related sale or puchase invoices.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,currency_id:0
+msgid "Default company currency"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+#: field:account.move.line,move_id:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: view:account.treasury.report:0
+#: model:ir.actions.act_window,name:account.action_account_treasury_report_all
+#: model:ir.model,name:account.model_account_treasury_report
+#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
+msgid "Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.invoice.tax,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:406
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_follower_ids:0
+#: field:account.invoice,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:656
+#, python-format
+msgid ""
+"You cannot change the type of account to '%s' type as it contains journal "
+"items!"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscal Year"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
+#, python-format
+msgid "Journal :"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.fiscal.position.tax:0
+msgid "A tax fiscal position could be defined only once time on same taxes."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.actions.act_window,name:account.action_account_config
+msgid "Configure Accounting"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: account
+#: help:account.journal,allow_date:0
+msgid ""
+"If set to True then do not accept the entry if the entry date is not into "
+"the period dates"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
+#, python-format
+msgid "Good job!"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_asset:0
+msgid "Assets management"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:274
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a sale journal."
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Italic Text (smaller)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,cash_control:0
+msgid ""
+"If you want the journal should be control at opening/closing, check this "
+"option"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: field:account.treasury.report,fiscalyear_id:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_sequence_next:0
+msgid "Next supplier credit note number"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:256
+#, python-format
+msgid "You do not have rights to open this %s journal !"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_supplier_inv_check_total
+msgid "Check Total on supplier invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Account Templates"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,default_sale_tax:0
+msgid "This sale tax will be assigned by default on new products."
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: report:account.central.journal:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
+#: view:account.config.settings:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.general.journal,fiscalyear_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.open.closed.fiscalyear,fyear_id:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id_cmp:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,fiscalyear_id:0
+#: help:account.balance.report,fiscalyear_id:0
+#: help:account.central.journal,fiscalyear_id:0
+#: help:account.common.account.report,fiscalyear_id:0
+#: help:account.common.journal.report,fiscalyear_id:0
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: help:account.general.journal,fiscalyear_id:0
+#: help:account.partner.balance,fiscalyear_id:0
+#: help:account.partner.ledger,fiscalyear_id:0
+#: help:account.print.journal,fiscalyear_id:0
+#: help:account.report.general.ledger,fiscalyear_id:0
+#: help:account.vat.declaration,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id_cmp:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:653
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type as it "
+"contains journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,account_line_id:0
+msgid "Account Line"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account Based on this Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:933
+#, python-format
+msgid ""
+"Cannot create the invoice.\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. In order to avoid rounding "
+"issues, the latest line of your payment term must be of type 'balance'."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:478
+#, python-format
+msgid ""
+"In order to delete a bank statement, you must first cancel it to delete "
+"related journal items."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+msgid "Payment Term"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:579
+#, python-format
+msgid "You cannot create journal items on a closed account %s %s."
+msgstr ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Draft state of an invoice"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Account Properties"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin. Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_advance
+#: model:account.payment.term,note:account.account_payment_term_advance
+msgid "30% Advance End 30 Days"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Unreconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3202
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cancel CashBox"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile (writeoff)"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.conf_account_type_tax
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.move.line,account_tax_id:0
+#: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,default_purchase_tax:0
+#: field:account.config.settings,purchase_tax:0
+msgid "Default purchase tax"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.financial.report,account_ids:0
+#: selection:account.financial.report,type:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3541
+#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_invoice.py:507
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:624
+#: code:addons/account/account_invoice.py:632
+#: code:addons/account/account_invoice.py:657
+#: code:addons/account/account_move_line.py:536
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:434
+#, python-format
+msgid "Statement %s confirmed, journal items were created."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,price_average:0
+#: field:account.invoice.report,user_currency_price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:res.partner.bank:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Purchase Tax"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or a tax code account."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to start a new fiscal year.\n"
+"              </p><p>\n"
+"                Define your company's financial year according to your "
+"needs. A\n"
+"                financial year is a period at the end of which a company's\n"
+"                accounts are made up (usually 12 months). The financial year "
+"is\n"
+"                usually referred to by the date in which it ends. For "
+"example,\n"
+"                if a company's financial year ends November 30, 2011, then\n"
+"                everything between December 1, 2010 and November 30, 2011\n"
+"                would be referred to as FY 2011.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:accounting.report:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,parent_id:0
+msgid "Parent Chart Template"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_unread:0
+#: field:account.invoice,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+msgid ""
+"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1071
+#, python-format
+msgid "You should choose the periods that belong to the same company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+msgid "Sales by Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You cannot delete a posted journal entry \"%s\"."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_collected_id:0
+msgid ""
+"Set the account that will be set by default on invoice tax lines for "
+"invoices. Leave empty to use the expense account."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_journal_id:0
+msgid "Sale journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_invoice.py:775
+#: code:addons/account/account_move_line.py:195
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:781
+#, python-format
+msgid ""
+"This journal already contains items, therefore you cannot modify its company "
+"field."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:409
+#, python-format
+msgid ""
+"You need an Opening journal with centralisation checked to set the initial "
+"balance."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Unrealized Gains and losses"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,only_one_chart_template:0
+msgid "Only One Chart Template Available"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_summary:0
+#: field:account.invoice,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,date_stop:0
+msgid "End date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can choose "
+"between the creation date or the creation date of the entries plus the "
+"partner payment terms."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report_pl
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:823
+#, python-format
+msgid ""
+"Tax base different!\n"
+"Click on compute to update the tax base."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:431
+#, python-format
+msgid "Unable to adapt the initial balance (negative value)."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: view:account.installer:0
+msgid "Date Range"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,account_report_id:0
+#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
+msgid "Account Reports"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
+msgid "Sale/Purchase Journals"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2678
+#, python-format
+msgid "There is no parent code for the template account."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,code_digits:0
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_accountant:0
+msgid ""
+"Full accounting features: journals, legal statements, chart of accounts, etc."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+#: selection:account.financial.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3460
+#: code:addons/account/account_bank.py:94
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_chart_of_accounts:0
+msgid "Company has a chart of accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Account Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+#: help:account.bank.accounts.wizard,currency_id:0
+msgid "Forces all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+msgid ""
+"This wizard will validate all journal entries of a particular journal and "
+"period. Once journal entries are validated, you can not update them anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_chart_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
+msgid "Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,journal_ids:0
+#: field:account.analytic.cost.ledger.journal.report,journal:0
+#: field:account.balance.report,journal_ids:0
+#: field:account.central.journal,journal_ids:0
+#: field:account.common.account.report,journal_ids:0
+#: field:account.common.journal.report,journal_ids:0
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.journal.period:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,journal_ids:0
+#: field:account.partner.ledger,journal_ids:0
+#: view:account.print.journal:0
+#: field:account.print.journal,journal_ids:0
+#: field:account.report.general.ledger,journal_ids:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,journal_ids:0
+#: field:accounting.report,journal_ids:0
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_account_print_journal
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
+#: model:ir.ui.menu,name:account.menu_journals_report
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.config.settings:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_vat_declaration
+msgid "Account Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1016
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralized journal. Uncheck the "
+"centralized counterpart box in the related journal from the configuration "
+"menu."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+#: field:account.treasury.report,starting_balance:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1465
+#, python-format
+msgid "No Partner Defined !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_close
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.cashbox.line,subtotal_opening:0
+msgid "Opening Subtotal"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You cannot create journal items with a secondary currency without recording "
+"both 'currency' and 'amount currency' field."
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,display_detail:0
+msgid "Display details"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr "RUC:"
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,paypal_account:0
+msgid ""
+"Paypal account (email) for receiving online payments (credit card, etc.) If "
+"you set a paypal account, the customer  will be able to pay your invoices or "
+"quotations with a button \"Pay with  Paypal\" in automated emails or through "
+"the OpenERP portal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:536
+#, python-format
+msgid ""
+"Cannot find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Journals/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,date_start:0
+msgid "Start date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"You will be able to edit and validate this\n"
+"                                    credit note directly or keep it draft,\n"
+"                                    waiting for the document to be issued "
+"by\n"
+"                                    your supplier/customer."
+msgstr ""
+
+#. module: account
+#: view:validate.account.move.lines:0
+msgid ""
+"All selected journal entries will be validated and posted. It means you "
+"won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:98
+#, python-format
+msgid ""
+"You have not supplied enough arguments to compute the initial balance, "
+"please select a period and a journal in the context."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,expects_chart_of_accounts:0
+msgid "This company has its own chart of accounts"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: view:cash.box.out:0
+#: model:ir.actions.act_window,name:account.action_cash_box_out
+msgid "Take Money Out"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a customer invoice.\n"
+"              </p><p>\n"
+"                OpenERP's electronic invoicing allows to ease and fasten "
+"the\n"
+"                collection of customer payments. Your customer receives the\n"
+"                invoice by email and he can pay online and/or import it\n"
+"                in his own system.\n"
+"              </p><p>\n"
+"                The discussions with your customer are automatically "
+"displayed at\n"
+"                the bottom of each invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Options"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period Length (days)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1363
+#, python-format
+msgid ""
+"You cannot modify a posted entry of this journal.\n"
+"First you should set the journal to allow cancelling entries."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
+msgid "Print Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Continue"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:930
+#, python-format
+msgid ""
+"There is no fiscal year defined for this date.\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#, python-format
+msgid "The entries to reconcile should belong to the same company."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unreconciled Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,default_purchase_tax:0
+msgid "This purchase tax will be assigned by default on new products."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: view:account.config.settings:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_cashbox_line
+msgid "account.journal.cashbox.line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.line:0
+#: selection:account.balance.report,filter:0
+#: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice.refund,date:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,date:0
+#: field:account.move.line.reconcile.writeoff,date_p:0
+#: report:account.overdue:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.print.journal,sort_selection:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.report.general.ledger,sortby:0
+#: field:account.subscription.line,date:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: field:analytic.entries.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Post"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2358
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: selection:account.general.journal,filter:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:res.groups,name:account.group_proforma_invoices
+msgid "Pro-forma Invoices"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_check_supplier_invoice_total:0
+msgid "Check the total of supplier invoices"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The status is 'Draft'. At the end of "
+"monthly period it is in 'Done' status."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries cannot be found."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,complete_tax_set:0
+msgid "Complete set of taxes"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Full Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.chart.template,name:0
+#: field:account.model.line,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:115
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: field:res.company,expects_chart_of_accounts:0
+msgid "Expects a Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_tree
+#: model:ir.ui.menu,name:account.menu_action_bank_tree
+msgid "Setup your Bank Accounts"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_ids:0
+#: help:account.invoice,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.aged.trial.balance:0
+#: constraint:account.balance.report:0
+#: constraint:account.central.journal:0
+#: constraint:account.common.account.report:0
+#: constraint:account.common.journal.report:0
+#: constraint:account.common.partner.report:0
+#: constraint:account.common.report:0
+#: constraint:account.general.journal:0
+#: constraint:account.partner.balance:0
+#: constraint:account.partner.ledger:0
+#: constraint:account.print.journal:0
+#: constraint:account.report.general.ledger:0
+#: constraint:account.vat.declaration:0
+#: constraint:accounting.report:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+
+#. module: account
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any tax related to this tax Code to appear "
+"on invoices."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#, python-format
+msgid "You cannot use an inactive account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_account_config
+#: model:ir.ui.menu,name:account.menu_board_account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current year"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:573
+#: code:addons/account/wizard/account_invoice_refund.py:146
+#, python-format
+msgid "Insufficient Data!"
+msgstr ""
+
+#. module: account
+#: help:account.account,unrealized_gain_loss:0
+msgid ""
+"Value of Loss or Gain due to changes in exchange rate when doing multi-"
+"currency transactions."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"entries of all fiscal years. Note that you should define it with default "
+"debit/credit accounts, of type 'situation' and with a centralized "
+"counterpart."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Accounting & Finance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_analytic_collected_id:0
+msgid "Invoice Tax Analytic Account"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid ""
+"If you put \"%(year)s\" in the prefix, it will be replaced by the current "
+"year."
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Posted Journal Items"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,decimal_precision:0
+msgid ""
+"As an example, a decimal precision of 2 will allow journal entries  like: "
+"9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
+"0.0231 EUR."
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.account.type,name:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: selection:account.financial.report,type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:424
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid ""
+"Error!\n"
+"You cannot create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Error!\n"
+"The duration of the Period(s) is/are invalid."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:668
+#, python-format
+msgid "You cannot change the code of account which contains journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_sequence_prefix:0
+msgid "Supplier invoice sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:610
+#: code:addons/account/account_invoice.py:625
+#, python-format
+msgid ""
+"Cannot find a chart of account, you should create one from Settings\\"
+"Configuration\\Accounting menu."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: account
+#: field:res.company,paypal_account:0
+msgid "Paypal Account"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Reverse balance sign"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:191
+#, python-format
+msgid "Balance Sheet (Liability account)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.cashbox.line,subtotal_closing:0
+msgid "Closing Subtotal"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:864
+#, python-format
+msgid ""
+"You have to provide an account for the write off/exchange difference entry."
+msgstr ""
+
+#. module: account
+#: help:res.company,paypal_account:0
+msgid "Paypal username (usually email) for receiving online payments."
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,opening_reconciliation:0
+msgid "Opening Entries Reconciliation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,state:0
+msgid "Balanced"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:115
+#, python-format
+msgid ""
+"There is currently no company without chart of account. The wizard will "
+"therefore not be executed."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Add an internal note..."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Set Your Accounting Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Main Title 1 (bold, underlined)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.account,exchange_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:122
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+#: view:account.chart.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,visible:0
+msgid "Can be Visible?"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+msgid "Journal Items to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.period:0
+msgid "The name of the period must be unique per company!"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,currency_id:0
+msgid "Currency as per company's country."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Computation"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,visible:0
+msgid ""
+"Set this to False if you don't want this template to be used actively in the "
+"wizard that generate Chart of Accounts from templates, this is useful when "
+"you want to generate accounts of this template only when loading its child "
+"template."
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account,reconcile:0
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Error!\n"
+"You cannot create an account which has parent account of different company."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:658
+#, python-format
+msgid ""
+"Cannot find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Journals\\Journals."
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3204
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+msgid "Recurring Models"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Children/Sub Taxes"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: view:cash.box.out:0
+msgid "Describe why you take money from the cash register:"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1903
+#, python-format
+msgid " (Copy)"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_proforma_invoices:0
+msgid "Allows you to put invoices in pro-forma state."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Unit Of Currency Definition"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column on report if the currency differs from the "
+"company currency."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3394
+#, python-format
+msgid "Purchase Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.actions.act_window,name:account.action_account_subscription_generate
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "My Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement,state:0
+msgid "New"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Sale Tax"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Cancel Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_code_id:0
+#: field:account.tax.template,ref_tax_code_id:0
+msgid "Refund Tax Code"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+msgid ""
+"When journal period is created. The status is 'Draft'. If a report is "
+"printed it comes to 'Printed' status. When all transactions are done, it "
+"comes in 'Done' status."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3205
+#, python-format
+msgid "MISC"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Accounting-related settings are managed on"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,expects_chart_of_accounts:0
+msgid "Check this box if this company is a legal entity."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.conf_account_type_chk
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.config.settings:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.period.close:0
+#: view:account.state.open:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:cash.box.in:0
+#: view:cash.box.out:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "or"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Posted Journal Entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Supplier Refund, otherwise a "
+"Partner bank account number."
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:890
+#, python-format
+msgid "Opening Period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Journal Entries to Review"
+msgstr ""
+
+#. module: account
+#: selection:res.company,tax_calculation_rounding_method:0
+msgid "Round Globally"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Additional notes..."
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:922
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The encoded total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.fiscal.position,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.journal,cash_control:0
+msgid "Cash Control"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date2:0
+#: field:account.analytic.cost.ledger,date2:0
+#: field:account.analytic.cost.ledger.journal.report,date2:0
+#: field:account.analytic.inverted.balance,date2:0
+#: field:account.analytic.journal.report,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_treasury_report_all
+msgid ""
+"From this view, have an analysis of your treasury. It sums the balance of "
+"every accounting entries made on liquidity accounts per period."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_manager
+msgid "Financial Manager"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,details_ids:0
+#: view:account.journal:0
+msgid "CashBox Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_vat_declaration
+msgid "Account Vat Declaration"
+msgstr "Declaración de Impuestos"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cancel Statement"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_accountant:0
+msgid ""
+"If you do not check this box, you will be able to do invoicing & payments, "
+"but not accounting (Journal Items, Chart of  Accounts, ...)"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.treasury.report,date:0
+msgid "Beginning of Period Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move:0
+#: field:account.balance.report,target_move:0
+#: report:account.central.journal:0
+#: field:account.central.journal,target_move:0
+#: field:account.chart,target_move:0
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.tax.chart,target_move:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,target_move:0
+#: field:accounting.report,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1454
+#, python-format
+msgid ""
+"Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: help:account.cashbox.line,number_opening:0
+msgid "Opening Unit Numbers"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sale and purchase rates or choose from list of taxes. This last "
+"choice assumes that the set of tax defined on this template is complete"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: field:account.financial.report,children_ids:0
+#: model:ir.model,name:account.model_account_financial_report
+msgid "Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: view:report.account.sales:0
+#: field:report.account.sales,name:0
+#: view:report.account_type.sales:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,sent:0
+msgid "It indicates that the invoice has been sent."
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1185
+#, python-format
+msgid ""
+"Cannot create an automatic sequence for this piece.\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Pro Forma Invoice "
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
+#: model:ir.ui.menu,name:account.menu_account_report_bs
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:188
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date in Period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_move_line_form
+msgid "Entries"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:508
+#, python-format
+msgid ""
+"Cannot find a chart of accounts for this company, you should create one."
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.config.settings:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+#: field:cash.box.in,amount:0
+#: field:cash.box.out,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_summary:0
+#: help:account.invoice,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Cash and Banks"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Recompute taxes and total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1116
+#, python-format
+msgid "You cannot modify/delete a journal with entries for this period."
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,supplier_invoice_number:0
+msgid "Supplier Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "You can not add/modify entries in a closed period %s of journal %s."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date1:0
+#: field:account.analytic.cost.ledger,date1:0
+#: field:account.analytic.cost.ledger.journal.report,date1:0
+#: field:account.analytic.inverted.balance,date1:0
+#: field:account.analytic.journal.report,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset_view1
+msgid "Asset View"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+msgid ""
+"Select here the kind of valuation related to this payment term line. Note "
+"that you should have your last line with the type 'Balance' to ensure that "
+"the whole amount will be treated."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include Initial Balances"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Tax Codes"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Refund "
+msgstr ""
+
+#. module: account
+#: view:cash.box.in:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,value_amount:0
+msgid "Amount To Pay"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+msgid ""
+"This is the remaining partners for who you should check if there is "
+"something to reconcile or not. This figure already count the current partner "
+"as reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+#: model:ir.actions.act_window,name:account.action_account_change_currency
+#: model:ir.model,name:account.model_account_change_currency
+msgid "Change Currency"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,opening_details_ids:0
+msgid "Opening Cashbox Lines"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+#: field:account.entries.report,amount_currency:0
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: selection:res.company,tax_calculation_rounding_method:0
+msgid "Round per Line"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a journal entry.\n"
+"              </p><p>\n"
+"                A journal entry consists of several journal items, each of\n"
+"                which is either a debit or a credit transaction.\n"
+"              </p><p>\n"
+"                OpenERP automatically creates one journal entry per "
+"accounting\n"
+"                document: invoice, refund, supplier payment, bank "
+"statements,\n"
+"                etc. So, you should record journal entries manually "
+"only/mainly\n"
+"                for miscellaneous operations.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Normal Text"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:474
+#, python-format
+msgid ""
+"You cannot delete an invoice after it has been validated (and received a "
+"number).  You can set it back to \"Draft\" state and modify its content, "
+"then re-confirm it."
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,power:0
+msgid ""
+"Number of partial amounts that can be combined to find a balance point can "
+"be chosen as the power of the automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#, python-format
+msgid "You must set a period length greater than 0."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Refund"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Automatic formatting"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "You cannot change the tax, you should remove and recreate lines."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Opening Entries"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due Date Computation"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal.report,analytic_account_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journals"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1117
+#, python-format
+msgid "Move name (id): %s (%s)"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:879
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_income
+#: model:account.financial.report,name:account.account_financial_report_income0
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.config.settings:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:390
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1031
+#, python-format
+msgid "You can not re-open a period which belongs to closed fiscal year"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:95
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:276
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Select Company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_state_open
+#: model:ir.model,name:account.model_account_state_open
+msgid "Account State Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add an account.\n"
+"              </p><p>\n"
+"                An account is part of a ledger allowing your company\n"
+"                to register all kinds of debit and credit transactions.\n"
+"                Companies present their annual accounts in two main parts: "
+"the\n"
+"                balance sheet and the income statement (profit and loss\n"
+"                account). The annual accounts of a company are required by "
+"law\n"
+"                to disclose a certain amount of information.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(update)"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.common.account.report,filter:0
+#: field:account.common.journal.report,filter:0
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.vat.declaration,filter:0
+#: field:accounting.report,filter:0
+#: field:accounting.report,filter_cmp:0
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2334
+#, python-format
+msgid "You have a wrong expression \"%(...)s\" in your model !"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes Included Prices"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Balance as calculated based on Starting Balance and transaction lines"
+msgstr ""
+
+#. module: account
+#: field:account.journal,loss_account_id:0
+msgid "Loss Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_general_journal
+#: model:ir.model,name:account.model_account_general_journal
+msgid "Account General Journal"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entries are usually in the status "
+"'Unposted', but you can set the option to skip that status on the related "
+"journal. In that case, they will behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' status."
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1357
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.account,foreign_balance:0
+msgid "Foreign Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_multi_currency:0
+msgid "Allows you multi currency environment"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Running Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_analytic_entries_report
+#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
+msgid "Analytic Entries Analysis"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,journal_id:0
+msgid ""
+"This journal will be created automatically for this bank account when you "
+"save the record"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Models"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1124
+#, python-format
+msgid ""
+"You cannot cancel an invoice which is partially paid. You need to "
+"unreconcile related payment entries first."
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax_rate:0
+msgid "Sales Tax(%)"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a refund you received from a supplier.\n"
+"              </p><p>\n"
+"                Instead of creating the supplier refund manually, you can "
+"generate\n"
+"                refunds and reconcile them directly from the related "
+"supplier invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,complete_tax_set:0
+#: help:wizard.multi.charts.accounts,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sales and purchase rates or use the usual m2o fields. This last "
+"choice assumes that the set of tax defined for the chosen template is "
+"complete"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Open and Paid Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children flat"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Bank & Cash"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: field:account.chart,fiscalyear:0
+#: view:account.fiscalyear:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.config.settings:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.period.close:0
+#: view:account.state.open:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:cash.box.in:0
+#: view:cash.box.out:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_receivable
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:633
+#, python-format
+msgid "Invoice line account's company and invoice's compnay does not match."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:69
+#, python-format
+msgid "Custom"
+msgstr ""
+
+#. module: account
+#: field:account.journal,cashbox_line_ids:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+#: model:account.account.type,name:account.conf_account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: field:account.journal,internal_account_id:0
+msgid "Internal Transfers Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/pos_box.py:32
+#, python-format
+msgid "Please check that the field 'Journal' is set on the Bank Statement"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,tax_calculation_rounding_method:0
+msgid "Round globally"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3465
+#, python-format
+msgid "Cannot generate an unused journal code."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "force period"
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,difference:0
+msgid "Difference"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:414
+#, python-format
+msgid ""
+"There is no opening/closing period defined, please create one to set the "
+"initial balance."
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"higher ones. The order is important if you have a tax that has several tax "
+"children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1453
+#: code:addons/account/account.py:1482
+#: code:addons/account/account.py:1489
+#: code:addons/account/account_invoice.py:1015
+#: code:addons/account/account_move_line.py:1005
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Discard"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Journal Items"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_default_company:0
+msgid "Has default company"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid ""
+"This wizard will generate the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year: "
+"it will simply replace the old opening entries with the new ones."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:686
+#, python-format
+msgid ""
+"You cannot change the owner company of an account that already contains "
+"journal items."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1160
+#: selection:report.invoice.created,type:0
+#, python-format
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.financial.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.invoice.line,uos_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: field:account.installer,has_default_company:0
+msgid "Has Default Company"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2%."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.tax:0
+msgid "Tax Name must be unique per company!"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: field:account.fiscal.position.template,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:142
+#: code:addons/account/account_move_line.py:955
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,currency_id:0
+msgid "Currency of the related account journal."
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You cannot provide a secondary currency if it is the same than the company "
+"one."
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:190
+#, python-format
+msgid "Balance Sheet (Asset account)"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current period"
+msgstr ""
+
+#. module: account
+#: help:account.journal,update_posted:0
+msgid ""
+"Check this box if you want to allow the cancellation the entries related to "
+"this journal or of the invoice related to this journal"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Cancel Fiscal Year Closing Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:189
+#, python-format
+msgid "Profit & Loss (Expense account)"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Total Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:636
+#, python-format
+msgid "You cannot remove an account that contains journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,style_overwrite:0
+msgid "Financial Report Style"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Preserve balance sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+#: model:ir.ui.menu,name:account.menu_account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "You must set a start date."
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"If you selected to filter by date or period, this field allow you to add a "
+"row to display the amount of debit/credit/balance that precedes the filter "
+"you've set."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Journal Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:147
+#, python-format
+msgid "No period found on the invoice."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:67
+#, python-format
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.reconcile:0
+msgid "You can only reconcile journal items with the same partner."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
+#, python-format
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+msgstr ""
+
+#. module: account
+#: help:account.move,to_check:0
+msgid ""
+"Check this box if you are unsure of that journal entry and if you want to "
+"note it as 'to be reviewed' by an accounting expert."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,complete_tax_set:0
+#: field:wizard.multi.charts.accounts,complete_tax_set:0
+msgid "Complete Set of Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2304
+#, python-format
+msgid ""
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s: To Specify Year \n"
+"%(month)s: To Specify Month \n"
+"%(date)s: Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_voucher:0
+msgid "Manage customer payments"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid ""
+"Error!\n"
+"The start date of a fiscal year must precede its end date."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Sales"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Re-Open Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Misc"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1319
+#, python-format
+msgid ""
+"You cannot validate a non-balanced entry.\n"
+"Make sure you have configured payment terms properly.\n"
+"The latest payment term line should be of the \"Balance\" type."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Internal notes..."
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error!\n"
+"You cannot define children to an account with internal type different of "
+"\"View\"."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_accounting_report
+msgid "Accounting Report"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account Currency"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
+msgid "Financial Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_opening:0
+msgid "Opening Entries Expense Account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,closing_details_ids:0
+msgid "Closing Cashbox Lines"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Posted entries"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Accounting Period"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_tax_rate:0
+msgid "Purchase tax (%)"
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_account_charts_modules
+msgid "Chart Templates"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_opening:0
+msgid "Opening Entries Income Account"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_proforma_invoices:0
+msgid "Allow pro-forma invoices"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_cash_box_out
+msgid "cash.box.out"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,currency_id:0
+msgid "Main currency of the company."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reports
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/account_move_line.py:780
+#: code:addons/account/static/src/js/account_move_reconciliation.js:90
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_analytic_open
+msgid "Contracts/Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:res.partner.bank,journal_id:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,tax_calculation_rounding_method:0
+msgid "Tax calculation rounding method"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Use this option if you want to cancel an invoice you should not\n"
+"                                    have issued. The credit note will be "
+"created, validated and reconciled\n"
+"                                    with the invoice. You will not be able "
+"to modify the credit note."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"This field shows you the next partner that will be automatically chosen by "
+"the system to go through the reconciliation process, based on the latest day "
+"it have been reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1490
+#, python-format
+msgid ""
+"There is no default credit account defined \n"
+"on journal \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"<p>\n"
+"                Click to add a new analytic account.\n"
+"              </p><p>\n"
+"                The normal chart of accounts has a structure defined by the\n"
+"                legal requirement of the country. The analytic chart of\n"
+"                accounts structure should reflect your own business needs "
+"in\n"
+"                term of costs/revenues reporting.\n"
+"              </p><p>\n"
+"                They are usually structured by contracts, projects, products "
+"or\n"
+"                departements. Most of the OpenERP operations (invoices,\n"
+"                timesheets, expenses, etc) generate analytic entries on the\n"
+"                related account.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_view
+msgid "Root/View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3206
+#, python-format
+msgid "OPEJ"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_email_templates
+#: model:ir.ui.menu,name:account.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_multi_currency
+msgid "Multi-Currencies"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3193
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1185
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
+msgid "Account Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,chart_template_id:0
+msgid ""
+"This optional field allow you to link an account template to a specific "
+"chart template that may differ from the one its root parent belongs to. This "
+"allow you to define chart templates that extend another and complete it with "
+"few new accounts (You don't need to define the whole structure that is "
+"common to both several times)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Unposted Journal Entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for credit note and period will "
+"be chosen accordingly!"
+msgstr ""
+
+#. module: account
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3541
+#, python-format
+msgid ""
+"You have to set a code for the bank account defined on the selected chart of "
+"accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1541
+#, python-format
+msgid "Currency Adjustment"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"This field is used to generate legal reports: profit and loss, balance sheet."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:820
+#, python-format
+msgid "Global taxes defined, but they are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones."
+msgstr ""
+
+#. module: account
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_sequence_prefix:0
+msgid "Credit note sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.config.settings:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:388
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.entries.report,type:0
+#: selection:account.journal,type:0
+#: code:addons/account/account.py:3092
+#, python-format
+msgid "Cash"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.financial.report,sequence:0
+#: field:account.invoice.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.code,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,paypal_account:0
+msgid "Paypal account"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Parent Report"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid ""
+"Error!\n"
+"You cannot create recursive accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_cash_box_in
+msgid "cash.box.in"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,period:0
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end:0
+msgid "Computed Balance"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_move_reconciliation.js:89
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: field:account.financial.report,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "Profit"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:472
+#, python-format
+msgid ""
+"You cannot delete an invoice which is not draft or cancelled. You should "
+"refund it instead."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: field:account.installer,charts:0
+msgid "Accounting Package"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+#: model:ir.ui.menu,name:account.menu_account_partner_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
+#: code:addons/account/account.py:1031
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_unread:0
+#: help:account.invoice,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account
+#: field:res.company,tax_calculation_rounding_method:0
+msgid "Tax Calculation Rounding Method"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open for Unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:901
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:382
+#, python-format
+msgid ""
+"The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:420
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this box if this account allows reconciliation of journal items."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: help:account.move.reconcile,opening_reconciliation:0
+msgid ""
+"Is this reconciliation produced by the opening of a new fiscal year ?."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1465
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,residual:0
+#: field:account.invoice.report,user_currency_residual:0
+msgid "Total Residual"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Cash Control"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Invoice's state is Open"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "No Fiscal Year Defined for This Company"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3196
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+#, python-format
+msgid "Please define a sequence on the journal."
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by Invoice Date"
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_followup:0
+msgid ""
+"This allows to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"                This installs the module account_followup."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: field:account.treasury.report,period_id:0
+#: field:validate.account.move,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,adjusted_balance:0
+msgid ""
+"Total amount (in Company currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:158
+#, python-format
+msgid "Select a starting and an ending period."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_sequence_next:0
+msgid "Next invoice number"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,adjusted_balance:0
+msgid "Adjusted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid ""
+"This wizard will remove the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: view:account.config.settings:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+#: field:accounting.report,chart_account_id:0
+msgid "Chart of Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation Result"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end_real:0
+#: field:account.treasury.report,ending_balance:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Use this option if you want to cancel an invoice and create a new\n"
+"                                    one. The credit note will be created, "
+"validated and reconciled\n"
+"                                    with the current invoice. A new, draft, "
+"invoice will be created \n"
+"                                    so that you can edit it."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_type_ids:0
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1210
+#, python-format
+msgid ""
+"You cannot use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a journal.\n"
+"              </p><p>\n"
+"                A journal is used to record transactions of all accounting "
+"data\n"
+"                related to the day-to-day business.\n"
+"              </p><p>\n"
+"                A typical company may use one journal per payment method "
+"(cash,\n"
+"                bank accounts, checks), one purchase journal, one sale "
+"journal\n"
+"                and one for miscellaneous information.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid ""
+"In order to close a period, you must first post related journal entries."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3391
+#, python-format
+msgid "Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3194
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Payment term explanation for the customer..."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,debit_credit:0
+msgid ""
+"This option allows you to get more details about the way your balances are "
+"computed. Because it is space consuming, we do not allow to use it while "
+"doing a comparison."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid "This account will be used to value outgoing stock using cost price."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.common.report:0
+#: view:account.invoice:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure?"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_tax_rate:0
+msgid "Sales tax (%)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new recurring entry.\n"
+"              </p><p>\n"
+"                A recurring entry occurs on a recurrent basis from a "
+"specific\n"
+"                date, i.e. corresponding to the signature of a contract or "
+"an\n"
+"                agreement with a customer or a supplier. You can create "
+"such\n"
+"                entries to automate the postings in the system.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:829
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Smallest Text"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_check_writing:0
+msgid ""
+"This allows you to check writing and printing.\n"
+"                This installs the module account_check_writing."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_invoice
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_expense
+#: model:account.financial.report,name:account.account_financial_report_expense0
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+#: field:res.partner.bank,currency_id:0
+#: field:wizard.multi.charts.accounts,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+msgid ""
+"You can select here the journal to use for the credit note that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2334
+#, python-format
+msgid "Wrong model !"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+#: view:account.tax.template:0
+msgid "Tax Template"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1121
+#, python-format
+msgid ""
+"You cannot do this modification on a reconciled entry. You can just change "
+"some non legal fields or you must unreconcile first.\n"
+"%s."
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,sign:0
+msgid ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,bank_statement_id:0
+#: field:account.entries.report,reconcile_id:0
+#: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+#: code:addons/account/account.py:3198
+#, python-format
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_is_follower:0
+#: field:account.invoice,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: field:account.move.line,narration:0
+msgid "Internal Note"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error!\n"
+"You cannot select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_fiscal_year:0
+msgid "Company has a fiscal year"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:634
+#, python-format
+msgid "You cannot deactivate an account that contains journal items."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.move.line,amount_residual:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_open_journal_button
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Unit of Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3195
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid ""
+"Once draft invoices are confirmed, you will not be able\n"
+"                        to modify them. The invoices will receive a unique\n"
+"                        number and journal items will be created in your "
+"chart\n"
+"                        of accounts."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_journal_id:0
+msgid "Purchase refund journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Configure Accounting Data"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:901
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/pos_box.py:36
+#, python-format
+msgid ""
+"Please check that the field 'Internal Transfers Account' is set on the "
+"payment method '%s'."
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,display_detail:0
+msgid "Display Detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3203
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:analytic.entries.report:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' status is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma status,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' status is used when user create invoice,a invoice number is "
+"generated.Its in open status till user does not pay invoice.             \n"
+"* The 'Paid' status is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled.             \n"
+"* The 'Cancelled' status is used when user cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,financial_report_ids:0
+#: field:account.account.template,financial_report_ids:0
+#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
+#: model:ir.actions.act_window,name:account.action_account_report
+#: model:ir.ui.menu,name:account.menu_account_reports
+msgid "Financial Reports"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability_view1
+msgid "Liability View"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_from:0
+#: field:accounting.report,period_from:0
+#: field:accounting.report,period_from_cmp:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Ask Refund"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_sequence_prefix:0
+msgid "Supplier credit note sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_payment:0
+msgid ""
+"This allows you to create and manage your payment orders, with purposes to\n"
+"                    * serve as base for an easy plug-in of various automated "
+"payment mechanisms, and\n"
+"                    * provide a more efficient way to manage invoice "
+"payments.\n"
+"                This installs the module account_payment."
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries."
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: report:account.account.balance:0
+#: selection:account.account.type,close_method:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,balance:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,residual:0
+#: field:account.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,balance:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+msgid "Display Account"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_payable
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Account name"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:301
+#, python-format
+msgid "There is no %s Account on the journal %s."
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Filters By"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number_closing:0
+#: field:account.cashbox.line,number_opening:0
+msgid "Number of Units"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:478
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Date / Period"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Error!\n"
+"The period is invalid. Either some periods are overlapping or the period's "
+"dates are not matching the scope of the fiscal year."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "There is nothing due with this customer."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_paid_id:0
+msgid ""
+"Set the account that will be set by default on invoice tax lines for "
+"refunds. Leave empty to use the expense account."
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Source"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the information related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,sent:0
+msgid "Sent"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,default_sale_tax:0
+#: field:account.config.settings,sale_tax:0
+msgid "Default sale tax"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1587
+#, python-format
+msgid "Cannot create moves for different companies."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment entries"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_to:0
+#: field:accounting.report,period_to:0
+#: field:accounting.report,period_to_cmp:0
+msgid "End Period"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense_view1
+msgid "Expense View"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1502
+#, python-format
+msgid " Centralisation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from:0
+#: field:account.balance.report,date_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_from:0
+#: field:account.common.account.report,date_from:0
+#: field:account.common.journal.report,date_from:0
+#: field:account.common.partner.report,date_from:0
+#: field:account.common.report,date_from:0
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_start:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.subscription,date_start:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_from:0
+#: field:accounting.report,date_from:0
+#: field:accounting.report,date_from_cmp:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:780
+#, python-format
+msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
+#, python-format
+msgid "Nothing more to reconcile"
+msgstr ""
+
+#. module: account
+#: view:cash.box.in:0
+#: model:ir.actions.act_window,name:account.action_cash_box_in
+msgid "Put Money In"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:922
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure your Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_items
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_tax_code_items
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: view:accounting.report:0
+msgid "Comparison"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1119
+#, python-format
+msgid ""
+"You cannot do this modification on a confirmed entry. You can just change "
+"some non legal fields or you must unconfirm the journal entry first.\n"
+"%s."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_budget:0
+msgid ""
+"This allows accountants to manage analytic and crossovered budgets.\n"
+"                Once the master budgets and the budgets are defined,\n"
+"                the project managers can set the planned amount on each "
+"analytic account.\n"
+"                This installs the module account_budget."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,credit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,credit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Invoice "
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1073
+#, python-format
+msgid "Start period should precede then end period."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+#: field:account.invoice.report,user_currency_price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: view:account.chart:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: field:account.config.settings,period:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: view:account.print.journal:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter:0
+#: view:accounting.report:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: model:ir.actions.act_window,name:account.action_account_period
+#: model:ir.ui.menu,name:account.menu_action_account_period
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "e.g. sales@openerp.com"
+msgstr ""
+
+#. module: account
+#: field:account.account,tax_ids:0
+#: view:account.account.template:0
+#: field:account.account.template,tax_ids:0
+#: view:account.chart.template:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
+msgid "Profit (Loss) to report"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 2 (bold)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+msgid ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.generate,date:0
+msgid "Generate Entries Before"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_to:0
+#: field:account.balance.report,date_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_to:0
+#: field:account.common.account.report,date_to:0
+#: field:account.common.journal.report,date_to:0
+#: field:account.common.partner.report,date_to:0
+#: field:account.common.report,date_to:0
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_stop:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_to:0
+#: field:accounting.report,date_to:0
+#: field:accounting.report,date_to_cmp:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
+msgstr ""
+
+#. module: account
+#: field:account.account,unrealized_gain_loss:0
+#: model:ir.actions.act_window,name:account.action_account_gain_loss
+#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
+msgid "Unrealized Gain or Loss"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid "This account will be used to value outgoing stock using sale price."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,check_total:0
+msgid "Verification Total"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: view:account.analytic.line:0
+#: field:account.invoice,amount_total:0
+#: field:report.account.sales,amount_total:0
+#: field:report.account_type.sales,amount_total:0
+#: field:report.invoice.created,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:109
+#, python-format
+msgid "Cannot %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_analytic_paid_id:0
+msgid "Refund Tax Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for Bank Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.balance.report,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,company_id:0
+#: field:account.central.journal,company_id:0
+#: field:account.common.account.report,company_id:0
+#: field:account.common.journal.report,company_id:0
+#: field:account.common.partner.report,company_id:0
+#: field:account.common.report,company_id:0
+#: field:account.config.settings,company_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
+#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.partner.balance,company_id:0
+#: field:account.partner.ledger,company_id:0
+#: field:account.period,company_id:0
+#: field:account.print.journal,company_id:0
+#: field:account.report.general.ledger,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: field:account.treasury.report,company_id:0
+#: field:account.vat.declaration,company_id:0
+#: field:accounting.report,company_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,description:0
+#: field:cash.box.in,name:0
+#: field:cash.box.out,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:56
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "Unable to change tax!"
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer. The tool search can also be used to personalise your Invoices "
+"reports and so, match this analysis to your needs."
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_followup:0
+msgid "Manage customer payment follow-ups"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1158
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+#, python-format
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,debit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,debit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 3 (bold, smaller)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a purchase journal."
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+msgid ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: help:account.move,balance:0
+msgid ""
+"This is a field only used for internal purpose and shouldn't be displayed"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:99
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid ""
+"Import of the statement in the system from a supplier or customer invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.analytic.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by Type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1546
+#, python-format
+msgid ""
+"The selected unit of measure is not compatible with the unit of measure of "
+"the product."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new tax code.\n"
+"              </p><p>\n"
+"                Depending on the country, a tax code is usually a cell to "
+"fill\n"
+"                in your legal tax statement. OpenERP allows you to define "
+"the\n"
+"                tax structure and each tax computation will be registered "
+"in\n"
+"                one or several tax code.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Select the period and the journal you want to fill.\n"
+"              </p><p>\n"
+"                This view can be used by accountants in order to quickly "
+"record\n"
+"                entries in OpenERP. If you want to record a supplier "
+"invoice,\n"
+"                start by recording the line of the expense account. OpenERP\n"
+"                will propose to you automatically the Tax related to this\n"
+"                account and the counterpart \"Account Payable\".\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Install more chart templates"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:1159
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:641
+#, python-format
+msgid ""
+"You cannot remove/deactivate an account which is set on a customer or "
+"supplier."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and accounts used for the partner."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+msgid "As soon as the reconciliation is done, the invoice can be paid."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:573
+#, python-format
+msgid "The payment term of supplier does not have a payment term line."
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_move_reconciliation.js:74
+#: code:addons/account/static/src/js/account_move_reconciliation.js:80
+#, python-format
+msgid "Never"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "Loss"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: help:account.cashbox.line,number_closing:0
+msgid "Closing Unit Numbers"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_central_journal
+#: model:ir.model,name:account.model_account_central_journal
+msgid "Account Central Journal"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,label_filter:0
+msgid ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,tax_calculation_rounding_method:0
+msgid "Round per line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual_currency:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
+msgstr ""
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index c6de0bdb2d3..13ee8dd350f 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-12-07 13:35+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
+"PO-Revision-Date: 2013-12-09 09:49+0000\n"
+"Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-08 05:45+0000\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
 "X-Generator: Launchpad (build 16869)\n"
 
 #. module: account
@@ -6626,7 +6626,7 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr "Forsiraj razdoblje"
+msgstr "Obračunski period"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
diff --git a/addons/base_vat/i18n/es_PE.po b/addons/base_vat/i18n/es_PE.po
new file mode 100644
index 00000000000..5e58e91df98
--- /dev/null
+++ b/addons/base_vat/i18n/es_PE.po
@@ -0,0 +1,80 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-12-09 17:26+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: base_vat
+#: view:res.partner:0
+msgid "Check Validity"
+msgstr ""
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:152
+#, python-format
+msgid ""
+"This VAT number does not seem to be valid.\n"
+"Note: the expected format is %s"
+msgstr "El RUC no es válido. El formato esperado es %s"
+
+#. module: base_vat
+#: field:res.company,vat_check_vies:0
+msgid "VIES VAT Check"
+msgstr ""
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:113
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_vat
+#: view:res.partner:0
+msgid "e.g. BE0477472701"
+msgstr "ej. PE20304050607"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+"Marque esta opción si la empresa está sujeta a Impuestos. Será utilizado "
+"para la declaración legal de Impuestos."
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base_vat
+#: help:res.company,vat_check_vies:0
+msgid ""
+"If checked, Partners VAT numbers will be fully validated against EU's VIES "
+"service rather than via a simple format validation (checksum)."
+msgstr ""
+"Si se marca, el RUC de la empresa se validará contra el servicio europeo "
+"VIES VAT en lugar de sólo validar el formato."
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "Sujeto a Impuestos"
diff --git a/addons/idea/i18n/ar.po b/addons/idea/i18n/ar.po
index edb360dc7b8..7f1070cee43 100644
--- a/addons/idea/i18n/ar.po
+++ b/addons/idea/i18n/ar.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-09 14:51+0000\n"
+"Last-Translator: AlSayed Gamal <gamal@3mates.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: idea
 #: view:idea.category:0
@@ -26,7 +26,7 @@ msgstr "الفئة"
 #. module: idea
 #: view:idea.idea:0
 msgid "In Progress"
-msgstr "قيد التقدم"
+msgstr "في تقدّم"
 
 #. module: idea
 #: view:idea.idea:0
@@ -41,7 +41,7 @@ msgstr "يجب ان يكون اسم التصنيف فريدًا"
 #. module: idea
 #: view:idea.idea:0
 msgid "By Idea Category"
-msgstr "عن طريق تصنيف الفكرة"
+msgstr "بتصنيف الفكرة"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
@@ -61,7 +61,7 @@ msgstr "تجميع حسب..."
 #. module: idea
 #: field:idea.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "اسم الفئة"
 
 #. module: idea
 #: view:idea.idea:0
diff --git a/addons/portal_hr_employees/i18n/pt_BR.po b/addons/portal_hr_employees/i18n/pt_BR.po
index ca2a5ba8d52..7fe0d3ccc09 100644
--- a/addons/portal_hr_employees/i18n/pt_BR.po
+++ b/addons/portal_hr_employees/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-07-18 21:06+0000\n"
-"Last-Translator: Claudio de Araujo Santos <claudioaraujosantos@gmail.com>\n"
+"PO-Revision-Date: 2013-12-09 17:01+0000\n"
+"Last-Translator: Raphaël Valyi - http://www.akretion.com <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
@@ -110,8 +110,8 @@ msgid ""
 "$('.oe_employee_picture').load(function() { if($(this).width() > "
 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
-"$ ('Oe_employee_picture.) Load (function () {if ($ (this) largura ()> $ "
-"(this) height ()) {$ (this) addClass (' oe_employee_picture_wide ')}...}).;"
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: portal_hr_employees
 #: view:hr.employee:0
diff --git a/addons/purchase/i18n/es_PE.po b/addons/purchase/i18n/es_PE.po
new file mode 100644
index 00000000000..9145e3a90d0
--- /dev/null
+++ b/addons/purchase/i18n/es_PE.po
@@ -0,0 +1,2218 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-12-09 19:19+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: purchase
+#: model:res.groups,name:purchase.group_analytic_accounting
+msgid "Analytic Accounting for Purchases"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "Monthly Purchases by Category"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to purchase a given product or a given supplier.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tel :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order of Day"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1050
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:589
+#, python-format
+msgid "You must first cancel all receptions related to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1037
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid ""
+"Margin of error for supplier lead times. When the systemgenerates Purchase "
+"Orders for procuring products,they will be scheduled that many days earlier "
+"to cope with unexpected supplier delays."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase order which are in the exception state"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0
+#: field:purchase.report,expected_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,module_warning:0
+msgid "Alerts by products or supplier"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,name:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:262
+#, python-format
+msgid "In order to delete a purchase order, you must cancel it first."
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will trigger"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved purchase orders"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,state:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,state:0
+#: view:purchase.report:0
+msgid "Status"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid "to"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: help:account.config.settings,group_analytic_account_for_purchases:0
+#: help:purchase.config.settings,group_analytic_account_for_purchases:0
+msgid "Allows you to specify an analytic account on purchase orders."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create a draft invoice.\n"
+"          </p><p>\n"
+"            Use this menu to control the invoices to be received from your\n"
+"            supplier. OpenERP generates draft invoices from your purchase\n"
+"            orders or receptions, according to your settings.\n"
+"          </p><p>\n"
+"            Once you receive a supplier invoice, you can match it with the\n"
+"            draft invoice and validate it.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1050
+#, python-format
+msgid ""
+"The product \"%s\" has been defined with your company as reseller which "
+"seems to be a configuration error!"
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+#: view:purchase.order:0
+#: view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices?"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+#: view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,default_invoice_method:0
+msgid "Default invoicing control method"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking_in
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+#: view:purchase.order:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click here to record a supplier invoice.\n"
+"                </p><p>\n"
+"                    Supplier invoices can be pre-generated based on "
+"purchase\n"
+"                    orders or receptions. This allows you to control "
+"invoices\n"
+"                    you receive from your supplier according to the draft\n"
+"                    document in OpenERP.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer. Otherwise, keep empty to deliver to your own company."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"<p>\n"
+"                Here you can track all the lines of purchase orders where "
+"the\n"
+"                invoicing is \"Based on Purchase Order Lines\", and for "
+"which you\n"
+"                have not received a supplier invoice yet. You can generate "
+"a\n"
+"                draft supplier invoice based on the lines from this list.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase orders that include lines not invoiced."
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+msgid "Incoming  Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid ""
+"Reference of the sales order or quotation sent by your supplier. It's mainly "
+"used to do the matching when you receive the products as this reference is "
+"usually written on the delivery order sent by your supplier."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.settings:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "or"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Customer Address"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "RFQ Sent"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,partner_id:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:527
+#, python-format
+msgid "Define expense account for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase order which are in draft state"
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid "To Purchase"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that will be converted into a "
+"purchase order. \n"
+"              </p><p>\n"
+"                Use this menu to search within your purchase orders by\n"
+"                references, supplier, products, etc. For each purchase "
+"order,\n"
+"                you can track the related discussion with the supplier, "
+"control\n"
+"                the products received and control the supplier invoices.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoices and Receptions"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
+#, python-format
+msgid "Define expense account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:581
+#: code:addons/purchase/purchase.py:588
+#, python-format
+msgid "Unable to cancel this purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"Unique number of the purchase order, computed automatically when the "
+"purchase order is created."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+#: field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Draft PO"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:967
+#: code:addons/purchase/purchase.py:982
+#: code:addons/purchase/purchase.py:986
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: view:purchase.order:0
+#: field:purchase.order,date_order:0
+#: field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,group_uom:0
+msgid "Manage different units of measure for products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
+msgid "On Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr "Impuestos"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1182
+#, python-format
+msgid "Draft Purchase Order created"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Product Categories"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,notes:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:48
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
+msgid "Address Book"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders?"
+msgstr ""
+
+#. module: purchase
+#: field:account.config.settings,module_purchase_analytic_plans:0
+msgid "Use multiple analytic accounts on orders"
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid "will be created in order to subcontract the job"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config
+#: view:res.partner:0
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.settings:0
+msgid "Supplier Features"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.config.settings:0
+#: view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order of Month"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+#: field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid "a draft purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order of Year"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+msgid "RFQs and Purchases"
+msgstr ""
+
+#. module: purchase
+#: field:account.config.settings,group_analytic_account_for_purchases:0
+#: field:purchase.config.settings,group_analytic_account_for_purchases:0
+msgid "Analytic accounting for purchases"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.config.settings,group_purchase_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of Supplier.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:458
+#, python-format
+msgid "You cannot confirm a purchase order without any purchase order line."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+#: field:stock.picking.in,warehouse_id:0
+msgid "Destination Warehouse"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:967
+#, python-format
+msgid ""
+"Selected Unit of Measure does not belong to the same category as the product "
+"Unit of Measure."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,group_purchase_pricelist:0
+msgid "Manage pricelist per supplier"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "Purchase Dashboard"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:582
+#, python-format
+msgid "First cancel all receptions related to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Order"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: view:purchase.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid ""
+"Reference of the document that generated this purchase order request; a "
+"sales order or an internal procurement request."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Notes"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,module_purchase_requisition:0
+msgid "Manage purchase requisitions"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+msgid "Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Terms and conditions..."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:262
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0
+#: view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase orders which are in exception state"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Source"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.config.settings,default_invoice_method:0
+msgid "Pre-generate draft invoices based on purchase orders"
+msgstr ""
+
+#. module: purchase
+#: help:product.template,purchase_ok:0
+msgid "Specify if the product can be selected in a purchase order line."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+"La factura se crea de forma automática si el control de factura del pedido "
+"de compra es 'Desde Guías'. La factura también puede ser generada "
+"manualmente por el contable (control de factura = Manual)."
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid ""
+"to buy the required quantities to the supplier.\n"
+"                        The delivery order will be ready after having "
+"received the\n"
+"                        products."
+msgstr ""
+
+#. module: purchase
+#: view:product.product:0
+msgid ""
+"a draft\n"
+"                        purchase order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:322
+#, python-format
+msgid "Please create Invoices."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new incoming shipment.\n"
+"              </p><p> \n"
+"                Here you can track all the product receptions of purchase\n"
+"                orders where the invoicing is \"Based on Incoming "
+"Shipments\",\n"
+"                and for which you have not received a supplier invoice yet.\n"
+"                You can generate a supplier invoice based on those "
+"receptions.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Receive Invoice"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Receive Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_config_settings
+msgid "purchase.config.settings"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_pricelist_version_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a pricelist version.\n"
+"              </p><p>\n"
+"                There can be more than one version of a pricelist, each of\n"
+"                these must be valid during a certain period of time. Some\n"
+"                examples of versions: Main Prices, 2010, 2011, Summer "
+"Sales,\n"
+"                etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1167
+#, python-format
+msgid "PO: %s"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:517
+#, python-format
+msgid "Define purchase journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Order "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
+#: view:purchase.config.settings:0
+msgid "Configure Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+msgid "On Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of incoming shipments that have been generated for this "
+"purchase order."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,module_purchase_double_validation:0
+msgid "Force two levels of approvals"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
+msgid "Price Types"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0
+#: selection:purchase.report,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a request for quotation.\n"
+"              </p><p>\n"
+"                The quotation contains the history of the "
+"discussion/negociation\n"
+"                you had with your supplier. Once confirmed, a request for\n"
+"                quotation is converted into a purchase order.\n"
+"              </p><p>\n"
+"                Most propositions of purchase orders are created "
+"automatically\n"
+"                by OpenERP based on inventory needs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:80
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.order:0
+#: view:purchase.report:0
+#: view:res.partner:0
+#, python-format
+msgid "Purchase Orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,module_purchase_analytic_plans:0
+msgid "Use multiple analytic accounts on purchase orders"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,create_uid:0
+#: view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.settings,group_costing_method:0
+msgid "Compute product cost price based on average cost"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
+#: view:res.partner:0
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0
+#: view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TIN :"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' status is set automatically when purchase order in draft "
+"status.                                        \n"
+"* The 'Confirmed' status is set automatically as confirm when purchase order "
+"in confirm status.                                        \n"
+"* The 'Done' status is set automatically when purchase order is set as done. "
+"                                       \n"
+"* The 'Cancelled' status is set automatically when user cancel purchase "
+"order."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoice Received"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: model:res.groups,name:purchase.group_purchase_manager
+msgid "Manager"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Based on Purchase Order lines"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: purchase
+#: help:account.config.settings,module_purchase_analytic_plans:0
+#: help:purchase.config.settings,module_purchase_analytic_plans:0
+msgid ""
+"Allows the user to maintain several analysis plans. These let you split "
+"lines on a purchase order between several accounts and analytic plans.\n"
+"                This installs the module purchase_analytic_plans."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+#: view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Customer Address (Direct Delivery)"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.client,name:purchase.action_client_purchase_menu
+msgid "Open Purchase Menu"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1054
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,company_id:0
+#: field:purchase.order.line,company_id:0
+#: view:purchase.report:0
+#: field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Based on generated draft invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0
+#: view:purchase.config.settings:0
+#: view:purchase.order:0
+#: selection:purchase.order,state:0
+#: field:res.partner,purchase_order_ids:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+#: field:stock.picking.in,purchase_id:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:322
+#: code:addons/purchase/purchase.py:458
+#: code:addons/purchase/purchase.py:516
+#: code:addons/purchase/purchase.py:527
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr "Sub-Total"
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The status of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' status. Then the order has to be confirmed by "
+"the user, the status switch to 'Confirmed'. Then the supplier must confirm "
+"the order to change the status to 'Approved'. When the purchase order is "
+"paid and received, the status becomes 'Done'. If a cancel action occurs in "
+"the invoice or in the reception of goods, the status becomes in exception."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase
+#: field:res.partner,purchase_order_count:0
+msgid "# of Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Resend Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.config.settings,default_invoice_method:0
+msgid "Based on receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+"Una Guía genera una factura de proveedor. Según el control de facturación "
+"del pedido de compra, la factura se basa en las cantidades recibidas o las "
+"pedidas."
+
+#. module: purchase
+#: field:purchase.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.config.settings,module_purchase_requisition:0
+msgid ""
+"Purchase Requisitions are used when you want to request quotations from "
+"several suppliers for a given set of products.\n"
+"            You can configure per product if you directly do a Request for "
+"Quotation\n"
+"            to one supplier or if you want a purchase requisition to "
+"negotiate with several suppliers."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: model:email.template,report_name:purchase.email_template_edi_purchase
+msgid "RFQ_${(object.name or '').replace('/','_')}"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:982
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.config.settings,module_purchase_double_validation:0
+msgid ""
+"Provide a double validation mechanism for purchases exceeding minimum "
+"amount.\n"
+"                This installs the module purchase_double_validation."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/edi/purchase_order.py:132
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,product_uom:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Incoming Shipments & Invoices"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+#: field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: purchase
+#: model:res.groups,name:purchase.group_purchase_user
+msgid "User"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
+"Based on P.O. lines' from where you can selectively create an invoice.\n"
+"Based on generated invoice: create a draft invoice you can validate later.\n"
+"Bases on incoming shipments: let you create an invoice when receptions are "
+"validated."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
+msgid "Partner Categories"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.settings:0
+msgid "Invoicing Settings"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Based on incoming shipments"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:1044
+#, python-format
+msgid "No default supplier defined for this product"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:986
+#, python-format
+msgid ""
+"The selected supplier has a minimal quantity set to %s %s, you should not "
+"purchase less."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_invoice_pending
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "On Draft Invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_pricelist_version_action
+msgid "Pricelist Versions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase orders which are in draft state"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.config.settings,default_invoice_method:0
+msgid "Based on purchase order lines"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    This supplier has no purchase order. Click to create a "
+"new RfQ.\n"
+"                </p><p>\n"
+"                    The request for quotation is the first step of the "
+"purchases flow. Once\n"
+"                    converted into a purchase order, you will be able to "
+"control the reception\n"
+"                    of the products and the supplier invoice.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr ""
diff --git a/addons/purchase_analytic_plans/i18n/es_PE.po b/addons/purchase_analytic_plans/i18n/es_PE.po
new file mode 100644
index 00000000000..ff775c9940f
--- /dev/null
+++ b/addons/purchase_analytic_plans/i18n/es_PE.po
@@ -0,0 +1,33 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 17:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: purchase_analytic_plans
+#: field:purchase.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
diff --git a/addons/purchase_double_validation/i18n/es_PE.po b/addons/purchase_double_validation/i18n/es_PE.po
new file mode 100644
index 00000000000..989c81f179e
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/es_PE.po
@@ -0,0 +1,49 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 18:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
+msgid "purchase.config.settings"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.order:0
+msgid "Purchase orders which are not approved yet."
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.config.settings,limit_amount:0
+msgid "limit to require a second approval"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
+msgid "Purchase Orders Waiting Approval"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.config.settings,limit_amount:0
+msgid "Amount after which validation of purchase is required."
+msgstr ""
diff --git a/addons/sale/i18n/es_PE.po b/addons/sale/i18n/es_PE.po
new file mode 100644
index 00000000000..c0beaf1f50c
--- /dev/null
+++ b/addons/sale/i18n/es_PE.po
@@ -0,0 +1,2172 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-12-09 18:08+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the status of the quotation or sales order.              \n"
+"The exception status is automatically set when a cancel operation occurs     "
+"          in the invoice validation (Invoice Exception) or in the picking "
+"list process (Shipping Exception).\n"
+"The 'Waiting Schedule' status is set when the invoice is confirmed           "
+"    but waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:444
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:764
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice.py:55
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:307
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:598
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "RUC:"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:308
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:781
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:505
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation sent"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Permite categorizar las ventas y entregas (guías) entre los diferentes "
+"diarios, y realizar tareas en lote en los mismos.\n"
+"Esto instala el módulo 'sale_journal'."
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:960
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:97
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:942
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:564
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Cant."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:952
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_quotations
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sales order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "You cannot create invoice when sales order is not confirmed."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Terms and conditions..."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#: code:addons/sale/sale.py:820
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Cancel Quotation"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:185
+#, python-format
+msgid "There is no default shop for the current user's company!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: model:ir.model,name:sale.model_account_invoice
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"On demand: A draft invoice can be created from the sales order when needed. "
+"\n"
+"On delivery order: A draft invoice can be created from the delivery order "
+"when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be "
+"paid before the products can be delivered."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o una guía tan pronto como sea "
+"confirmado por el comercial."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:565
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Cancel Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:185
+#: code:addons/sale/sale.py:363
+#: code:addons/sale/sale.py:504
+#: code:addons/sale/sale.py:598
+#: code:addons/sale/sale.py:763
+#: code:addons/sale/sale.py:780
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Sub-Total"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:364
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:287
+#: code:addons/sale/sale.py:584
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:820
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:55
+#, python-format
+msgid "You shouldn't manually invoice the following sale order %s"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:944
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Adelanto"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index dd00aa5ff0a..016d384fda6 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-12 10:22+0000\n"
+"PO-Revision-Date: 2013-12-09 15:51+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:33+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: sale
 #: field:sale.config.settings,module_warning:0
@@ -32,7 +32,7 @@ msgstr "A partner akihez a szóban forgó terméket tulajdonítani kell."
 msgid "Trigger delivery orders automatically from sales orders"
 msgstr ""
 "Kiszállítási Kiszolgáltatási jegy automatikus létrehozás elindítása a "
-"megrendelésekből"
+"vásárlói megrendelésekből"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -89,8 +89,8 @@ msgid ""
 "To allow your salesman to make invoices for sales order lines using the menu "
 "'Lines to Invoice'."
 msgstr ""
-"Lehetővé teszi az értékesítők részére a megrendelések soraira történő "
-"számlázást a 'Számlázandó sorok' menü használatával."
+"Lehetővé teszi az értékesítők részére a vásárlói megrendelések soraira "
+"történő számlázást a 'Számlázandó sorok' menü használatával."
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -116,7 +116,7 @@ msgstr "Értékesítő"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr "A jelenlegi értékesítési megbízás árlistája."
+msgstr "A jelenlegi vevői megrendelés árlistája."
 
 #. module: sale
 #: view:sale.report:0
@@ -145,7 +145,8 @@ msgstr "Az előleg mennyiség értékének pozitívnak kell lennie"
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sales order line."
-msgstr "Lehetővé teszi a megrendelés soraihoz árengedmény alkalmazását"
+msgstr ""
+"Lehetővé teszi a megrendelés egyes soraihoz árengedmény alkalmazását."
 
 #. module: sale
 #: help:sale.order,message_unread:0
@@ -172,7 +173,7 @@ msgid ""
 "The 'Waiting Schedule' status is set when the invoice is confirmed           "
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
-"Az árajánlatkérés vagy a megrendelés állapotát adja.              \n"
+"Az árajánlatkérés vagy a vásárlói megrendelés állapotát adja.              \n"
 "A kizárás állapot automatikusan beállított egy visszavonás művelet "
 "elvégzésekkor               egy számla érvényesítésekor (Számla kizárás) "
 "vagy a kiválogatási lista műveletekben (Szállítási kizárás).\n"
@@ -227,7 +228,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Invoice the whole sales order"
-msgstr "Számlázza ki a teljes megrendelést"
+msgstr "Számlázza ki a teljes vásárlói megrendelést"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -265,7 +266,7 @@ msgstr "Összérték"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sales order lines"
-msgstr "Számla létrehozása a megrendelési téetelsorokra"
+msgstr "Számla létrehozása a vevői megrendelési téetelsorokra"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -321,7 +322,7 @@ msgstr "Számlázási folyamatok"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr "Megrendelés elvégezve"
+msgstr "Vevői megrendelés elvégezve"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -373,7 +374,7 @@ msgstr "Üzlet neve"
 #: code:addons/sale/sale.py:598
 #, python-format
 msgid "You cannot confirm a sales order which has no line."
-msgstr "Nem tud megerősíteni tétel nélküli értékesítési megbízást"
+msgstr "Nem tud megerősíteni tétel nélküli vevői megrendelést"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -390,8 +391,8 @@ msgid ""
 "            "
 msgstr ""
 "<p>\n"
-"                Ez itt a lista a már kiszámlázott megrendelési tételekről. "
-"Tud\n"
+"                Ez itt a lista a már kiszámlázott vevői megrendelési "
+"tételekről. Tud\n"
 "                számlázni megrendelési részt, a megrendelés tételeivel. "
 "Nincs\n"
 "                szüksége erre a listára, ha kiszállítási Kiszolgáltatási "
@@ -435,12 +436,12 @@ msgstr "Augusztus"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr "Értékesítési megbízási statisztikák"
+msgstr "Vevői megrendelési statisztikák"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr "Az értékesítési megbízáshoz kapcsolódó analitikus/elemző számla."
+msgstr "A vevői megrendeléshez kapcsolódó analitikus/elemző számla."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -462,7 +463,7 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"              Kattintson megrendelésre átalakítható árajánlat "
+"              Kattintson vásárlói megrendelésre átalakítható árajánlat "
 "létrehozásához.\n"
 "              </p><p>\n"
 "                 OpenERP segít a hatékony értékesítési folyamat hatékony "
@@ -480,9 +481,9 @@ msgid ""
 "                    or a fixed price (for advances) directly from the sales "
 "order form if you prefer."
 msgstr ""
-"Ezen a megrendelésen minden tétel sor számlázva lesz. Lehetősége van a "
-"megrendelés egy bizonyos százalékának számlázására\n"
-"                    vagy fix ár (az előlegekre), ah kívánja direkt a "
+"Ezen a vásárlói megrendelésen minden tétel sor számlázva lesz. Lehetősége "
+"van a megrendelés egy bizonyos százalékának számlázására\n"
+"                    vagy fix ár (az előlegekre), ha kívánja direkt a "
 "megrendelés űrlapról."
 
 #. module: sale
@@ -520,7 +521,7 @@ msgstr "Mennyiség"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr "Szállítási cím a jelenlegi megrendeléshez."
+msgstr "Szállítási cím a jelenlegi vásárlói megrendeléshez."
 
 #. module: sale
 #: report:sale.order:0
@@ -530,7 +531,7 @@ msgstr "ÁFA:"
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sales order lines"
-msgstr "Megrendelés sorai számlázásának engedélyezése"
+msgstr "Vásárlói megrendelés sorai számlázásának engedélyezése"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -597,7 +598,7 @@ msgstr "Tel. :"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr "Az aktuális megrendelés számlázási címe."
+msgstr "Az aktuális vevői megrendelés számlázási címe."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
@@ -714,7 +715,8 @@ msgstr "Számlázási cím"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Megrendelés sorok melyek összefüggenk az én megrendeléseimmel"
+msgstr ""
+"Megrendelés sorok melyek összefüggenek az én vásárlói megrendeléseimmel"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -923,8 +925,8 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                Kattintson ehhez a vevőhöz tartozó árajánlat vagy "
-"értékesítési megbízás létrehozásához.\n"
+"                Kattintson ehhez a vevőhöz tartozó árajánlat vagy vevői "
+"megrendelés létrehozásához.\n"
 "              </p><p>\n"
 "                 OpenERP segít az értékesítési folyamat hatékony "
 "kezelésében:\n"
@@ -959,7 +961,7 @@ msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
 "                Kattintson új értékesítési hely meghatározáshoz.\n"
 "              </p><p>\n"
-"                Mindegyik árajánlatot vagy értékesítési megbízást össze kell "
+"                Mindegyik árajánlatot vagy vevői megrendelést össze kell "
 "kötni egy értékesítési helyhez. Az\n"
 "                értékesítési hely meghatároz egy raktárhelyet ahonnan a "
 "termék\n"
@@ -1038,9 +1040,9 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
-"Ez egy olyan számlalista, amely ehhez az értékesítési megbízáshoz jött "
-"létre. Ugyanaz az értékesítési megbízás több alkalommal is számlázásra "
-"kerülhetett (például tételek alapján)."
+"Ez egy olyan számlalista, amely ehhez a vevői megrendeléshez jött létre. "
+"Ugyanaz a vevői megrendelés több alkalommal is számlázásra kerülhetett "
+"(például tételek alapján)."
 
 #. module: sale
 #: report:sale.order:0
@@ -1055,7 +1057,7 @@ msgstr "Menny."
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr "Az én értékesítési megbízásam tételei"
+msgstr "Az én vevői megrendekléseim tételei"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -1153,10 +1155,10 @@ msgstr ""
 "                a megrendelés visszaigazolásában, a szállításban,\n"
 "                a számlázásban és az áru ellenértékének beszedésében.\n"
 "              </p><p>\n"
-"                A társadalmi jellemzők segítenek az értékesítések "
+"                A társadalmi jellemzők segítenek a vevői megrendelések "
 "megbeszélésének szervezésében,\n"
-"                és lehetővé teszik a megrendeléseken a vásárlói fejlődésének "
-"követését.\n"
+"                és lehetővé teszik a megrendeléseken a vásárlói "
+"megrendelések fejlődésénak követését.\n"
 "              </p>\n"
 "            "
 
@@ -1319,7 +1321,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr "Az értékesítési megbízás létrehozásának dátuma."
+msgstr "Vásárlói megrendelés létrehozásának dátuma."
 
 #. module: sale
 #: view:sale.order:0
@@ -1368,8 +1370,8 @@ msgid ""
 "if you want your invoice based on ordered "
 msgstr ""
 "A megrendelés automatikusan létre lesz hozva a díjbekérő / előleg (Számla "
-"terv) alapján.                                              Választhatja, ha "
-"akarja a számlázást a megrendelés alapján "
+"terv) alapján.                                              Ki kell "
+"választania, ha a számlázást a megrendelés alapján kívánja "
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1382,7 +1384,7 @@ msgstr "Számlák készítése"
 msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
 "Lehetővé teszi az analitikus/elemző könyvelés gyűjtőkód meghatározását a "
-"megrendeléseken."
+"vevői megrendeléseken."
 
 #. module: sale
 #: view:sale.order:0
@@ -1444,7 +1446,7 @@ msgstr "Ellenőrizendő a könyvelő által."
 #. module: sale
 #: view:sale.order:0
 msgid "My Sales Orders"
-msgstr "Az én megrendeléseim"
+msgstr "Az én vevői megrendeléseim"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1483,15 +1485,15 @@ msgid ""
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
 msgstr ""
-"Az értékesítő manuálisan létrehoz egy számlát, hogy ha az értékesítési "
-"megbízás szállítási szabálya: \"Szállítás és manuális vezérléssel "
-"folyamatban\". A számla automatikusan létrejön , ha a szállítási szabály: "
-"\"Fizetés kiszállítás előtt\"."
+"Az értékesítő kézzel hoz létre egy számlát, hogy ha a vevői megrendelés "
+"szállítási szabálya: \"Szállítás és manuális vezérléssel folyamatban\". A "
+"számla automatikusan létrejön , ha a szállítási szabály: \"Fizetés "
+"kiszállítás előtt\"."
 
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sales order lines"
-msgstr "Engedélyezi a megrendelés tételeire az árengedmény beállítását"
+msgstr "Engedélyezi a vevői megrendelés tételeire az árengedmény beállítását"
 
 #. module: sale
 #: field:sale.order,paypal_url:0
@@ -1516,8 +1518,8 @@ msgstr ""
 msgid ""
 "In order to delete a confirmed sales order, you must cancel it before !"
 msgstr ""
-"Ahhoz, hogy törölni tudjon egy megerősített megrendelést, először vissza "
-"kell vonnia azt !"
+"Ahhoz, hogy törölni tudjon egy megerősített vsárlói megrendelést, először "
+"vissza kell vonnia azt !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.open_board_sales
@@ -1537,7 +1539,7 @@ msgid ""
 "between the Unit Price and Cost Price.\n"
 "                This installs the module sale_margin."
 msgstr ""
-"Ez hozzáadja az 'Árrés' -t a megrendelésre.\n"
+"Ez hozzáadja az 'Árrés' -t a vevői megrendelésre.\n"
 "                Jövedelmezőséget ad az egységár és a költség ár "
 "különbözetéből.\n"
 "                Ez a sale_margin modult telepíti."
@@ -1579,7 +1581,7 @@ msgstr "Teendő"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sales Order"
-msgstr "Megrendelés számlázás"
+msgstr "Vevői megrendelés számlázás"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1784,12 +1786,12 @@ msgid ""
 "Before delivery: A draft invoice is created from the sales order and must be "
 "paid before the products can be delivered."
 msgstr ""
-"Igényléskori: Egy terv/előleg számla hozható létre a megrendelésből, ha "
-"szükséges. \n"
+"Igényléskori: Egy terv/előleg számla hozható létre a vevői megrendelésből, "
+"ha szükséges. \n"
 "A kézbesítési bizonylatkor: Egy terv/előleg számla hozható létre a "
-"kézbesítési bizonylatra ha az árut szállításba adták. \n"
-"Szállítás előtt: Egy terv/előleg számla hozható létre a megrendelésből és ki "
-"kell egyenlíteni mielőtt az árut kiszállítanák."
+"kézbesítési bizonylatra, ha az árut szállításba adták. \n"
+"Szállítás előtt: Egy terv/előleg számla hozható létre a vevői megrendelésből "
+"és ki kell egyenlíteni mielőtt az árut kiszállítanák."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -1836,7 +1838,7 @@ msgstr "Értékesítés megerősítés"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr "Értékesítési megbízásból"
+msgstr "Vevői megrendelésből"
 
 #. module: sale
 #: view:sale.order:0
@@ -1851,10 +1853,10 @@ msgid ""
 "generates an invoice or a delivery order as soon as it is confirmed by the "
 "salesman."
 msgstr ""
-"Az értékesítési megbízás számlázási beállításaitól függően a számla "
-"alapulhat a kiszállítási vagy a megrendelési mennyiségen. A rendszer az "
-"értékesítési megbízásból létrehozhat egy számlát vagy egy kiszállítási "
-"megbízást, amint az értékesítő megerősíti azt."
+"A vevői megrendelés számlázási beállításaitól függően a számla alapulhat a "
+"kiszállítási vagy a megrendelési mennyiségen. A rendszer a vevői "
+"megrendelésből létrehozhat egy számlát vagy egy kiszállítási megbízást, "
+"amint az értékesítő megerősíti azt."
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -1901,7 +1903,7 @@ msgstr "Értékesítési műszerfal"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr "'Elvégzett' állapotú megrendelési sorok"
+msgstr "'Elvégzett' állapotú vevői megrendelési sorok"
 
 #. module: sale
 #: help:sale.config.settings,module_account_analytic_analysis:0
@@ -1938,13 +1940,14 @@ msgstr ""
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr "Az értékesítési megbízás megerősítésének dátuma."
+msgstr "A vevői megrendelés megerősítésének dátuma."
 
 #. module: sale
 #: code:addons/sale/sale.py:565
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
-msgstr "Először vonja vissza a megrendelés összes számla mellékletét."
+msgstr ""
+"Először vonja vissza a vevői megrendeléshez kötött összes számla mellékletet."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -2133,7 +2136,7 @@ msgstr "Számla tételek"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr "Értékesítési megbízási tételek"
+msgstr "Vevői megrendelési tételek"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -2164,7 +2167,7 @@ msgstr "Referencia mértékegység"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales order lines done"
-msgstr "Megrendelési tételek elvégezve"
+msgstr "Vevői megrendelési tételek elvégezve"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:107
@@ -2175,11 +2178,10 @@ msgid ""
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Nem készíthet számlát ehhez az értékesítési megbízási tételhez, az alábbi "
-"okok egyike miatt:\n"
-"1. Az értékesítési megbízás tételének állapota: \"Tervezet\" vagy "
-"\"Mégsem\".\n"
-"2.  Az értékesítési megbízás tétel már kiszámlázásra került."
+"Nem készíthet számlát ehhez a vásárlói megrendelés tételhez, az alábbi okok "
+"egyike miatt:\n"
+"1. A vevői megrendelés tételének állapota: \"Tervezet\" vagy \"Mégsem\".\n"
+"2. A vevői megrendelési tétel már kiszámlázásra került."
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -2255,7 +2257,7 @@ msgid ""
 "Sales Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
-"Értékesítési megbízási tételek, melyek megerősítettek, elvégzettek vagy "
+"Vásárlói megrendelési tételek, melyek megerősítettek, elvégzettek vagy "
 "kifogásolt állapotúak és még nincs számlázva"
 
 #. module: sale
@@ -2272,7 +2274,8 @@ msgstr "Előlegtermék"
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"A megrendelés sorrendet adja ha a megrendelési sorok listáját jelzi ki."
+"A vásárlói megrendelés sorrendet adja ha a megrendelési sorok listáját jelzi "
+"ki."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2282,7 +2285,7 @@ msgstr "Január"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_in_progress
 msgid "Sales Order in Progress"
-msgstr "Értékesítési megbízás folyamatban"
+msgstr "Folyamatban lévő vevői megrendelés"
 
 #. module: sale
 #: field:sale.config.settings,timesheet:0
@@ -2293,7 +2296,7 @@ msgstr "Az időkimutatások alapján készítsen elő számlát"
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
-"A dokumentum hivatkozása, amely létrehozta ezt az értékesítési megbízási "
+"A dokumentum hivatkozása, amely létrehozta ezt a vásárlói megrendelési "
 "igényt."
 
 #. module: sale
@@ -2325,7 +2328,7 @@ msgstr "Megerősített vásárlói megrendelés, amely számlázható."
 #. module: sale
 #: model:mail.message.subtype,name:sale.mt_order_confirmed
 msgid "Sales Order Confirmed"
-msgstr "Megrendelés visszaigazolva"
+msgstr "Vásárlói megrendelés visszaigazolva"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -2341,7 +2344,7 @@ msgstr "Nincs árlista ! : "
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order "
-msgstr "Megrendelés "
+msgstr "Vásárlói megrendelés "
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
@@ -2412,7 +2415,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr "Értékesítési megbízás keresése"
+msgstr "Vásárlói megrendelés keresése"
 
 #. module: sale
 #: field:sale.advance.payment.inv,advance_payment_method:0
@@ -2422,7 +2425,8 @@ msgstr "Mit szeretne számlázni?"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Confirmed sales order lines, not yet delivered"
-msgstr "Megerősített megrendelési tételek, amiket még nem szállítottak ki"
+msgstr ""
+"Megerősített vásárlói megrendelési tételek, melyeket még nem szállítottak ki"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
@@ -2449,8 +2453,8 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
-"Ez a jelentés elemzést készít az árajánlatairól és az értékesítési "
-"megbízásairól. Az elemzés kimutatja az értékesítési bevételeit, és "
+"Ez a jelentés elemzést készít az árajánlatairól és a vásárlói "
+"megrendelésekről. Az elemzés kimutatja az értékesítés bevételeit, és "
 "szétosztja különböző kritériumok alapján (értékesítő, partner, termék stb.). "
 "Használja ezt a jelentést, ha elemzést szeretne készíteni a még ki nem "
 "számlázott értékesítéseiről. Ha a forgalmát szeretné elemezni, akkor "
diff --git a/addons/sale_journal/i18n/es_PE.po b/addons/sale_journal/i18n/es_PE.po
new file mode 100644
index 00000000000..1b9a0ae0a65
--- /dev/null
+++ b/addons/sale_journal/i18n/es_PE.po
@@ -0,0 +1,139 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-09 18:40+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Type"
+msgstr ""
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid ""
+"This invoicing type will be used, by default, to invoice the current partner."
+msgstr ""
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking_in
+msgid "Incoming Shipments"
+msgstr "Entregas a Recibir"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Guía"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"Los tipos de facturas son utilizados por las Empresas, Pedidos de Venta y "
+"Órdenes de Entrega. Puede crear un diario de facturación específico para "
+"agrupar su facturación en función de las necesidades de sus clientes: "
+"diaria, cada miércoles, mensual, etc."
+
+#. module: sale_journal
+#: help:sale.order,invoice_type_id:0
+msgid "Generate invoice based on the selected option."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale.order:0
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_type_id:0
+#: view:stock.picking.in:0
+#: field:stock.picking.in,invoice_type_id:0
+#: view:stock.picking.out:0
+#: field:stock.picking.out,invoice_type_id:0
+msgid "Invoice Type"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr ""
diff --git a/addons/sale_order_dates/i18n/es_PE.po b/addons/sale_order_dates/i18n/es_PE.po
new file mode 100644
index 00000000000..0e1a25c273a
--- /dev/null
+++ b/addons/sale_order_dates/i18n/es_PE.po
@@ -0,0 +1,58 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-09 18:32+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: sale_order_dates
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Fecha Prometida"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Fecha en que la Guía fue creada."
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date requested by the customer for the sale."
+msgstr ""
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr ""
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Committed date for delivery."
+msgstr ""
diff --git a/addons/sale_stock/i18n/es_PE.po b/addons/sale_stock/i18n/es_PE.po
new file mode 100644
index 00000000000..d97dba2dcaa
--- /dev/null
+++ b/addons/sale_stock/i18n/es_PE.po
@@ -0,0 +1,616 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-09 18:27+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "Entregas a facturar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:570
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Información de la Guía! "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Guía"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:565
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:209
+#, python-format
+msgid ""
+"You must first cancel all delivery order(s) attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:163
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:572
+#: code:addons/sale_stock/sale_stock.py:623
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.actions.act_window,name:sale_stock.res_partner_rule_children
+msgid "Contact Details"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Facturar desde entregas"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"El Guía se crea tan pronto como se confirma el pedido de venta, a la vez que "
+"la orden de abastecimiento. Representa la asignación de los componentes del "
+"pedido de venta. Hay una Guía por línea del pedido de venta que evoluciona "
+"según la disponibilidad de los componentes."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Guía"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"If the sale order was set to create the invoice 'On Delivery Order', then an "
+"invoice is automatically created based on what you delivered. If you rather "
+"want to create your invoice based on your sale order, you can set the sale "
+"order to create invoice 'On Demand', then track and process the sales order "
+"that have been fully delivered and invoice them from there."
+msgstr ""
+"Si el pedido de venta se estableció para crear la factura \"Basado en la "
+"entrega\", entonces se crea una factura automáticamente basada en lo que se "
+"envíe. Si prefiere crear la factura basada en el pedido de venta, puede "
+"establecer el pedido de venta para crear la factura \"Bajo demanda\", "
+"entonces siga el rastro y procese los pedidos de venta que han sido "
+"completamente enviados y factúrelos desde allí."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:265
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"International Commercial Terms are a series of predefined commercial terms "
+"used in international transactions."
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sales orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"Pick 'Deliver each product when available' if you allow partial delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:208
+#, python-format
+msgid "Cannot cancel sales order!"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Tiendas"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"Margin of error for dates promised to customers. Products will be scheduled "
+"for procurement and delivery that many days earlier than the actual promised "
+"date, to cope with unexpected delays in the supply chain."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:618
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation and the shipping of the "
+"products to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:163
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+"Para borrar un pedido de venta confirmado, debe cancelarlo.\n"
+"Para hacerlo, debe cancelar primero las guías relacionadas para sus órdenes "
+"de entrega."
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:523
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:561
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:522
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Guía relacionada"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:614
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crear Guía"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/stock/i18n/es_PE.po b/addons/stock/i18n/es_PE.po
new file mode 100644
index 00000000000..465024862b5
--- /dev/null
+++ b/addons/stock/i18n/es_PE.po
@@ -0,0 +1,4801 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-12-09 19:32+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:28+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: stock
+#: field:stock.inventory.line.split,line_exist_ids:0
+#: field:stock.inventory.line.split,line_ids:0
+#: view:stock.move.split:0
+#: field:stock.move.split,line_exist_ids:0
+#: field:stock.move.split,line_ids:0
+msgid "Serial Numbers"
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_product_variant:0
+msgid ""
+"Allow to manage several variants per product. As an example, if you  sell T-"
+"Shirts, for the same \"Linux T-Shirt\", you may have variants on  sizes or "
+"colors; S, M, L, XL, XXL."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Stock move Split lines"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. This is the default "
+"value for all products in this category. It can also directly be set on each "
+"product"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Confirm & Deliver"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
+#: view:stock.change.product.qty:0
+msgid "Update Product Quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+msgid "Put in a new pack"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+#, python-format
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_line_date
+#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
+msgid "Last Product Inventories"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Orders processed Today or planned for Today"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move.line:0
+#: view:stock.partial.picking:0
+#: field:stock.partial.picking,move_ids:0
+#: view:stock.partial.picking.line:0
+#: view:stock.return.picking.memory:0
+msgid "Product Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2524
+#: code:addons/stock/stock.py:2585
+#, python-format
+msgid "Please provide proper quantity."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
+#, python-format
+msgid "You cannot perform this operation on more than one Stock Inventories."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
+#, python-format
+msgid "Quantity cannot be negative."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+msgid "Picking list"
+msgstr "Guía"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "e.g. Annual inventory"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:report.stock.inventory,product_qty:0
+#: field:report.stock.move,product_qty:0
+#: field:stock.inventory.line,product_qty:0
+#: field:stock.inventory.line.split,qty:0
+#: field:stock.inventory.line.split.lines,quantity:0
+#: report:stock.inventory.move:0
+#: field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0
+#: field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0
+#: field:stock.move.split.lines,quantity:0
+#: field:stock.partial.move.line,quantity:0
+#: field:stock.partial.picking.line,quantity:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0
+#: field:stock.report.tracklots,name:0
+#: field:stock.return.picking.memory,quantity:0
+#: field:stock.split.into,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,day:0
+msgid "Day"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location.product,type:0
+msgid "Analyse a Period"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
+msgid "Stock journal"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:223
+#, python-format
+msgid "Unable to assign all lots to this move!"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,partner_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.server,name:stock.action_partial_move_server
+msgid "Deliver/Receive Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:134
+#, python-format
+msgid "You cannot delete any record!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_standard_price.py:107
+#, python-format
+msgid "Active ID is not set in Context."
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+#: selection:stock.picking.in,invoice_state:0
+#: selection:stock.picking.out,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,message_unread:0
+#: help:stock.picking.in,message_unread:0
+#: help:stock.picking.out,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Origin"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
+msgid "Incoming Products"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,picking_id:0
+#: field:stock.picking,name:0
+#: field:stock.picking.in,name:0
+#: field:stock.picking.out,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1548
+#, python-format
+msgid "Products to Process"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "New Pack"
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Forecasted:"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move:0
+msgid "_Validate"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,message_summary:0
+#: help:stock.picking.in,message_summary:0
+#: help:stock.picking.out,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2473
+#: code:addons/stock/stock.py:2524
+#: code:addons/stock/stock.py:2585
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
+#: code:addons/stock/wizard/stock_inventory_merge.py:43
+#: code:addons/stock/wizard/stock_inventory_merge.py:63
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
+#: code:addons/stock/wizard/stock_return_picking.py:102
+#: code:addons/stock/wizard/stock_return_picking.py:109
+#: code:addons/stock/wizard/stock_return_picking.py:208
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,move_type:0
+#: help:stock.picking.in,move_type:0
+#: help:stock.picking.out,move_type:0
+msgid "It specifies goods to be deliver partially or all at once"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_res_partner
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,partner_id:0
+#: view:stock.move:0
+#: field:stock.picking,partner_id:0
+#: field:stock.picking.in,partner_id:0
+#: field:stock.picking.out,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,module_claim_from_delivery:0
+msgid "Allow claim on deliveries"
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "No invoicing"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that have been processed"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Serial Numbers"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_inventory_valuation
+msgid "Manage Inventory valuation"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Incoming Shipments Available"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Split in Serial Number"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking.out,state:0
+msgid "Ready to Deliver"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2481
+#, python-format
+msgid ""
+"Forbidden operation: it is not allowed to scrap products from a virtual "
+"location."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: report:stock.picking.list:0
+#: selection:stock.picking.out,state:0
+msgid "Waiting Availability"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.move,state:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,stock_available:0
+msgid "Available"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.client,name:stock.action_client_warehouse_menu
+msgid "Open Warehouse Menu"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,module_product_expiry:0
+msgid "Expiry date on serial numbers"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Stock and Expected Variations"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_valuation_account_id:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_stock_tracking_lot:0
+msgid "Track serial number on logistic units (pallets)"
+msgstr ""
+
+#. module: stock
+#: help:product.template,sale_delay:0
+msgid ""
+"The average delay in days between the confirmation of the customer order and "
+"the delivery of the finished products. It's the time you promise to your "
+"customers."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:196
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0
+#: field:stock.location,usage:0
+msgid "Location Type"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1777
+#, python-format
+msgid ""
+"Quantities, Units of Measure, Products and Locations cannot be modified on "
+"stock moves that have already been processed (except by the Administrator)."
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,type:0
+#: help:stock.picking,type:0
+#: help:stock.picking.in,type:0
+#: help:stock.picking.out,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an internal move request. \n"
+"              </p><p>\n"
+"                Most operations are prepared automatically by OpenERP "
+"according\n"
+"                to your preconfigured logistics rules, but you can also "
+"record\n"
+"                manual stock movements.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1356
+#, python-format
+msgid "Back order <em>%s</em> has been <b>created</b>."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by logistic serial number"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Serial Number for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Receive/Deliver Products"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree6
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
+#: field:stock.picking.in,move_lines:0
+#: field:stock.picking.out,move_lines:0
+msgid "Internal Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move_line
+msgid "stock.partial.move.line"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list_in
+msgid "Receipt Slip"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:214
+#, python-format
+msgid ""
+"Serial number quantity %d of %s is larger than available quantity (%d)!"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: field:stock.location,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,partner_id:0
+msgid "Destination Address "
+msgstr ""
+
+#. module: stock
+#: field:product.product,reception_count:0
+msgid "Reception"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.picking.line:0
+msgid "Stock Picking Line"
+msgstr "Línea de Guía"
+
+#. module: stock
+#: field:stock.location,complete_name:0
+#: field:stock.location,name:0
+msgid "Location Name"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,wizard_exist_id:0
+msgid "Parent Wizard (for existing lines)"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Year Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: field:report.stock.move,state:0
+#: view:stock.inventory:0
+#: field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0
+#: view:stock.move:0
+#: field:stock.move,state:0
+#: view:stock.picking:0
+#: field:stock.picking,state:0
+#: view:stock.picking.in:0
+#: field:stock.picking.in,state:0
+#: report:stock.picking.list:0
+#: field:stock.picking.out,state:0
+msgid "Status"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_tracking_form
+#: model:ir.model,name:stock.model_stock_tracking
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form
+#: view:stock.tracking:0
+msgid "Packs"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location.product,type:0
+msgid "Analyse Current Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "To Do"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Serial Number for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_uos:0
+msgid ""
+"Allows you to sell units of a product, but invoice based on a different unit "
+"of measure.\n"
+"                For instance, you can sell pieces of meat that you invoice "
+"based on their weight."
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "e.g. PO0032"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Location Structure"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+msgid ""
+"When doing real-time inventory valuation, this is the Accounting Journal in "
+"which entries will be automatically posted when stock moves are processed."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2252
+#, python-format
+msgid ""
+"Please define stock output account for this product or its category: \"%s\" "
+"(id: %d)"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,message_summary:0
+#: field:stock.picking.in,message_summary:0
+#: field:stock.picking.out,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: stock
+#: view:product.category:0
+msgid "Account Stock Properties"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.in:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:449
+#, python-format
+msgid "Future Receptions"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking.out,state:0
+msgid "Delivered"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,partner_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_scrap
+#: view:stock.move:0
+#: view:stock.move.scrap:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "- update"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_input_id:0
+msgid "Location Input"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move,hide_tracking:0
+#: help:stock.partial.picking,hide_tracking:0
+msgid ""
+"This field is for internal purpose. It is used to decide if the column "
+"production lot has to be shown on the moves or not."
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1190
+#, python-format
+msgid ""
+"You cannot cancel the picking as some moves have been done. You should "
+"cancel the picking lines."
+msgstr ""
+"No puede cancelar una Guía que tiene algún movimiento realizado. Debe "
+"cancelar las líneas de la Guía."
+
+#. module: stock
+#: field:stock.config.settings,decimal_precision:0
+msgid "Decimal precision on weight"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_change_product_qty
+msgid "Change Product Quantity"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:465
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree4
+#: model:ir.model,name:stock.model_stock_picking_in
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
+#: view:stock.picking.in:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date:0
+#: help:stock.picking.in,date:0
+#: help:stock.picking.out,date:0
+msgid "Creation date, usually the time of the order."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Scrap"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2255
+#, python-format
+msgid "Please define journal on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Details"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,state:0
+msgid "Ready to Transfer"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Pickings already processed"
+msgstr "Guías ya procesadas"
+
+#. module: stock
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: report:stock.picking.list:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+msgid "Create Draft Invoices"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,location_id:0
+#: help:stock.picking.in,location_id:0
+#: help:stock.picking.out,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking.in,state:0
+msgid "Ready to Receive"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move Processing Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+msgid "Receive/Deliver By Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Reverse Transfer"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:109
+#, python-format
+msgid ""
+"No products to return (only lines in Done state and not fully returned yet "
+"can be returned)!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+msgid "Back Orders"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
+
+#. module: stock
+#: view:stock.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: stock
+#: field:product.template,loc_row:0
+msgid "Row"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_production:0
+msgid "Production Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:121
+#, python-format
+msgid "Please define journal on the product category: \"%s\" (id: %d)."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,update_cost:0
+#: field:stock.partial.picking.line,update_cost:0
+msgid "Need cost update"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1822
+#, python-format
+msgid ""
+"You are moving %.2f %s but only %.2f %s available for this serial number."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Internal Shipment :"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
+msgid "Shipment"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+#: view:stock.picking.in:0
+msgid "Supplier"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2864
+#, python-format
+msgid ""
+"In order to cancel this inventory, you must first unpost related journal "
+"entries."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_stock_packaging:0
+msgid ""
+"Allows you to create and manage your packaging dimensions and types you want "
+"to be maintained in your system."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
+#: model:ir.model,name:stock.model_stock_inventory_line_split
+#: view:stock.inventory:0
+#: view:stock.inventory.line:0
+msgid "Split inventory lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:214
+#, python-format
+msgid "Processing Error!"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr ""
+"La compañía a la que pertenece la Guía que contiene el movimiento encadenado "
+"(dejarlo vacío para utilizar las reglas por defecto para determinar la "
+"compañía)."
+
+#. module: stock
+#: help:stock.move,state:0
+msgid ""
+"* New: When the stock move is created and not yet confirmed.\n"
+"* Waiting Another Move: This state can be seen when a move is waiting for "
+"another one, for example in a chained flow.\n"
+"* Waiting Availability: This state is reached when the procurement "
+"resolution is not straight forward. It may need the scheduler to run, a "
+"component to me manufactured...\n"
+"* Available: When products are reserved, it is set to 'Available'.\n"
+"* Done: When the shipment is processed, the state is 'Done'."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking.in,state:0
+msgid "Received"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,min_date:0
+#: field:stock.picking.in,min_date:0
+#: field:stock.picking.out,min_date:0
+msgid "Scheduled Time"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Delivery Order :"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new journal. \n"
+"              </p><p>\n"
+"                The stock journal system allows you to assign each stock\n"
+"                operation to a specific journal according to the type of\n"
+"                operation to perform or the worker/team that should perform "
+"the\n"
+"                operation. Examples of stock journals may be: quality "
+"control,\n"
+"                pick lists, packing, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un nuevo diario.\n"
+"</p><p>\n"
+"El sistema de diario de stock permite asignar cada operación de existencias "
+"a un diario específico de acuerdo con el tipo de operación a realizar o el "
+"trabajador/equipo que debe realizar la operación. Ejemplo de diarios de "
+"existencias pueden ser: control de calidad, Guías, empaquetado, etc.\n"
+"</p>\n"
+"            "
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to Leave in the Current Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Waiting Another Move"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.product.qty,new_quantity:0
+msgid ""
+"This quantity is expressed in the Default Unit of Measure of the product."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+"Campo técnico utilizado para registrar el coste del producto indicado por el "
+"usuario durante una confirmación de una Guía (cuando se utiliza el método "
+"del precio medio de coste)."
+
+#. module: stock
+#: code:addons/stock/stock.py:1890
+#, python-format
+msgid "Warning: No Back Order"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+#: view:stock.partial.move:0
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Merge Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2448
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1665
+#, python-format
+msgid "You cannot move product %s to a location of type view %s."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Split in serial numbers"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Ready"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock
+#: field:product.template,sale_delay:0
+msgid "Customer Lead Time"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2653
+#, python-format
+msgid "Missing partial picking data for move #%s."
+msgstr "Datos incompletos para la Guía parcial para el movimiento #%s."
+
+#. module: stock
+#: field:stock.location.product,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:102
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
+"¡Sólo puede devolver Guías que estén confirmadas, reservadas o realizadas!"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: field:stock.picking,invoice_state:0
+#: field:stock.picking.in,invoice_state:0
+#: field:stock.picking.out,invoice_state:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr "Guía Interna"
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.move.split:0
+msgid "Split"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list_out
+msgid "Delivery Slip"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Type"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved out of this location and into an internal location, instead of "
+"the generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date:0
+#: field:stock.move,create_date:0
+#: field:stock.picking,date:0
+#: field:stock.picking.in,date:0
+#: field:stock.picking.out,date:0
+#: field:stock.production.lot,date:0
+#: field:stock.tracking,date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,partner_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_customer:0
+#: selection:stock.location,usage:0
+msgid "Customer Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line_split_lines
+msgid "Inventory Split lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
+msgid "Location Inventory Overview"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Analysis including future moves (similar to virtual stock)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action3
+msgid "Downstream traceability"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Receive"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_1
+#: model:res.company,overdue_msg:stock.res_company_2
+msgid ""
+"Dear Sir/Madam,\n"
+"\n"
+"Our records indicate that some payments on your account are still due. "
+"Please find details below.\n"
+"If the amount has already been paid, please disregard this notice. "
+"Otherwise, please forward us the total amount stated below.\n"
+"If you have any queries regarding your account, Please contact us.\n"
+"\n"
+"Thank you in advance for your cooperation.\n"
+"Best Regards,"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+msgid "Order Date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#, python-format
+msgid "INV: %s"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:168
+#, python-format
+msgid "Please define stock output account for this product: \"%s\" (id: %d)."
+msgstr ""
+
+#. module: stock
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_uom:0
+msgid "Manage different units of measure for products"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2473
+#, python-format
+msgid "Please provide a positive quantity to scrap."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Your Company, Birmingham shop"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:product.template:0
+msgid "Storage Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move.line,currency:0
+#: help:stock.partial.picking.line,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+#: selection:stock.picking.in,move_type:0
+#: selection:stock.picking.out,move_type:0
+msgid "Partial"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "days"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+#: help:stock.picking.in,origin:0
+#: help:stock.picking.out,origin:0
+msgid "Reference of the document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Incoming Shipment :"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_out_account_id:0
+msgid "Stock Valuation Account (Outgoing)"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking.memory:0
+msgid "Return Picking Memory"
+msgstr "Memoría de Guía de Devolución"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.production.lot:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing serial numbers in the list below, "
+"otherwise you should enter new ones line by line."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.move,type:0
+#: selection:stock.picking,type:0
+#: selection:stock.picking.in,type:0
+#: selection:stock.picking.out,type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Cancel Availability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_location_product.py:49
+#, python-format
+msgid "Current Inventory"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for stock moves generated by manufacturing orders."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_in_account_id:0
+msgid "Stock Valuation Account (Incoming)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:528
+#, python-format
+msgid "You cannot remove a lot line."
+msgstr ""
+
+#. module: stock
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:461
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.picking:0
+msgid "Transfer Products"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for stock moves generated when you do an inventory."
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. When not set on "
+"the product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Day Planned"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"\n"
+"            * Draft: not confirmed yet and will not be scheduled until "
+"confirmed\n"
+"\n"
+"            * Waiting Another Operation: waiting for another move to proceed "
+"before it becomes automatically available (e.g. in Make-To-Order flows)\n"
+"\n"
+"            * Waiting Availability: still waiting for the availability of "
+"products\n"
+"\n"
+"            * Ready to Transfer: products reserved, simply waiting for "
+"confirmation.\n"
+"\n"
+"            * Transferred: has been processed, can't be modified or "
+"cancelled anymore\n"
+"\n"
+"            * Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0
+#: view:stock.inventory:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
+#: field:stock.move,date:0
+#: field:stock.partial.move,date:0
+#: field:stock.partial.picking,date:0
+msgid "Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,message_is_follower:0
+#: field:stock.picking.in,message_is_follower:0
+#: field:stock.picking.out,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:97
+#, python-format
+msgid "_Deliver"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking.out,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"\n"
+"                 * Waiting Another Operation: waiting for another move to "
+"proceed before it becomes automatically available (e.g. in Make-To-Order "
+"flows)\n"
+"\n"
+"                 * Waiting Availability: still waiting for the availability "
+"of products\n"
+"\n"
+"                 * Ready to Deliver: products reserved, simply waiting for "
+"confirmation.\n"
+"\n"
+"                 * Delivered: has been processed, can't be modified or "
+"cancelled anymore\n"
+"\n"
+"                 * Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_deliver_move
+#: view:product.product:0
+msgid "Deliveries"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a product reception. \n"
+"              </p><p>\n"
+"                Here you can receive individual products, no matter what\n"
+"                purchase order or picking order they come from. You will "
+"find\n"
+"                the list of all products you are waiting for. Once you "
+"receive\n"
+"                an order, you can filter based on the name of the supplier "
+"or\n"
+"                the purchase order reference. Then you can confirm all "
+"products\n"
+"                received using the buttons on the right of each line.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+#: view:stock.config.settings:0
+#: view:stock.fill.inventory:0
+#: view:stock.inventory.line.split:0
+#: view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0
+#: view:stock.location.product:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
+#: view:stock.partial.move:0
+#: view:stock.partial.picking:0
+#: view:stock.return.picking:0
+#: view:stock.split.into:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking_in
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking_out
+msgid "Return Shipment"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
+#: view:stock.fill.inventory:0
+#: view:stock.inventory:0
+msgid "Fill Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Process Later"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for goods you receive from the current partner"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of Serial Number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,partner_id:0
+msgid "Owner Address"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_move_report
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"moves. Use this report when you want to analyse the different routes taken "
+"by your products and inventory management performance."
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,module_stock_invoice_directly:0
+msgid "Create and open the invoice when the user finish a delivery order"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking_memory
+msgid "stock.return.picking.memory"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_stock_inventory_valuation:0
+msgid "Generate accounting entries per stock movement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:451
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Serial Number for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_fill_inventory
+#: view:stock.fill.inventory:0
+msgid "Import Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Supplier Address :"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_product_variant:0
+msgid "Support multiple variants per products  "
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Customer Locations"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2448
+#: code:addons/stock/stock.py:2863
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.picking:0
+msgid "Stock partial Picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice/Refund"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,message_ids:0
+#: help:stock.picking.in,message_ids:0
+#: help:stock.picking.out,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+msgid ""
+"Inventory Journal in which the chained move will be written, if the Chaining "
+"Type is not Transparent (no journal is used if left empty)"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_supplier:0
+#: selection:stock.location,usage:0
+msgid "Supplier Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Products Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1776
+#, python-format
+msgid "Operation forbidden !"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid ""
+"Analysis of current inventory (only moves that have already been processed)"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,cost:0
+#: field:stock.partial.picking.line,cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Shipping type specify, goods coming in or going out"
+msgstr ""
+
+#. module: stock
+#: view:stock.config.settings:0
+msgid "Accounting"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_warehouse_config
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.production.lot:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a stock movement.\n"
+"              </p><p>\n"
+"                This menu gives you the full traceability of inventory\n"
+"                operations on a specific product. You can filter on the "
+"product\n"
+"                to see all the past or future movements for the product.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0
+#: field:stock.move,product_uom:0
+#: field:stock.move.split,product_uom:0
+#: field:stock.partial.move.line,product_uom:0
+#: field:stock.partial.picking.line,product_uom:0
+#: view:stock.production.lot:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_stock_multiple_locations:0
+msgid "Manage multiple locations and warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_stock_production_lot:0
+msgid "Track serial number on products"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,message_unread:0
+#: field:stock.picking.in,message_unread:0
+#: field:stock.picking.out,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Serial Number available in company "
+"warehouses"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_journal_form
+#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
+msgid "Stock Journals"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:stock.inventory.line.split:0
+msgid "Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.picking:0
+msgid "_Transfer"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Internal Locations"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:471
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_production_lot
+msgid "Manage Serial Numbers"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,note:0
+#: field:stock.picking,note:0
+#: field:stock.picking.in,note:0
+#: field:stock.picking.out,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,state:0
+msgid "Transferred"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,type:0
+#: field:stock.location,chained_picking_type:0
+#: field:stock.move,type:0
+#: field:stock.picking,type:0
+#: field:stock.picking.in,type:0
+#: field:stock.picking.out,type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Process Partially"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Confirmed, Available or Waiting"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu
+#: view:stock.config.settings:0
+#: view:stock.inventory:0
+#: view:stock.partial.move:0
+#: view:stock.picking:0
+msgid "Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2243
+#, python-format
+msgid ""
+"Cannot create Journal Entry, Output Account of this product and Valuation "
+"account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+#: field:stock.picking.in,move_type:0
+#: field:stock.picking.out,move_type:0
+msgid "Delivery Method"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_dest_id:0
+#: help:stock.move,location_dest_id:0
+#: help:stock.picking,location_dest_id:0
+#: help:stock.picking.in,location_dest_id:0
+#: help:stock.picking.out,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2249
+#, python-format
+msgid ""
+"Please define stock input account for this product or its category: \"%s\" "
+"(id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:467
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_config_settings
+msgid "stock.config.settings"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr ""
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Big Suppliers"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
+msgid ""
+"Inventory Analysis allows you to easily check and analyse your company stock "
+"levels. Sort and group by selection criteria in order to better analyse and "
+"manage your company  activities."
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_id:0
+#: help:stock.move,location_id:0
+msgid ""
+"Sets a location if you produce at a fixed location. This can be a partner "
+"location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.product.qty,new_quantity:0
+msgid "New Quantity on Hand"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,origin:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: field:product.product,location_id:0
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.change.product.qty,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
+#: field:stock.move.consume,location_id:0
+#: field:stock.move.scrap,location_id:0
+#: field:stock.partial.move.line,location_id:0
+#: field:stock.partial.picking.line,location_id:0
+#: field:stock.picking,location_id:0
+#: field:stock.picking.in,location_id:0
+#: report:stock.picking.list:0
+#: field:stock.picking.out,location_id:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+#: view:stock.picking:0
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Cancel Move"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2246
+#, python-format
+msgid ""
+"Cannot create Journal Entry, Input Account of this product and Valuation "
+"account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
+msgid "Units of Measure"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,scrap_location:0
+msgid "scrap"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1891
+#, python-format
+msgid ""
+"By changing the quantity here, you accept the new quantity as complete: "
+"OpenERP will not automatically generate a Back Order."
+msgstr ""
+
+#. module: stock
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "On hand:"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by serial number"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Transfer"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"need this report in order to ensure that the stock of each product is "
+"controlled at least once a year."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#, python-format
+msgid "Please create Invoices."
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,module_product_expiry:0
+msgid ""
+"Track different dates on products and serial numbers.\n"
+"The following dates can be tracked:\n"
+"    - end of life\n"
+"    - best before date\n"
+"    - removal date\n"
+"    - alert date.\n"
+"This installs the module product_expiry."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#, python-format
+msgid "Please provide proper Quantity."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
+#: field:report.stock.move,stock_journal:0
+#: view:stock.journal:0
+#: field:stock.journal,name:0
+#: field:stock.picking,stock_journal_id:0
+#: field:stock.picking.in,stock_journal_id:0
+#: field:stock.picking.out,stock_journal_id:0
+msgid "Stock Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:174
+#, python-format
+msgid "%s-%s-return"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr ""
+
+#. module: stock
+#: field:product.template,loc_rack:0
+msgid "Rack"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,prodlot_id:0
+msgid "Serial number is used to put a serial number on the production"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:100
+#, python-format
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
+#: model:ir.actions.act_window,name:stock.action_out_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_out
+#, python-format
+msgid "Deliver Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,month:0
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date_done:0
+#: help:stock.picking.in,date_done:0
+#: help:stock.picking.out,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1663
+#, python-format
+msgid "You cannot move product %s from a location of type view %s."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Your Company"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Yes"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Unit Of Measure"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a location.\n"
+"              </p><p>\n"
+"                This is the structure of your company's warehouses and\n"
+"                locations. You can click on a location to get the list of "
+"the\n"
+"                products and their stock level in this particular location "
+"and\n"
+"                all its children.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real:0
+msgid "Real Stock"
+msgstr ""
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Logistic Serial Number"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: report:stock.picking.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split for this product: "
+"\"%s\" (id: %d)."
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move.line:0
+msgid "Stock Partial Move Line"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Set Available"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_stock_tracking_lot:0
+msgid ""
+"When you select a serial number on product moves, you can get the upstream "
+"or downstream traceability of that product."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:95
+#, python-format
+msgid "_Receive"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,active:0
+#: field:stock.location,active:0
+#: field:stock.tracking,active:0
+msgid "Active"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1120
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split.lines,wizard_exist_id:0
+#: field:stock.inventory.line.split.lines,wizard_id:0
+#: field:stock.move.split.lines,wizard_id:0
+msgid "Parent Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_receive_move
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a reception for this product. \n"
+"              </p><p>\n"
+"                Here you will find the history of all receptions related to\n"
+"                this product, as well as all future receptions you are "
+"waiting\n"
+"                from your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_stock_inventory_valuation:0
+msgid ""
+"Allows to configure inventory valuations on products and product categories."
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,module_stock_location:0
+msgid ""
+"Provide push and pull inventory flows.  Typical uses of this feature are:\n"
+"                manage product manufacturing chains, manage default "
+"locations per product,\n"
+"                define routes within your warehouse according to business "
+"needs, etc.\n"
+"                This installs the module stock_location."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a product delivery.\n"
+"              </p>\n"
+"              <p>\n"
+"                You will find in this list all products you have to deliver "
+"to\n"
+"                your customers. You can process the deliveries directly "
+"from\n"
+"                this list using the buttons on the right of each line. You "
+"can\n"
+"                filter the products to deliver by customer, products or "
+"sale\n"
+"                order (using the Origin field).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Process"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_tracking_lot
+msgid "Manage Logistic Serial Numbers"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a tracking number.\n"
+"              </p><p>\n"
+"                This is the list of all your packs. When you select a Pack, "
+"you\n"
+"                can get the upstream or downstream traceability of the "
+"products\n"
+"                contained in the pack.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2501
+#, python-format
+msgid "%s %s %s has been <b>moved to</b> scrap."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: view:stock.move:0
+#: selection:stock.move,state:0
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: report:stock.picking.list:0
+msgid "Done"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
+#: model:ir.model,name:stock.model_stock_change_standard_price
+#: view:stock.change.standard.price:0
+msgid "Change Standard Price"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+#: selection:stock.picking.in,invoice_state:0
+#: selection:stock.picking.out,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1121
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Confirm & Receive"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,origin:0
+#: field:stock.picking.in,origin:0
+#: field:stock.picking.out,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Scheduled"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Add an internal note..."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_warehouse_form
+#: model:ir.ui.menu,name:stock.menu_action_warehouse_form
+msgid "Warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Process Entirely"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for stock moves generated by procurements."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
+#: view:report.stock.inventory:0
+msgid "Inventory Analysis"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
+#: model:stock.location,name:stock.stock_location_stock
+msgid "Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:222
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_product
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,product_id:0
+#: field:stock.change.product.qty,product_id:0
+#: field:stock.inventory.line,product_id:0
+#: field:stock.inventory.line.split,product_id:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
+#: field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0
+#: field:stock.move.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: field:stock.partial.move.line,product_id:0
+#: field:stock.partial.picking.line,product_id:0
+#: field:stock.picking,product_id:0
+#: field:stock.picking.in,product_id:0
+#: field:stock.picking.out,product_id:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,product_id:0
+#: field:stock.report.prodlots,product_id:0
+#: field:stock.report.tracklots,product_id:0
+#: field:stock.return.picking.memory,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to start an inventory. \n"
+"              </p><p>\n"
+"                Periodical Inventories are used to count the number of "
+"products\n"
+"                available per location. You can use it once a year when you "
+"do\n"
+"                the general inventory or whenever you need it, to adapt the\n"
+"                current inventory level of a product.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return"
+msgstr ""
+
+#. module: stock
+#: field:stock.return.picking,invoice_state:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:790
+#, python-format
+msgid "You cannot process picking without stock moves."
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posz:0
+msgid "Height (Z)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,group_stock_packaging:0
+msgid "Allow to define several packaging methods on products"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Waiting Another Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Supplier Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,wizard_id:0
+#: field:stock.partial.picking.line,wizard_id:0
+#: field:stock.return.picking.memory,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Completed Stock-Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
+#: model:ir.model,name:stock.model_stock_location_product
+msgid "Products by Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.config.settings:0
+msgid "Logistic"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a location.\n"
+"              </p><p>\n"
+"                Define your locations to reflect your warehouse structure "
+"and\n"
+"                organization. OpenERP is able to manage physical locations\n"
+"                (warehouses, shelves, bin, etc), partner locations "
+"(customers,\n"
+"                suppliers) and virtual locations which are the counterpart "
+"of\n"
+"                the stock operations like the manufacturing orders\n"
+"                consumptions, inventories, etc.\n"
+"              </p><p>  \n"
+"                Every stock operation in OpenERP moves the products from "
+"one\n"
+"                location to another one.  For instance, if you receive "
+"products\n"
+"                from a supplier, OpenERP will move products from the "
+"Supplier\n"
+"                location to the Stock location. Each report can be performed "
+"on\n"
+"                physical, partner or virtual locations.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
+#: field:stock.move,location_id:0
+#: field:stock.move.split,location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_manager
+msgid "Manager"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,type:0
+msgid "Analyse Type"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an incoming shipment. \n"
+"              </p><p>\n"
+"                The Incoming Shipments is the list of all orders you will\n"
+"                receive from your suppliers. An incoming shipment contains "
+"a\n"
+"                list of products to be received according to the original\n"
+"                purchase order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+#: selection:stock.picking.in,move_type:0
+#: selection:stock.picking.out,move_type:0
+msgid "All at once"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+msgid "Inventory Move"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:477
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking.in,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"\n"
+"                 * Waiting Another Operation: waiting for another move to "
+"proceed before it becomes automatically available (e.g. in Make-To-Order "
+"flows)\n"
+"\n"
+"                 * Waiting Availability: still waiting for the availability "
+"of products\n"
+"\n"
+"                 * Ready to Receive: products reserved, simply waiting for "
+"confirmation.\n"
+"\n"
+"                 * Received: has been processed, can't be modified or "
+"cancelled anymore\n"
+"\n"
+"                 * Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_config_settings
+#: view:stock.config.settings:0
+msgid "Configure Warehouse"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_lines_date
+#: view:report.stock.lines.date:0
+msgid "Dates of Inventories"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_receive_move
+#: view:product.product:0
+msgid "Receptions"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0
+#: field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0
+#: field:stock.move,company_id:0
+#: field:stock.picking,company_id:0
+#: field:stock.picking.in,company_id:0
+#: field:stock.picking.out,company_id:0
+#: field:stock.production.lot,company_id:0
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Put in current pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+#: field:stock.return.picking.memory,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move,hide_tracking:0
+#: field:stock.partial.move.line,tracking:0
+#: field:stock.partial.picking,hide_tracking:0
+#: field:stock.partial.picking.line,tracking:0
+msgid "Tracking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.split.into:0
+msgid "Ok"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. This is the "
+"default value for all products in this category. It can also directly be set "
+"on each product"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,message_ids:0
+#: field:stock.picking.in,message_ids:0
+#: field:stock.picking.out,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:96
+#: code:addons/stock/product.py:110
+#: code:addons/stock/product.py:113
+#: code:addons/stock/product.py:120
+#: code:addons/stock/product.py:141
+#: code:addons/stock/product.py:167
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:134
+#: code:addons/stock/stock.py:528
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2481
+#: code:addons/stock/stock.py:2590
+#: code:addons/stock/wizard/stock_fill_inventory.py:59
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_warehouse_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new warehouse.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#, python-format
+msgid ""
+"The unit of measure rounding does not allow you to ship \"%s %s\", only "
+"roundings of \"%s %s\" is accepted by the Unit of Measure."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Your Company, Chicago shop"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.move,type:0
+#: selection:stock.picking,type:0
+#: selection:stock.picking.in,type:0
+#: selection:stock.picking.out,type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1853
+#, python-format
+msgid ""
+"By changing this quantity here, you accept the new quantity as complete: "
+"OpenERP will not automatically generate a back order."
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot.revision:0
+msgid "Serial Number Revisions"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.model,name:stock.model_stock_picking_out
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking.out:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders already processed"
+msgstr ""
+
+#. module: stock
+#: field:product.template,loc_case:0
+msgid "Case"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+msgid "Merge inventories"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,message_follower_ids:0
+#: field:stock.picking.in,message_follower_ids:0
+#: field:stock.picking.out,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2590
+#, python-format
+msgid "Cannot consume a move with negative or zero quantity."
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,decimal_precision:0
+msgid ""
+"As an example, a decimal precision of 2 will allow weights like: 9.99 kg, "
+"whereas a decimal precision of 4 will allow weights like:  0.0231 kg."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+#: field:stock.picking,backorder_id:0
+#: field:stock.picking.in,backorder_id:0
+#: field:stock.picking.out,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move.line,cost:0
+#: help:stock.partial.picking.line,cost:0
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_category
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_categ_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Serial  Number"
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_locations
+msgid "Manage Multiple Locations and Warehouses"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2816
+#, python-format
+msgid "INV:"
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,module_stock_invoice_directly:0
+msgid ""
+"This allows to automatically launch the invoicing wizard if the delivery is\n"
+"                to be invoiced when you send or deliver goods.\n"
+"                This installs the module stock_invoice_directly."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:768
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,product_qty:0
+msgid ""
+"This is the quantity of products from an inventory point of view. For moves "
+"in the state 'done', this is the quantity of products that were actually "
+"moved. For other moves, this is the quantity of product that is planned to "
+"be moved. Lowering this quantity does not generate a backorder. Changing "
+"this quantity on assigned moves affects the product reservation, and should "
+"be done with care."
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_in_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved from an internal location into this location, instead of the "
+"generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:459
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,tracking_id:0
+#: view:stock.tracking:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Date Expected"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1821
+#, python-format
+msgid "Insufficient Stock for Serial Number !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique Serial Number, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:142
+#, python-format
+msgid "Please define stock input account for this product: \"%s\" (id: %d)."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_reception_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in
+msgid "Incoming  Products"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "update"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+#: view:stock.config.settings:0
+#: view:stock.fill.inventory:0
+#: view:stock.inventory.line.split:0
+#: view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0
+#: view:stock.location.product:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
+#: view:stock.partial.move:0
+#: view:stock.partial.picking:0
+#: view:stock.return.picking:0
+#: view:stock.split.into:0
+msgid "or"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+#: selection:stock.picking.in,invoice_state:0
+#: selection:stock.picking.out,invoice_state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1852
+#: view:product.template:0
+#, python-format
+msgid "Information"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+msgid ""
+"This stock location will be used, instead of the default one, as the "
+"destination location for goods you send to this partner"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,max_date:0
+#: field:stock.picking.in,max_date:0
+#: field:stock.picking.out,max_date:0
+msgid "Max. Expected Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+#: field:stock.picking.in,auto_picking:0
+#: field:stock.picking.out,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Customer Address :"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,type:0
+#: view:stock.location:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.move,type:0
+#: selection:stock.picking,type:0
+#: selection:stock.picking.in,type:0
+#: selection:stock.picking.out,type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Avaiable'.\n"
+" When the picking it done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Do you want to merge theses inventories?"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2258
+#, python-format
+msgid ""
+"Please define inventory valuation account on the product category: \"%s\" "
+"(id: %d)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Serial Number Revision"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:96
+#, python-format
+msgid "Specify valuation Account for Product Category: %s."
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,module_claim_from_delivery:0
+msgid ""
+"Adds a Claim link to the delivery order.\n"
+"                This installs the module claim_from_delivery."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:208
+#, python-format
+msgid "Please specify at least one non-zero quantity."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_user
+msgid "User"
+msgstr ""
+
+#. module: stock
+#: field:stock.config.settings,module_stock_location:0
+msgid "Create push/pull logistic rules"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:473
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Check Availability"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_stock_production_lot:0
+msgid ""
+"This allows you to manage products by using serial numbers. When you select "
+"a serial number on product moves, you can get the upstream or downstream "
+"traceability of that product."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:124
+#, python-format
+msgid ""
+"No product in this location. Please select a location in the product form."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
+msgid "Future Stock Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:455
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: report:stock.inventory.move:0
+msgid "Production Lot"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_traceability
+#: view:stock.config.settings:0
+#: view:stock.move:0
+#: view:stock.tracking:0
+msgid "Traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_deliver_move
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a delivery order for this product.\n"
+"              </p><p>\n"
+"                Here you will find the history of all past deliveries "
+"related to\n"
+"                this product, as well as all the products you must deliver "
+"to\n"
+"                customers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_form
+#: model:ir.ui.menu,name:stock.menu_action_location_form
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Locations"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+#: help:stock.picking.in,backorder_id:0
+#: help:stock.picking.out,backorder_id:0
+msgid ""
+"If this shipment was split, then this field links to the shipment which "
+"contains the already processed part."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line
+#: model:ir.model,name:stock.model_stock_move_split
+#: view:stock.inventory.line.split:0
+#: view:stock.move:0
+#: view:stock.move.split:0
+msgid "Split in Serial Numbers"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. When not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.partial.move,move_ids:0
+#: field:stock.return.picking,product_return_moves:0
+msgid "Moves"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
+#: field:stock.partial.move.line,location_dest_id:0
+#: field:stock.partial.picking.line,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+#: field:stock.picking.in,location_dest_id:0
+#: field:stock.picking.out,location_dest_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Picking Slip"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Delays"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Schedule Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "New"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Future Stock-Moves"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,name:0
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:110
+#, python-format
+msgid "No difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Deliver"
+msgstr ""
+
+#. module: stock
+#: field:product.product,delivery_count:0
+msgid "Delivery"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import the current inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action5
+msgid "Upstream traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:479
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,min_date:0
+#: help:stock.picking.in,min_date:0
+#: help:stock.picking.out,min_date:0
+msgid "Scheduled time for the shipment to be processed"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: model:stock.location,name:stock.location_production
+#: selection:stock.location,usage:0
+msgid "Production"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: selection:stock.location,chained_location_type:0
+#: view:stock.picking.out:0
+msgid "Customer"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a serial number.\n"
+"              </p><p>\n"
+"                This is the list of all the production lots you recorded. "
+"When\n"
+"                you select a lot, you can get the upstream or downstream\n"
+"                traceability of the products contained in lot. By default, "
+"the\n"
+"                list is filtred on the serial numbers that are available in\n"
+"                your warehouse but you can uncheck the 'Available' button "
+"to\n"
+"                get all the lots you produced, received or delivered to\n"
+"                customers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
+#. module: stock
+#: help:stock.config.settings,group_stock_multiple_locations:0
+msgid ""
+"This allows to configure and use multiple stock locations and warehouses,\n"
+"                instead of having a single default one."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm & Transfer"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a delivery order. \n"
+"              </p><p>\n"
+"                This is the list of all delivery orders that have to be\n"
+"                prepared, according to your different sales orders and your\n"
+"                logistics rules.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,name:0
+msgid ""
+"By default, the pack reference is generated following the sscc standard. "
+"(Serial number + 1 check digit)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0
+#: report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+msgid "Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:192
+#, python-format
+msgid ""
+"The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
+"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
+"accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Print Delivery Slip"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,year:0
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Ready to Process"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Warehouse Address :"
+msgstr ""
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index 14be136467f..16dab1fd0b5 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-30 13:40+0000\n"
+"PO-Revision-Date: 2013-12-09 12:11+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-01 05:45+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -98,7 +98,7 @@ msgstr "Data Transferului"
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr "Ține Evidența Loturilor Expediate"
+msgstr "Urmărește  loturile expediate"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1003,8 +1003,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "production lot has to be shown on the moves or not."
 msgstr ""
-"Acest camp este in scop intern. Este utilizat pentru a hotari daca coloana "
-"lotului de productie va fi afisata sau nu in mutari."
+"Acest câmp este în scop intern. Este utilizat pentru a hotărî dacă coloana "
+"lotului de producție va fi afișată sau nu în mișcări."
 
 #. module: stock
 #: selection:product.product,valuation:0
@@ -1050,7 +1050,7 @@ msgstr "Precizie zecimala la greutate"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr "Loturi de Productie Disponibile"
+msgstr "Loturi de producție disponibile"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
@@ -1568,7 +1568,7 @@ msgstr "Identificare Pachet"
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr "Urmareste Loturile de Productie"
+msgstr "Urmărește loturile de producție"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -2724,7 +2724,7 @@ msgstr "Rebut"
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr "Urmarire Loturi Primite"
+msgstr "Urmărește loturi achiziționate"
 
 #. module: stock
 #: view:stock.location:0
diff --git a/addons/web/i18n/es_PE.po b/addons/web/i18n/es_PE.po
new file mode 100644
index 00000000000..88cb0ba0c8f
--- /dev/null
+++ b/addons/web/i18n/es_PE.po
@@ -0,0 +1,2865 @@
+# Spanish (Peru) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 15:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:28+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:147
+#, python-format
+msgid "Default language:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:592
+#, python-format
+msgid "%d minutes ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:620
+#, python-format
+msgid "Still loading...<br />Please be patient."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1999
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2061
+#: code:addons/web/static/src/js/search.js:2097
+#: code:addons/web/static/src/js/search.js:2124
+#, python-format
+msgid "less or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:114
+#, python-format
+msgid ""
+"Fill in this form to create an OpenERP database. You can\n"
+"                    create databases for different companies or for "
+"different\n"
+"                    goals (testing, production). Once the database is "
+"created,\n"
+"                    you will be able to install your first application."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:126
+#: code:addons/web/static/src/xml/base.xml:185
+#: code:addons/web/static/src/xml/base.xml:300
+#, python-format
+msgid "Master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:292
+#, python-format
+msgid "Change Master Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2439
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:513
+#, python-format
+msgid "Do you really want to delete the database: %s ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1502
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:559
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2462
+#, python-format
+msgid "Now"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:593
+#, python-format
+msgid "about an hour ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2446
+#, python-format
+msgid "Week of the year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:811
+#: code:addons/web/static/src/js/chrome.js:536
+#: code:addons/web/static/src/xml/base.xml:234
+#, python-format
+msgid "Backup Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:518
+#, python-format
+msgid "%(view_type)s view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:49
+#: code:addons/web/static/src/js/dates.js:53
+#, python-format
+msgid "'%s' is not a valid date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2437
+#, python-format
+msgid "Next>"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1858
+#, python-format
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:410
+#, python-format
+msgid "Please enter your previous password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:591
+#, python-format
+msgid "about a minute ago"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:869
+#, python-format
+msgid "You cannot leave any password empty."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:732
+#, python-format
+msgid "Invalid username or password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:278
+#, python-format
+msgid "Master Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1245
+#: code:addons/web/static/src/xml/base.xml:1402
+#, python-format
+msgid "Select"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Database restored successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:437
+#, python-format
+msgid "Version"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:592
+#, python-format
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1566
+#, python-format
+msgid "M2O search fields do not currently handle multiple default values"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1241
+#, python-format
+msgid "Widget type '%s' is not implemented"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:134
+#, python-format
+msgid "e.g. mycompany"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:77
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "Form"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1352
+#, python-format
+msgid "(no string)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:286
+#, python-format
+msgid "'%s' is not a correct time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1401
+#, python-format
+msgid "not a valid number"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
+#, python-format
+msgid "New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
+#, python-format
+msgid "Attachment :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1712
+#, python-format
+msgid "Fields to export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1350
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "File Upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:597
+#, python-format
+msgid "about a month ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1618
+#, python-format
+msgid "Custom Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1364
+#, python-format
+msgid "Button Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:441
+#, python-format
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1663
+#, python-format
+msgid "Custom Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:177
+#, python-format
+msgid "Duplicate Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:832
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:869
+#: code:addons/web/controllers/main.py:871
+#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:878
+#: code:addons/web/static/src/js/chrome.js:823
+#: code:addons/web/static/src/xml/base.xml:294
+#: code:addons/web/static/src/xml/base.xml:354
+#, python-format
+msgid "Change Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3528
+#, python-format
+msgid "View type '%s' is not supported in One2Many."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5082
+#: code:addons/web/static/src/js/view_list.js:2204
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:270
+#, python-format
+msgid "'%s' is not a correct datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:432
+#, python-format
+msgid "Group"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2445
+#, python-format
+msgid "Wk"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:949
+#, python-format
+msgid "Unhandled widget"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1004
+#, python-format
+msgid "Selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:881
+#, python-format
+msgid "The following fields are invalid:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:890
+#, python-format
+msgid "Languages"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2438
+#, python-format
+msgid "Show the next month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1298
+#, python-format
+msgid "...Upload in progress..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1789
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:565
+#, python-format
+msgid "Could not restore the database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4982
+#, python-format
+msgid "File upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3925
+#, python-format
+msgid "Action Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:1493
+#, python-format
+msgid "Manage Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2042
+#, python-format
+msgid "contains"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "Take a minute to get a coffee,<br />because it's loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:435
+#, python-format
+msgid "Activate the developer mode"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:341
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1216
+#, python-format
+msgid "GroupBy"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#, python-format
+msgid "You must select at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:557
+#, python-format
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1071
+#, python-format
+msgid "Set Default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1000
+#, python-format
+msgid "Relation:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:590
+#, python-format
+msgid "less than a minute ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2453
+#, python-format
+msgid "Select a date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:873
+#, python-format
+msgid "Condition:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2458
+#, python-format
+msgid "Time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1709
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:246
+#, python-format
+msgid "'%s' is not a correct float"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Restored"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:409
+#, python-format
+msgid "%d-%d of %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2955
+#, python-format
+msgid "Create and Edit..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:736
+#, python-format
+msgid "Unknown nonliteral type "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2144
+#, python-format
+msgid "is not"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:572
+#, python-format
+msgid "Print Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:413
+#, python-format
+msgid "Please confirm your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1825
+#, python-format
+msgid "UTF-8"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "For more information visit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1880
+#, python-format
+msgid "Add All Info..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1701
+#, python-format
+msgid "Export Formats"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:996
+#, python-format
+msgid "On change:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:939
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2046
+#: code:addons/web/static/src/js/search.js:2062
+#: code:addons/web/static/src/js/search.js:2098
+#: code:addons/web/static/src/js/search.js:2125
+#: code:addons/web/static/src/js/search.js:2145
+#, python-format
+msgid "is set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:906
+#, python-format
+msgid "Setting 'id' attribute on existing record %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:8
+#, python-format
+msgid "List"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2058
+#: code:addons/web/static/src/js/search.js:2094
+#: code:addons/web/static/src/js/search.js:2121
+#, python-format
+msgid "greater than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Changed Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1492
+#, python-format
+msgid "Save Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1372
+#, python-format
+msgid "Action ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:479
+#, python-format
+msgid "Your user's preference timezone does not match your browser timezone:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1237
+#, python-format
+msgid "Field '%s' specified in view could not be found."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1777
+#, python-format
+msgid "Saved exports:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:338
+#, python-format
+msgid "Old Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:113
+#, python-format
+msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "The database has been duplicated."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1643
+#, python-format
+msgid "Apply"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1414
+#, python-format
+msgid "Save & New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2432
+#, python-format
+msgid "Erase the current date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1253
+#, python-format
+msgid "Save As"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:109
+#, python-format
+msgid "Create a New Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
+#, python-format
+msgid "00:00:00"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:595
+#, python-format
+msgid "a day ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:138
+#, python-format
+msgid "Load demonstration data:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1810
+#, python-format
+msgid "Does your file have titles?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:327
+#, python-format
+msgid "Unlimited"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:788
+#, python-format
+msgid ""
+"Warning, the record has been modified, your changes will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#, python-format
+msgid "Search: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:141
+#, python-format
+msgid "Check this box to evaluate OpenERP."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:566
+#, python-format
+msgid "Technical translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1818
+#, python-format
+msgid "Delimiter:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:484
+#, python-format
+msgid "Browser's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1623
+#, python-format
+msgid "Filter name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1490
+#, python-format
+msgid "-- Actions --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1795
+#, python-format
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "OpenERP.com"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "Can't send email to invalid e-mail address"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:658
+#, python-format
+msgid "Add..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:424
+#, python-format
+msgid "Preferences"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1704
+#, python-format
+msgid "Only export selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:435
+#, python-format
+msgid "Wrong on change format: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:793
+#: code:addons/web/static/src/xml/base.xml:203
+#, python-format
+msgid "Drop Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:30
+#: code:addons/web/static/src/js/view_form.js:1077
+#: code:addons/web/static/src/xml/base.xml:1422
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:488
+#, python-format
+msgid "Click here to change your user's timezone."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:988
+#, python-format
+msgid "Modifiers:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:649
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:796
+#: code:addons/web/static/src/xml/base.xml:837
+#: code:addons/web/static/src/xml/base.xml:1410
+#: code:addons/web/static/src/xml/base.xml:1630
+#, python-format
+msgid "Save"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1074
+#: code:addons/web/static/src/xml/base.xml:370
+#, python-format
+msgid "More"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:73
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "Duplicating database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Password has been changed successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "Resource Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2459
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#, python-format
+msgid "Debug View#"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:77
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:199
+#: code:addons/web/static/src/js/view_list.js:346
+#: code:addons/web/static/src/xml/base.xml:1785
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:425
+#, python-format
+msgid "My OpenERP.com account"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:774
+#, python-format
+msgid ""
+"Local evaluation failure\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:367
+#, python-format
+msgid "Invalid database name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1714
+#, python-format
+msgid "Save fields list"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:5
+#, python-format
+msgid "Start"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:897
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:586
+#, python-format
+msgid "Creation Date:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:878
+#, python-format
+msgid "Error, password not changed !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4981
+#, python-format
+msgid "The selected file exceed the maximum file size of %s."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2435
+#, python-format
+msgid "<Prev"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2450
+#, python-format
+msgid "Set DD as first week day"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid ""
+"By default, the master password is 'admin'. This password\n"
+"                    is required to created, delete dump or restore databases."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:327
+#, python-format
+msgid "Backup"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:76
+#: code:addons/web/static/src/js/dates.js:80
+#, python-format
+msgid "'%s' is not a valid time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:278
+#, python-format
+msgid "'%s' is not a correct date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:955
+#, python-format
+msgid "(nolabel)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:596
+#, python-format
+msgid "%d days ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1500
+#, python-format
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1936
+#: code:addons/web/static/src/xml/base.xml:356
+#: code:addons/web/static/src/xml/base.xml:1405
+#: code:addons/web/static/src/xml/base.xml:1881
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:672
+#: code:addons/web/static/src/js/coresetup.js:618
+#: code:addons/web/static/src/xml/base.xml:9
+#, python-format
+msgid "Loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:589
+#, python-format
+msgid "Latest Modification by:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:492
+#, python-format
+msgid "Timezone mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1663
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2436
+#, python-format
+msgid "Show the previous month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:427
+#, python-format
+msgid "%d / %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1803
+#, python-format
+msgid "2. Check your file format"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1739
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1796
+#, python-format
+msgid ""
+"Select a .CSV file to import. If you need a sample of file to import,\n"
+"       you should use the export tool with the \"Import Compatible\" option."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:598
+#, python-format
+msgid "%d months ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:205
+#: code:addons/web/static/src/xml/base.xml:326
+#, python-format
+msgid "Drop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1491
+#, python-format
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:871
+#, python-format
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:564
+#: code:addons/web/static/src/xml/base.xml:266
+#, python-format
+msgid "Restore Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:268
+#: code:addons/web/static/src/xml/base.xml:328
+#, python-format
+msgid "Restore"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1695
+#, python-format
+msgid "Export Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:428
+#, python-format
+msgid "Log out"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1192
+#, python-format
+msgid "Group by: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2443
+#, python-format
+msgid "Show a different month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:154
+#, python-format
+msgid "No data provided."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:345
+#: code:addons/web/static/src/xml/base.xml:1683
+#, python-format
+msgid "Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:31
+#, python-format
+msgid "Export To File"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "Don't leave yet,<br />it's still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "Invalid Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:990
+#, python-format
+msgid "Could not find id in dataset"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1728
+#, python-format
+msgid "Remove All"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Your OpenERP session expired. Please refresh the current web page."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1368
+#, python-format
+msgid "Method:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1449
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:414
+#, python-format
+msgid "The confirmation does not match the password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:463
+#, python-format
+msgid "Edit Company data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "Save As..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Could not display the selected image."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Database backed up successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:427
+#, python-format
+msgid "Help"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:184
+#, python-format
+msgid "(%d records)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Change default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1879
+#, python-format
+msgid "Advanced"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2044
+#: code:addons/web/static/src/js/search.js:2056
+#: code:addons/web/static/src/js/search.js:2092
+#: code:addons/web/static/src/js/search.js:2119
+#, python-format
+msgid "is equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1581
+#, python-format
+msgid "Could not serialize XML"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1637
+#, python-format
+msgid "Advanced Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:308
+#, python-format
+msgid "Confirm new master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:624
+#, python-format
+msgid "Maybe you should consider reloading the application by pressing F5..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:17
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:324
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:1404
+#, python-format
+msgid "Create"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2043
+#, python-format
+msgid "doesn't contain"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1806
+#, python-format
+msgid "Import Options"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3023
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2434
+#, python-format
+msgid "Close without change"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
+#, python-format
+msgid "Choose a password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2451
+#, python-format
+msgid "Select D, M d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:622
+#, python-format
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1800
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2460
+#, python-format
+msgid "Minute"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_tree.js:11
+#, python-format
+msgid "Tree"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:793
+#, python-format
+msgid "Could not drop database !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:231
+#, python-format
+msgid "'%s' is not a correct integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:899
+#, python-format
+msgid "All users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1671
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1546
+#, python-format
+msgid "Node [%s] is not a JSONified XML node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1454
+#, python-format
+msgid "Advanced Search..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "Dropping database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:467
+#, python-format
+msgid "Powered by"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1484
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Yes"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1350
+#, python-format
+msgid "Timezone Mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "There was a problem while uploading your file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:580
+#, python-format
+msgid "XML ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:976
+#, python-format
+msgid "Size:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1845
+#, python-format
+msgid "--- Don't Import ---"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1697
+#, python-format
+msgid "Import-Compatible Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:600
+#, python-format
+msgid "%d years ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1050
+#, python-format
+msgid "Unknown m2m command %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1078
+#, python-format
+msgid "Save default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:193
+#: code:addons/web/static/src/xml/base.xml:282
+#, python-format
+msgid "New database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:411
+#, python-format
+msgid "Please enter your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "The field is empty, there's nothing to save !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:567
+#, python-format
+msgid "Manage Views"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "E-mail Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1822
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid "Lines to skip"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2945
+#, python-format
+msgid "Create \"<strong>%s</strong>\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:362
+#, python-format
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "This resource is empty"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1710
+#, python-format
+msgid "Available fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1856
+#, python-format
+msgid "The import failed due to:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:886
+#: code:addons/web/static/src/xml/base.xml:561
+#, python-format
+msgid "JS Tests"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1771
+#, python-format
+msgid "Save as:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1024
+#, python-format
+msgid "Filter on: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#: code:addons/web/static/src/js/view_form.js:3878
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2433
+#: code:addons/web/static/src/js/view_form.js:2463
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:562
+#, python-format
+msgid "View Fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:348
+#, python-format
+msgid "Confirm New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:587
+#, python-format
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:980
+#, python-format
+msgid "Context:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2114
+#: code:addons/web/static/src/js/search.js:2143
+#, python-format
+msgid "is"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:6
+#, python-format
+msgid "Export Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:984
+#, python-format
+msgid "Domain:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:856
+#, python-format
+msgid "Default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:468
+#, python-format
+msgid "OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:8
+#, python-format
+msgid "Stop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:68
+#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:243
+#, python-format
+msgid "Database:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1211
+#: code:addons/web/static/src/xml/base.xml:1268
+#, python-format
+msgid "Uploading ..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1874
+#, python-format
+msgid "Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1165
+#, python-format
+msgid "About"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search Again"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1481
+#, python-format
+msgid "-- Filters --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1998
+#: code:addons/web/static/src/js/search.js:2165
+#, python-format
+msgid "%(field)s %(operator)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1698
+#, python-format
+msgid "Export all Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1344
+#, python-format
+msgid ""
+"Grouping on field '%s' is not possible because that field does not appear in "
+"the list view."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:559
+#, python-format
+msgid "Set Defaults"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1688
+#, python-format
+msgid ""
+"This wizard will export all data that matches the current search criteria to "
+"a CSV file.\n"
+"            You can export all data or only the fields that can be "
+"reimported after modification."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "The record could not be found in the database."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2444
+#, python-format
+msgid "Show a different year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1498
+#, python-format
+msgid "Filter Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:968
+#, python-format
+msgid "Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:560
+#, python-format
+msgid "Incorrect super-administrator password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:964
+#, python-format
+msgid "Object:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:309
+#: code:addons/web/static/src/js/chrome.js:343
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2440
+#, python-format
+msgid "Show the current month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:599
+#, python-format
+msgid "about a year ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2045
+#: code:addons/web/static/src/js/search.js:2057
+#: code:addons/web/static/src/js/search.js:2093
+#: code:addons/web/static/src/js/search.js:2120
+#, python-format
+msgid "is not equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5167
+#, python-format
+msgid ""
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Select a database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:594
+#, python-format
+msgid "%d hours ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4334
+#: code:addons/web/static/src/js/view_form.js:4464
+#, python-format
+msgid "Add: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1879
+#, python-format
+msgid "Quick Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1826
+#, python-format
+msgid "Latin 1"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:277
+#: code:addons/web/static/src/js/chrome.js:286
+#: code:addons/web/static/src/js/chrome.js:466
+#: code:addons/web/static/src/js/chrome.js:847
+#: code:addons/web/static/src/js/view_form.js:575
+#: code:addons/web/static/src/js/view_form.js:1940
+#: code:addons/web/static/src/xml/base.xml:1773
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1237
+#, python-format
+msgid "Uploading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
+#, python-format
+msgid "Created by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:22
+#: code:addons/web/static/src/js/dates.js:26
+#, python-format
+msgid "'%s' is not a valid datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
+#, python-format
+msgid "File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2059
+#: code:addons/web/static/src/js/search.js:2095
+#: code:addons/web/static/src/js/search.js:2122
+#, python-format
+msgid "less than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
+#, python-format
+msgid "Edit SearchView"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2160
+#, python-format
+msgid "is true"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4030
+#, python-format
+msgid "Add an item"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1621
+#, python-format
+msgid "Save current filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1933
+#, python-format
+msgid "Confirm"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:127
+#, python-format
+msgid "Please enter save field list name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2216
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:325
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1777
+#, python-format
+msgid "Can't convert value %s to context"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:881
+#: code:addons/web/static/src/xml/base.xml:563
+#, python-format
+msgid "Fields View Get"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:163
+#, python-format
+msgid "Confirm password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2060
+#: code:addons/web/static/src/js/search.js:2096
+#: code:addons/web/static/src/js/search.js:2123
+#, python-format
+msgid "greater or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1349
+#, python-format
+msgid "Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:375
+#, python-format
+msgid "Please select fields to export..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2047
+#: code:addons/web/static/src/js/search.js:2063
+#: code:addons/web/static/src/js/search.js:2099
+#: code:addons/web/static/src/js/search.js:2126
+#: code:addons/web/static/src/js/search.js:2146
+#, python-format
+msgid "is not set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:304
+#, python-format
+msgid "New master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1626
+#, python-format
+msgid "Share with all users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2161
+#, python-format
+msgid "is false"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:426
+#, python-format
+msgid "About OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:301
+#, python-format
+msgid "'%s' is not a correct date, datetime nor time"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:1307
+#, python-format
+msgid "No content found for field '%s' on '%s:%s'"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:322
+#, python-format
+msgid "Database Management"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Image"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:81
+#, python-format
+msgid "Manage Databases"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:770
+#, python-format
+msgid "Evaluation Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1387
+#, python-format
+msgid "not a valid integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:355
+#: code:addons/web/static/src/xml/base.xml:798
+#: code:addons/web/static/src/xml/base.xml:838
+#: code:addons/web/static/src/xml/base.xml:1404
+#: code:addons/web/static/src/xml/base.xml:1412
+#: code:addons/web/static/src/xml/base.xml:1648
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1485
+#, python-format
+msgid "No"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:313
+#, python-format
+msgid "'%s' is not convertible to date, datetime nor time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:200
+#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:325
+#, python-format
+msgid "Duplicate"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1419
+#, python-format
+msgid "Discard"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5314
+#, python-format
+msgid "Uploading Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1642
+#, python-format
+msgid "Add a condition"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:619
+#, python-format
+msgid "Still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:884
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3926
+#, python-format
+msgid "The o2m record must be saved before an action can be used"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Backed"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1628
+#, python-format
+msgid "Use by default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3139
+#: code:addons/web/static/src/js/view_form.js:3785
+#: code:addons/web/static/src/js/view_form.js:3906
+#: code:addons/web/static/src/js/view_form.js:4358
+#: code:addons/web/static/src/js/view_form.js:4482
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1358
+#, python-format
+msgid "%s (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "triggered from search view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1079
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:972
+#, python-format
+msgid "Widget:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:570
+#, python-format
+msgid "Edit Action"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1681
+#, python-format
+msgid ""
+"This filter is global and will be removed for everybody if you continue."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:577
+#, python-format
+msgid "ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:892
+#, python-format
+msgid "Only you"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:571
+#, python-format
+msgid "Edit Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1246
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:914
+#, python-format
+msgid "Technical Translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:960
+#, python-format
+msgid "Field:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:642
+#, python-format
+msgid "Modified by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "The database %s has been dropped"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:482
+#, python-format
+msgid "User's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:301
+#: code:addons/web/static/src/js/chrome.js:1276
+#, python-format
+msgid "Client Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1073
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1359
+#, python-format
+msgid "Special:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:877
+#, python-format
+msgid ""
+"The old password you provided is incorrect, your password was not changed."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:583
+#, python-format
+msgid "Creation User:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:769
+#, python-format
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1413
+#, python-format
+msgid "Save & Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2932
+#, python-format
+msgid "Search More..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:75
+#: code:addons/web/static/src/xml/base.xml:329
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2457
+#, python-format
+msgid "Choose Time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:568
+#: code:addons/web/static/src/xml/base.xml:831
+#: code:addons/web/static/src/xml/base.xml:1206
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1727
+#, python-format
+msgid "Remove"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1090
+#, python-format
+msgid "Select date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1351
+#: code:addons/web/static/src/js/search.js:1369
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1305
+#, python-format
+msgid "Delete this file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:168
+#, python-format
+msgid "Create Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1816
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2461
+#, python-format
+msgid "Second"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:616
+#: code:addons/web/static/src/xml/base.xml:1480
+#, python-format
+msgid "Filters"
+msgstr ""
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index c6cbeadf257..94c20c6e2b4 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-12-06 16:04+0000\n"
+"PO-Revision-Date: 2013-12-09 20:29+0000\n"
 "Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-07 06:32+0000\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:28+0000\n"
 "X-Generator: Launchpad (build 16869)\n"
 
 #. module: web
@@ -1001,7 +1001,7 @@ msgstr "Väärä formaatti: %s"
 #: code:addons/web/static/src/xml/base.xml:203
 #, python-format
 msgid "Drop Database"
-msgstr "Pudota Tietokanta"
+msgstr "Poista tietokonta"
 
 #. module: web
 #. openerp-web
@@ -1358,7 +1358,7 @@ msgstr "%d kuukautta sitten"
 #: code:addons/web/static/src/xml/base.xml:326
 #, python-format
 msgid "Drop"
-msgstr "Pudota"
+msgstr "Poista"
 
 #. module: web
 #. openerp-web
@@ -1728,7 +1728,7 @@ msgstr "Puu"
 #: code:addons/web/controllers/main.py:793
 #, python-format
 msgid "Could not drop database !"
-msgstr "Älä pudota tietokantaa !"
+msgstr "Älä poista tietokantaa!"
 
 #. module: web
 #. openerp-web
@@ -1770,7 +1770,7 @@ msgstr "Tarkempi haku..."
 #: code:addons/web/static/src/js/chrome.js:521
 #, python-format
 msgid "Dropping database"
-msgstr "Pudottaa tietokantaa"
+msgstr "Poistaa tietokannan"
 
 #. module: web
 #. openerp-web
@@ -2731,7 +2731,7 @@ msgstr "Muokkaaja:"
 #: code:addons/web/static/src/js/chrome.js:521
 #, python-format
 msgid "The database %s has been dropped"
-msgstr "Tietokanta %s on pudotettu"
+msgstr "Tietokanta %s on poistettu"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_PE.po b/addons/web_calendar/i18n/es_PE.po
new file mode 100644
index 00000000000..9f5cb43c326
--- /dev/null
+++ b/addons/web_calendar/i18n/es_PE.po
@@ -0,0 +1,217 @@
+# Spanish (Peru) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 15:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:28+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:161
+#, python-format
+msgid "New event"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:164
+#, python-format
+msgid "Details"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:512
+#, python-format
+msgid "Edit: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:162
+#, python-format
+msgid "Save"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:109
+#, python-format
+msgid "Calendar view has a 'date_delay' type != float"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:157
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:159
+#, python-format
+msgid "Week"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:171
+#, python-format
+msgid "Full day"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:169
+#: code:addons/web_calendar/static/src/js/calendar.js:182
+#, python-format
+msgid "Description"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:168
+#, python-format
+msgid "Event will be deleted permanently, are you sure?"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:9
+#, python-format
+msgid "&nbsp;"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:181
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:158
+#, python-format
+msgid "Day"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:165
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:177
+#, python-format
+msgid "Enabled"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:174
+#, python-format
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:90
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:175
+#, python-format
+msgid "Repeat event"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:180
+#: code:addons/web_calendar/static/src/js/calendar.js:188
+#, python-format
+msgid "Agenda"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:475
+#, python-format
+msgid "Create: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:170
+#, python-format
+msgid "Time period"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:166
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:160
+#, python-format
+msgid "Month"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:176
+#, python-format
+msgid "Disabled"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:185
+#, python-format
+msgid "Year"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:163
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:36
+#, python-format
+msgid "Calendar"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:101
+#, python-format
+msgid "Calendar view has not defined 'date_start' attribute."
+msgstr ""
diff --git a/addons/web_diagram/i18n/es_PE.po b/addons/web_diagram/i18n/es_PE.po
new file mode 100644
index 00000000000..4bf254309bb
--- /dev/null
+++ b/addons/web_diagram/i18n/es_PE.po
@@ -0,0 +1,99 @@
+# Spanish (Peru) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 16:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:28+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
new file mode 100644
index 00000000000..8bb9e5a91c3
--- /dev/null
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -0,0 +1,15557 @@
+# Spanish (Peru) translation for openobject-server
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
+"PO-Revision-Date: 2013-12-09 16:08+0000\n"
+"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_check_writing
+msgid ""
+"\n"
+"Module for the Check Writing and Check Printing.\n"
+"================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "e.g. GEBABEBB"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sh
+msgid "Saint Helena"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Other Configuration"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "DateTime"
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:652
+#, python-format
+msgid ""
+"The second argument of the many2many field %s must be a SQL table !You used "
+"%s, which is not a valid SQL table name."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,arch:0
+#: field:ir.ui.view.custom,arch:0
+msgid "View Architecture"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_sale_stock
+msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
+msgstr ""
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "No gap"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hungarian / Magyar"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PY) / Español (PY)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_project_management
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_point_of_sale
+msgid "Touchscreen Interface for Shops"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
+msgid "Indian Payroll"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,model:0
+msgid ""
+"Model name on which the method to be called is located, e.g. 'res.partner'."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Views"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_manufacturer
+msgid ""
+"\n"
+"A module that adds manufacturers and attributes on the product form.\n"
+"====================================================================\n"
+"\n"
+"You can now define the following for a product:\n"
+"-----------------------------------------------\n"
+"    * Manufacturer\n"
+"    * Manufacturer Product Name\n"
+"    * Manufacturer Product Code\n"
+"    * Product Attributes\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params:0
+msgid "Supplementary arguments"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_base_account
+msgid ""
+"\n"
+"The module adds google user in res user.\n"
+"========================================\n"
+msgstr ""
+
+#. module: base
+#: help:res.partner,employee:0
+msgid "Check this box if this contact is an Employee."
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,domain:0
+msgid ""
+"The optional domain to restrict possible values for relationship fields, "
+"specified as a Python expression defining a list of triplets. For example: "
+"[('color','=','red')]"
+msgstr ""
+
+#. module: base
+#: field:res.partner,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
+msgid "Belgium - Structured Communication"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,target:0
+msgid "Target Window"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml:0
+msgid "Main Report File Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
+msgid "Sales Analytic Distribution"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_invoice
+msgid ""
+"\n"
+"Generate your Invoices from Expenses, Timesheet Entries.\n"
+"========================================================\n"
+"\n"
+"Module to generate invoices based on costs (human resources, expenses, "
+"...).\n"
+"\n"
+"You can define price lists in analytic account, make some theoretical "
+"revenue\n"
+"reports."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_sequence.py:134
+#: code:addons/base/ir/ir_sequence.py:160
+#: code:addons/base/res/res_users.py:473
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:405
+#, python-format
+msgid ""
+"Properties of base fields cannot be altered in this manner! Please modify "
+"them through Python code, preferably through a custom addon!"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:151
+#, python-format
+msgid "Constraint Error"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_custom
+msgid "ir.ui.view.custom"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:374
+#, python-format
+msgid "Renaming sparse field \"%s\" is not allowed"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sz
+msgid "Swaziland"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4485
+#, python-format
+msgid "created."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xsl:0
+msgid "XSL Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_tr
+msgid "Turkey - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_tree
+#: model:ir.ui.menu,name:base.menu_action_res_company_tree
+msgid "Company's Structure"
+msgstr "Estructura de la compañía"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+" Swiss localization :\n"
+" ====================\n"
+" **Multilang swiss STERCHI account chart and taxes**\n"
+"  **Author:** Camptocamp SA\n"
+"\n"
+"  **Financial contributors:** Prisme Solutions Informatique SA, Quod SA\n"
+"\n"
+"  **Translation contributors:** brain-tec AG, Agile Business Group\n"
+"\n"
+" **This release will introduce major changes to l10n_ch.**\n"
+"\n"
+" Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+" - **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+" - **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+" - **l10n_ch_bank**: List of swiss banks\n"
+" - **l10n_ch_zip**: List of swiss postal zip\n"
+" - **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+" - **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+" - **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+" The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+" https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_multi_currency
+msgid "Multi Currencies"
+msgstr "Multi-Monedas"
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cl
+msgid ""
+"\n"
+"Chilean accounting chart and tax localization.\n"
+"==============================================\n"
+"Plan contable chileno e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale
+msgid "Sales Management"
+msgstr "Gestión de Ventas"
+
+#. module: base
+#: help:res.partner,user_id:0
+msgid ""
+"The internal user that is in charge of communicating with this contact if "
+"any."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Search Partner"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,module_nr:0
+msgid "Number of Modules"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type.field,size:0
+msgid "Max. Size"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_id:0
+msgid ""
+"Database ID of record to open in form view, when ``view_mode`` is set to "
+"'form' only"
+msgstr ""
+
+#. module: base
+#: help:ir.values,key2:0
+msgid ""
+"For actions, one of the possible action slots: \n"
+"  - client_action_multi\n"
+"  - client_print_multi\n"
+"  - client_action_relate\n"
+"  - tree_but_open\n"
+"For defaults, an optional condition"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The name of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "active"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,wiz_name:0
+msgid "Wizard Name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_knowledge
+msgid ""
+"\n"
+"Installer for knowledge-based Hidden.\n"
+"=====================================\n"
+"\n"
+"Makes the Knowledge Application Configuration available from where you can "
+"install\n"
+"document and Wiki based Hidden.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_customer_relationship_management
+msgid "Customer Relationship Management"
+msgstr "Gestión de las relaciones con el cliente (CRM)"
+
+#. module: base
+#: model:ir.module.module,description:base.module_delivery
+msgid ""
+"\n"
+"Allows you to add delivery methods in sale orders and picking.\n"
+"==============================================================\n"
+"\n"
+"You can define your own carrier and delivery grids for prices. When creating "
+"\n"
+"invoices from picking, OpenERP is able to add and compute the shipping "
+"line.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_filters.py:80
+#, python-format
+msgid ""
+"There is already a shared filter set as default for %(model)s, delete or "
+"change it before setting a new default"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2649
+#, python-format
+msgid "Invalid group_by"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,child_ids:0
+msgid "Child Applications"
+msgstr ""
+
+#. module: base
+#: field:res.partner,credit_limit:0
+msgid "Credit Limit"
+msgstr "Límite de Crédito"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_project_long_term
+msgid "Portal Project Long Term"
+msgstr "Portal - Proyectos a Largo Plazo"
+
+#. module: base
+#: field:ir.model.constraint,date_update:0
+#: field:ir.model.data,date_update:0
+#: field:ir.model.relation,date_update:0
+msgid "Update Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_action_rule
+msgid "Automated Action Rules"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
+msgid "Owner"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Source Object"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,format_layout:base.bank_normal
+msgid "%(bank_name)s: %(acc_number)s"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Config Wizard Steps"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_sc
+msgid "ir.ui.view_sc"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,group_id:0
+#: view:res.groups:0
+msgid "Group"
+msgstr ""
+
+#. module: base
+#: constraint:res.lang:0
+msgid ""
+"Invalid date/time format directive specified. Please refer to the list of "
+"allowed directives, displayed when you edit a language."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4153
+#, python-format
+msgid ""
+"One of the records you are trying to modify has already been deleted "
+"(Document type: %s)."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,views:0
+msgid ""
+"This function field computes the ordered list of views that should be "
+"enabled when displaying the result of an action, federating view mode, views "
+"and reference view. The result is returned as an ordered list of pairs "
+"(view_id,view_mode)."
+msgstr ""
+
+#. module: base
+#: field:ir.model.relation,name:0
+msgid "Relation Name"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Create Access Right"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tv
+msgid "Tuvalu"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.configuration.wizard,note:0
+msgid "Next Wizard"
+msgstr ""
+
+#. module: base
+#: field:res.lang,date_format:0
+msgid "Date Format"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_report_designer
+msgid "OpenOffice Report Designer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.an
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:311
+#, python-format
+msgid ""
+"You can not remove the admin user as it is used internally for resources "
+"created by OpenERP (updates, module installation, ...)"
+msgstr ""
+
+#. module: base
+#: view:workflow.transition:0
+msgid "Workflow Transition"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gf
+msgid "French Guyana"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr
+msgid "Jobs, Departments, Employees Details"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic
+msgid ""
+"\n"
+"Module for defining analytic accounting object.\n"
+"===============================================\n"
+"\n"
+"In OpenERP, analytic accounts are linked to general accounts but are "
+"treated\n"
+"totally independently. So, you can enter various different analytic "
+"operations\n"
+"that have no counterpart in the general financial accounts.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event
+msgid ""
+"\n"
+"Organization and management of Events.\n"
+"======================================\n"
+"\n"
+"The event module allows you to efficiently organise events and all related "
+"tasks: planification, registration tracking,\n"
+"attendances, etc.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Manage your Events and Registrations\n"
+"* Use emails to automatically confirm and send acknowledgements for any "
+"event registration\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bosnian / bosanski jezik"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment_use:0
+msgid ""
+"If you check this, then the second time the user prints with same attachment "
+"name, it returns the previous report."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (VE) / Español (VE)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
+msgid "Invoice on Timesheets"
+msgstr "Facturar a partir de los horarios de trabajo"
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Your system will be updated."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,note:0
+#: selection:ir.property,type:0
+msgid "Text"
+msgstr ""
+
+#. module: base
+#: field:res.country,name:0
+msgid "Country Name"
+msgstr "Nombre del País"
+
+#. module: base
+#: model:res.country,name:base.co
+msgid "Colombia"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_mister
+msgid "Mister"
+msgstr ""
+
+#. module: base
+#: help:res.country,code:0
+msgid ""
+"The ISO country code in two chars.\n"
+"You can use this field for quick search."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pw
+msgid "Palau"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Put an internal note..."
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Untranslated"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,context:0
+#: help:ir.actions.client,context:0
+msgid ""
+"Context dictionary as Python expression, empty by default (Default: {})"
+msgstr ""
+
+#. module: base
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:344
+#, python-format
+msgid "Custom fields must have a name that starts with 'x_' !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx
+msgid "Mexico - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,action_id:0
+msgid "Select the Action Window, Report, Wizard to be executed."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.config_parameter:0
+msgid "Key must be unique."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_outlook
+msgid "Outlook Plug-In"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account
+msgid ""
+"\n"
+"Accounting and Financial Management.\n"
+"====================================\n"
+"\n"
+"Financial and accounting module that covers:\n"
+"--------------------------------------------\n"
+"    * General Accounting\n"
+"    * Cost/Analytic accounting\n"
+"    * Third party accounting\n"
+"    * Taxes management\n"
+"    * Budgets\n"
+"    * Customer and Supplier Invoices\n"
+"    * Bank statements\n"
+"    * Reconciliation process by partner\n"
+"\n"
+"Creates a dashboard for accountants that includes:\n"
+"--------------------------------------------------\n"
+"    * List of Customer Invoice to Approve\n"
+"    * Company Analysis\n"
+"    * Graph of Treasury\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line orgrouping is maintained through "
+"journal) \n"
+"for a particular financial year and for preparation of vouchers there is a "
+"module named account_voucher.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: field:ir.model,name:0
+msgid "Model Description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing
+msgid ""
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_linkedin
+msgid ""
+"\n"
+"OpenERP Web LinkedIn module.\n"
+"============================\n"
+"This module provides the Integration of the LinkedIn with OpenERP.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,src_model:0
+msgid ""
+"Optional model name of the objects on which this action should be visible"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_expr_id:0
+msgid "Trigger Expression"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jo
+msgid "Jordan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,nextcall:0
+msgid "Next planned execution date for this job."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.er
+msgid "Eritrea"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_action_rule_admin
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ro
+msgid "Romania - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image_small:0
+msgid ""
+"Small-sized image of this contact. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,mobile:0
+msgid ""
+"Provides fields that be used to fetch the mobile number, e.g. you select the "
+"invoice, then `object.invoice_address_id.mobile` is the field which gives "
+"the correct mobile number"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Security and Authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_calendar
+msgid "Web Calendar"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Swedish / svenska"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,name:0
+#: field:ir.attachment,datas_fname:0
+msgid "File Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rs
+msgid "Serbia"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard View"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kh
+msgid "Cambodia, Kingdom of"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,overwrite:0
+#: field:base.language.install,overwrite:0
+msgid "Overwrite Existing Terms"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_currency.py:52
+#, python-format
+msgid "No currency rate associated for currency %d for the given period"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_holidays
+msgid ""
+"\n"
+"Manage leaves and allocation requests\n"
+"=====================================\n"
+"\n"
+"This application controls the holiday schedule of your company. It allows "
+"employees to request holidays. Then, managers can review requests for "
+"holidays and approve or reject them. This way you can control the overall "
+"holiday planning for the company or department.\n"
+"\n"
+"You can configure several kinds of leaves (sickness, holidays, paid days, "
+"...) and allocate leaves to an employee or department quickly using "
+"allocation requests. An employee can also make a request for more days off "
+"by making a new Allocation. It will increase the total of available days for "
+"that leave type (if the request is accepted).\n"
+"\n"
+"You can keep track of leaves in different ways by following reports: \n"
+"\n"
+"* Leaves Summary\n"
+"* Leaves by Department\n"
+"* Leaves Analysis\n"
+"\n"
+"A synchronization with an internal agenda (Meetings of the CRM module) is "
+"also possible in order to automatically create a meeting when a holiday "
+"request is accepted by setting up a type of meeting in Leave Type.\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Albanian / Shqip"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
+msgid "Opportunities"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_export
+msgid "base.language.export"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_type:0
+msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_webdav
+msgid "Shared Repositories (WebDAV)"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Email Preferences"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:195
+#, python-format
+msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "My Partners"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zw
+msgid "Zimbabwe"
+msgstr ""
+
+#. module: base
+#: help:ir.model.constraint,type:0
+msgid ""
+"Type of the constraint: `f` for a foreign key, `u` for other constraints."
+msgstr ""
+"Tipo de restricción: 'f' para una clave foránea, 'u' para otras "
+"restricciones."
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "XML Report"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.es
+msgid "Spain"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,domain:0
+msgid ""
+"Optional domain filtering of the destination data, as a Python expression"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_upgrade
+msgid "Module Upgrade"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "ZIP"
+msgstr "Código postal o Distrito"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (UY) / Español (UY)"
+msgstr ""
+
+#. module: base
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr "Teléfono Móvil"
+
+#. module: base
+#: model:res.country,name:base.om
+msgid "Oman"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp
+msgid "MRP"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_attendance
+msgid ""
+"\n"
+"This module aims to manage employee's attendances.\n"
+"==================================================\n"
+"\n"
+"Keeps account of the attendances of the employees on the basis of the\n"
+"actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nu
+msgid "Niue"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_membership
+msgid "Membership Management"
+msgstr "Gestión de Suscriptores"
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other OSI Approved Licence"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_gantt
+msgid "Web Gantt"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_menu_create
+#: view:wizard.ir.model.menu.create:0
+msgid "Create Menu"
+msgstr "Crear Menú"
+
+#. module: base
+#: model:res.country,name:base.in
+msgid "India"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request_link-act
+#: model:ir.ui.menu,name:base.menu_res_request_link_act
+msgid "Request Reference Types"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_base_account
+msgid "Google Users"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fleet
+msgid "Fleet Management"
+msgstr "Gestión de Flotas"
+
+#. module: base
+#: help:ir.server.object.lines,value:0
+msgid ""
+"Expression containing a value specification. \n"
+"When Formula type is selected, this field may be a Python expression  that "
+"can use the same values as for the condition field on the server action.\n"
+"If Value type is selected, the value will be used directly without "
+"evaluation."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ad
+msgid "Andorra, Principality of"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_read:0
+msgid "Apply for Read"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mn
+msgid "Mongolia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "TGZ Archive"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid ""
+"Users added to this group are automatically added in the following groups."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:732
+#: code:addons/base/ir/ir_model.py:735
+#, python-format
+msgid "Document model"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%B - Full month name."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,type:0
+#: view:ir.attachment:0
+#: field:ir.attachment,type:0
+#: field:ir.model,state:0
+#: field:ir.model.fields,state:0
+#: field:ir.property,type:0
+#: field:ir.server.object.lines,type:0
+#: field:ir.translation,type:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: field:ir.values,key:0
+msgid "Type"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_user:0
+msgid "Username"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
+#, python-format
+msgid ""
+"Language with code \"%s\" is not defined in your system !\n"
+"Define it through the Administration menu."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gu
+msgid "Guam (USA)"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,installed_version:0
+msgid "Latest Version"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Delete Access Right"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+#: selection:workflow.activity,kind:0
+msgid "Dummy"
+msgstr ""
+
+#. module: base
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ky
+msgid "Cayman Islands"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record Rule"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kr
+msgid "South Korea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4920
+#, python-format
+msgid "Record #%d of %s not found, cannot copy!"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,contributors:0
+msgid "Contributors"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_unlink:0
+msgid "Apply for Delete"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Char"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.action_client_base_menu
+msgid "Open Settings Menu"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (AR) / Español (AR)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ug
+msgid "Uganda"
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_unlink:0
+msgid "Delete Access"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ne
+msgid "Niger"
+msgstr "Nigeria"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (HK)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ba
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Field"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (GT) / Español (GT)"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: base
+#: help:res.users,login:0
+msgid "Used to log into the system"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"TGZ format: this is a compressed archive containing a PO file, directly "
+"suitable\n"
+"                                for uploading to OpenERP's translation "
+"platform,"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%W - Week number of the year (Monday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Monday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_language_install.py:53
+#, python-format
+msgid "Language Pack"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tests
+msgid "Tests"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment:0
+msgid "Save as Attachment Prefix"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,res_id:0
+msgid "Resource Ref."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,url:0
+msgid "Action URL"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_name:0
+#: field:ir.module.module,shortdesc:0
+msgid "Module Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mh
+msgid "Marshall Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:429
+#, python-format
+msgid "Changing the model of a field is forbidden!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ht
+msgid "Haiti"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
+msgid "French Payroll"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Search"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:154
+#, python-format
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,parent_id:0
+msgid "Parent Application"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
+#, python-format
+msgid "Operation Canceled"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document
+msgid "Document Management System"
+msgstr "Gestión de Documentos"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_claim
+msgid "Claims Management"
+msgstr "Gestión de Reclamaciones"
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_webdav
+msgid ""
+"\n"
+"With this module, the WebDAV server for documents is activated.\n"
+"===============================================================\n"
+"\n"
+"You can then use any compatible browser to remotely see the attachments of "
+"OpenObject.\n"
+"\n"
+"After installation, the WebDAV server can be controlled by a [webdav] "
+"section in \n"
+"the server's config.\n"
+"\n"
+"Server Configuration Parameter:\n"
+"-------------------------------\n"
+"[webdav]:\n"
+"+++++++++ \n"
+"    * enable = True ; Serve webdav over the http(s) servers\n"
+"    * vdir = webdav ; the directory that webdav will be served at\n"
+"    * this default val means that webdav will be\n"
+"    * on \"http://localhost:8069/webdav/\n"
+"    * verbose = True ; Turn on the verbose messages of webdav\n"
+"    * debug = True ; Turn on the debugging messages of webdav\n"
+"    * since the messages are routed to the python logging, with\n"
+"    * levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"    * these options on\n"
+"\n"
+"Also implements IETF RFC 5785 for services discovery on a http server,\n"
+"which needs explicit configuration in openerp-server.conf too.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_purchase_management
+#: model:ir.ui.menu,name:base.menu_purchase_root
+msgid "Purchases"
+msgstr "Compras"
+
+#. module: base
+#: model:res.country,name:base.md
+msgid "Moldavia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_iban
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for it's validity.\n"
+"============================================================================="
+"=========================================\n"
+"\n"
+"The ability to extract the correctly represented local accounts from IBAN "
+"accounts \n"
+"with a single statement.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Features"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_claim
+msgid ""
+"\n"
+"This module adds claim menu and features to your portal if claim and portal "
+"are installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Version"
+msgstr ""
+
+#. module: base
+#: help:res.users,action_id:0
+msgid ""
+"If specified, this action will be opened at logon for this user, in addition "
+"to the standard menu."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mf
+msgid "Saint Martin (French part)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports
+msgid "ir.exports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
+#, python-format
+msgid "No language with code \"%s\" exists"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_social_network
+#: model:ir.module.module,shortdesc:base.module_mail
+msgid "Social Network"
+msgstr "Red Social"
+
+#. module: base
+#: view:res.lang:0
+msgid "%Y - Year with century."
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Report Footer Configuration"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,comments:0
+msgid "Translation comments"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_lunch
+msgid ""
+"\n"
+"The base module to manage lunch.\n"
+"================================\n"
+"\n"
+"Many companies order sandwiches, pizzas and other, from usual suppliers, for "
+"their employees to offer them more facilities. \n"
+"\n"
+"However lunches management within the company requires proper administration "
+"especially when the number of employees or suppliers is important. \n"
+"\n"
+"The “Lunch Order” module has been developed to make this management easier "
+"but also to offer employees more tools and usability. \n"
+"\n"
+"In addition to a full meal and supplier management, this module offers the "
+"possibility to display warning and provides quick order selection based on "
+"employee’s preferences.\n"
+"\n"
+"If you want to save your employees' time and avoid them to always have coins "
+"in their pockets, this module is essential.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:wizard.ir.model.menu.create:0
+msgid "Create _Menu"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_obj_id:0
+msgid ""
+"The field on the current object that links to the target object record (must "
+"be a many2one, or an integer field with the record ID)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_bank
+#: view:res.bank:0
+#: field:res.partner.bank,bank:0
+msgid "Bank"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports_line
+msgid "ir.exports.line"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_purchase_management
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+
+#. module: base
+#: help:res.partner,website:0
+msgid "Website of Partner or Company"
+msgstr ""
+
+#. module: base
+#: help:base.language.install,overwrite:0
+msgid ""
+"If you check this box, your customized translations will be overwritten and "
+"replaced by the official ones."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a bank account.\n"
+"              </p><p>\n"
+"                Configure your company's bank accounts and select those that "
+"must appear on the report footer.\n"
+"                You can reorder bank accounts from the list view.\n"
+"              </p>\n"
+"              <p>\n"
+"                If you use the accounting application of OpenERP, journals "
+"and accounts will be created automatically based on these data.\n"
+"              </p>  \n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_report_xml
+#: field:ir.module.module,reports_by_module:0
+#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
+msgid "Reports"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window.view,multi:0
+#: help:ir.actions.report.xml,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: field:workflow,on_create:0
+msgid "On Create"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:913
+#, python-format
+msgid ""
+"'%s' contains too many dots. XML ids should not contain dots ! These are "
+"used to refer to other modules data, as in module.reference_id"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "Invalid Search Criteria"
+msgstr ""
+
+#. module: base
+#: field:res.users,login:0
+msgid "Login"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Access all the fields related to the current object using expressions, i.e. "
+"object.partner_id.name "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_project_issue
+msgid "Portal Issue"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_tools
+msgid "Tools"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Float"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.todo,type:0
+msgid ""
+"Manual: Launched manually.\n"
+"Automatic: Runs whenever the system is reconfigured.\n"
+"Launch Manually Once: after having been launched manually, it sets "
+"automatically to Done."
+msgstr ""
+
+#. module: base
+#: field:res.partner,image_small:0
+msgid "Small-sized image"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock
+msgid "Warehouse Management"
+msgstr "Gestión de Almacenes"
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_link
+msgid "res.request.link"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,name:0
+msgid "Wizard Info"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_wizard_lang_export
+#: model:ir.ui.menu,name:base.menu_wizard_lang_export
+msgid "Export Translation"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_server_action
+#: view:ir.actions.server:0
+#: model:ir.ui.menu,name:base.menu_server_action
+msgid "Server Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_lu
+msgid "Luxembourg - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tp
+msgid "East Timor"
+msgstr "Timor Oriental"
+
+#. module: base
+#: field:workflow.transition,act_to:0
+msgid "Destination Activity"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:414
+#: view:ir.module.module:0
+#, python-format
+msgid "Install"
+msgstr ""
+
+#. module: base
+#: field:res.currency,accuracy:0
+msgid "Computational Accuracy"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_at
+msgid ""
+"\n"
+"This module provides the standard Accounting Chart for Austria which is "
+"based on the Template from BMF.gv.at.\n"
+"============================================================================="
+"================================ \n"
+"Please keep in mind that you should review and adapt it with your "
+"Accountant, before using it in a live Environment.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kg
+msgid "Kyrgyz Republic (Kyrgyzstan)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_accountant
+msgid ""
+"\n"
+"Accounting Access Rights\n"
+"========================\n"
+"It gives the Administrator user access to all accounting features such as "
+"journal items and the chart of accounts.\n"
+"\n"
+"It assigns manager and user access rights to the Administrator and only user "
+"rights to the Demo user. \n"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day: %(day)s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_point_of_sale
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+"Le ayuda a sacar lo mejor de sus puntos de venta con la codificación rápida "
+"de las ventas, codificación simplificada de modos de pago, generación "
+"automática de guías y más."
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:164
+#, python-format
+msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nl
+msgid "Netherlands"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_event
+msgid "Portal Event"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "Translation in Progress"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_rule
+msgid "ir.rule"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_fleet
+msgid "Vehicle, leasing, insurances, costs"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_read:0
+msgid "Read Access"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_share
+msgid ""
+"\n"
+"This module adds generic sharing tools to your current OpenERP database.\n"
+"========================================================================\n"
+"\n"
+"It specifically adds a 'share' button that is available in the Web client "
+"to\n"
+"share any kind of OpenERP data with colleagues, customers, friends.\n"
+"\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"shared\n"
+"users only have access to the data that has been shared with them.\n"
+"\n"
+"This is extremely useful for collaborative work, knowledge sharing,\n"
+"synchronization with other companies.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_process
+msgid "Enterprise Process"
+msgstr ""
+
+#. module: base
+#: help:res.partner,supplier:0
+msgid ""
+"Check this box if this contact is a supplier. If it's not checked, purchase "
+"people will not see it when encoding a purchase order."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_evaluation
+msgid "Employee Appraisals"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Write Object"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:68
+#, python-format
+msgid " (copy)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tm
+msgid "Turkmenistan"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "7.  %H:%M:%S      ==> 18:25:20"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner.category,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_left:0
+msgid "Left parent"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_mrp
+msgid "Create Tasks on SO"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:320
+#, python-format
+msgid "This column contains module data and cannot be removed!"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,footer:0
+msgid "Display on Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_timesheet
+msgid ""
+"\n"
+"Synchronization of project task work entries with timesheet entries.\n"
+"====================================================================\n"
+"\n"
+"This module lets you transfer the entries under tasks defined for Project\n"
+"Management to the Timesheet line entries for particular date and particular "
+"user\n"
+"with the effect of creating, editing and deleting either ways.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_multilang
+msgid ""
+"\n"
+"    * Multi language support for Chart of Accounts, Taxes, Tax Codes, "
+"Journals,\n"
+"      Accounting Templates, Analytic Chart of Accounts and Analytic "
+"Journals.\n"
+"    * Setup wizard changes\n"
+"        - Copy translations for COA, Tax, Tax Code and Fiscal Position from\n"
+"          templates to target objects.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,act_from:0
+msgid "Source Activity"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Legend (for prefix, suffix)"
+msgstr ""
+
+#. module: base
+#: selection:ir.server.object.lines,type:0
+msgid "Formula"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:311
+#, python-format
+msgid "Can not remove root user!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mw
+msgid "Malawi"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ec
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Accounting chart and localization for Ecuador.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:339
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:335
+#: code:addons/base/res/res_users.py:337
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_chart
+msgid "Template of Charts of Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.partner,type:0
+msgid "Address Type"
+msgstr "Tipo de Dirección"
+
+#. module: base
+#: model:res.country,name:base.dj
+msgid "Djibouti"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,complete_name:0
+msgid "Full Path"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "The next step depends on the file format:"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%U - Week number of the year (Sunday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Sunday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "PO(T) format: you should edit it with a PO editor such as"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration
+#: model:res.groups,name:base.group_system
+msgid "Settings"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Tree"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Create / Write / Copy"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Second: %(sec)s"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_mode:0
+msgid "View Mode"
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,footer:0
+msgid ""
+"Display this bank account on the footer of printed documents like invoices "
+"and sales orders."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish / Español"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KP) / 한국어 (KP)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_vn
+msgid "Vietnam Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ax
+msgid "Åland Islands"
+msgstr ""
+
+#. module: base
+#: field:res.company,logo:0
+msgid "Logo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cr
+msgid "Costa Rica - Accounting"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_url,target:0
+#: selection:ir.actions.act_window,target:0
+msgid "New Window"
+msgstr ""
+
+#. module: base
+#: field:ir.values,action_id:0
+msgid "Action (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_subscription
+msgid "Recurring Documents"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bs
+msgid "Bahamas"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_create:0
+msgid "Apply for Create"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_tools
+msgid "Extra Tools"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ie
+msgid "Ireland"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_header1:0
+msgid ""
+"Appears by default on the top right corner of your printed documents (report "
+"header)."
+msgstr ""
+
+#. module: base
+#: field:base.module.update,update:0
+msgid "Number of modules updated"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,function:0
+msgid "Method"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Workflow Activity"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_sheet
+msgid ""
+"\n"
+"Record and validate timesheets and attendances easily\n"
+"=====================================================\n"
+"\n"
+"This application supplies a new screen enabling you to manage both "
+"attendances (Sign in/Sign out) and your work encoding (timesheet) by period. "
+"Timesheet entries are made by employees each day. At the end of the defined "
+"period, employees validate their sheet and the manager must then approve his "
+"team's entries. Periods are defined in the company forms and you can set "
+"them to run monthly or weekly.\n"
+"\n"
+"The complete timesheet validation process is:\n"
+"---------------------------------------------\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"------------------------------------------------\n"
+"* Period size (Day, Week, Month)\n"
+"* Maximal difference between timesheet and attendances\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:341
+#, python-format
+msgid ""
+"No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view
+msgid ""
+"Views allows you to personalize each view of OpenERP. You can add new "
+"fields, move fields, rename them or delete the ones that you do not need."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_setup
+msgid "Initial Setup Tools"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,groups_id:0
+#: model:ir.actions.act_window,name:base.action_res_groups
+#: field:ir.actions.report.xml,groups_id:0
+#: view:ir.actions.todo:0
+#: field:ir.actions.todo,groups_id:0
+#: field:ir.actions.wizard,groups_id:0
+#: view:ir.model:0
+#: field:ir.model.fields,groups:0
+#: field:ir.rule,groups:0
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,groups_id:0
+#: model:ir.ui.menu,name:base.menu_action_res_groups
+#: view:ir.ui.view:0
+#: field:ir.ui.view,groups_id:0
+#: view:res.groups:0
+#: field:res.users,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CL) / Español (CL)"
+msgstr "Español (CL) / Español (CL)"
+
+#. module: base
+#: model:res.country,name:base.bz
+msgid "Belize"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,header:0
+msgid "Add or not the corporate RML header"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ge
+msgid "Georgia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_invoice_bba
+msgid ""
+"\n"
+"    \n"
+"Belgian localization for in- and outgoing invoices (prereq to "
+"account_coda):\n"
+"============================================================================"
+"\n"
+"    - Rename 'reference' field labels to 'Communication'\n"
+"    - Add support for Belgian Structured Communication\n"
+"\n"
+"A Structured Communication can be generated automatically on outgoing "
+"invoices according to the following algorithms:\n"
+"-----------------------------------------------------------------------------"
+"----------------------------------------\n"
+"    1) Random : +++RRR/RRRR/RRRDD+++\n"
+"        **R..R =** Random Digits, **DD =** Check Digits\n"
+"    2) Date : +++DOY/YEAR/SSSDD+++\n"
+"        **DOY =** Day of the Year, **SSS =** Sequence Number, **DD =** Check "
+"Digits\n"
+"    3) Customer Reference +++RRR/RRRR/SSSDDD+++\n"
+"        **R..R =** Customer Reference without non-numeric characters, **SSS "
+"=** Sequence Number, **DD =** Check Digits  \n"
+"        \n"
+"The preferred type of Structured Communication and associated Algorithm can "
+"be\n"
+"specified on the Partner records. A 'random' Structured Communication will\n"
+"generated if no algorithm is specified on the Partner record. \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pl
+msgid "Poland"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_mode:0
+msgid ""
+"Comma-separated list of allowed view modes, such as 'form', 'tree', "
+"'calendar', etc. (Default: tree,form)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3843
+#, python-format
+msgid "A document was modified since you last viewed it (%s:%d)"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid "Workflow Editor"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be removed"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,expression:0
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_debug:0
+msgid "Debugging"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_helpdesk
+msgid ""
+"\n"
+"Helpdesk Management.\n"
+"====================\n"
+"\n"
+"Like records and processing of claims, Helpdesk and Support are good tools\n"
+"to trace your interventions. This menu is more adapted to oral "
+"communication,\n"
+"which is not necessarily related to a claim. Select a customer, add notes\n"
+"and categorize your interventions with a channel and a priority level.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_type:0
+msgid ""
+"View type: Tree type to use for the tree view, set to 'tree' for a "
+"hierarchical tree view, or 'form' for a regular list view"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.ui.view_sc:0
+msgid "Shortcut for this menu already exists!"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Groups (no group = global)"
+msgstr "Grupos (no group = global)"
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Extra"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.st
+msgid "Saint Tome (Sao Tome) and Principe"
+msgstr ""
+
+#. module: base
+#: selection:res.partner,type:0
+msgid "Invoice"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product
+msgid ""
+"\n"
+"This is the base module for managing products and pricelists in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Products support variants, different pricing methods, suppliers "
+"information,\n"
+"make to stock/order, different unit of measures, packaging and properties.\n"
+"\n"
+"Pricelists support:\n"
+"-------------------\n"
+"    * Multiple-level of discount (by product, category, quantities)\n"
+"    * Compute price based on different criteria:\n"
+"        * Other pricelist\n"
+"        * Cost price\n"
+"        * List price\n"
+"        * Supplier price\n"
+"\n"
+"Pricelists preferences by product and/or partners.\n"
+"\n"
+"Print product labels with barcode.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_default
+msgid ""
+"\n"
+"Set default values for your analytic accounts.\n"
+"==============================================\n"
+"\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"---------------------------------------------------------------------\n"
+"    * Product\n"
+"    * Partner\n"
+"    * User\n"
+"    * Company\n"
+"    * Date\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bb
+msgid "Barbados"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mg
+msgid "Madagascar"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:127
+#, python-format
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_oauth_signup
+msgid "Signup with OAuth2 Authentication"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Custom Object"
+msgstr "Objeto Personalizado"
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_menu_admin
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,name:0
+msgid "Menu"
+msgstr ""
+
+#. module: base
+#: field:res.currency,rate:0
+msgid "Current Rate"
+msgstr "Ratio actual"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Greek / Ελληνικά"
+msgstr ""
+
+#. module: base
+#: field:res.company,custom_footer:0
+msgid "Custom Footer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_crm
+msgid "Opportunity to Quotation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and sales orders.\n"
+"=================================================================\n"
+"\n"
+"Using this module you will be able to link analytic accounts to sales "
+"orders.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_us
+msgid ""
+"\n"
+"United States - Chart of accounts.\n"
+"==================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,target:0
+msgid "Action Target"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_report_company
+msgid ""
+"\n"
+"Add an extra Company dimension on Invoices for consolidated Invoice "
+"Analysis\n"
+"============================================================================"
+"\n"
+"\n"
+"By default Customer and Supplier invoices can be linked to a contact within\n"
+"a company, but the company is not a direct reference in the database "
+"structure for\n"
+"invoices. Journal Entries are however always linked to the company and not "
+"to\n"
+"contacts, so that Accounts Payable and Receivable are always correct and "
+"consolidated\n"
+"at company level.\n"
+"\n"
+"When many different contacts/departments need to be invoiced within the same "
+"parent company,\n"
+"this can make reporting by Company more difficult: reports are directly "
+"based on the\n"
+"database structure and would not provide an aggregated company dimension.\n"
+"\n"
+"This modules solves the problem by adding an explicit company reference on "
+"invoices,\n"
+"automatically computed from the invoice contact, and use this new dimension\n"
+"when grouping the list of Invoices or the Invoice Analysis report by "
+"Partner. \n"
+"\n"
+"Note: this module will likely be removed for the next major OpenERP version "
+"and\n"
+"directly integrated in the core accounting. \n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ai
+msgid "Anguilla"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.report_ir_model_overview
+msgid "Model Overview"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_margin
+msgid "Margins by Products"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_invoiced
+msgid "Invoicing"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,name:0
+msgid "Shortcut Name"
+msgstr ""
+
+#. module: base
+#: field:res.partner,contact_address:0
+msgid "Complete Address"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,limit:0
+msgid "Default limit for the list view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "RML Report"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_export
+msgid "Import / Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale
+msgid ""
+"\n"
+"Manage sales quotations and orders\n"
+"==================================\n"
+"\n"
+"This application allows you to manage your sales goals in an effective and "
+"efficient manner by keeping track of all sales orders and history.\n"
+"\n"
+"It handles the full sales workflow:\n"
+"\n"
+"* **Quotation** -> **Sales order** -> **Invoice**\n"
+"\n"
+"Preferences (only with Warehouse Management installed)\n"
+"------------------------------------------------------\n"
+"\n"
+"If you also installed the Warehouse Management, you can deal with the "
+"following preferences:\n"
+"\n"
+"* Shipping: Choice of delivery at once or partial delivery\n"
+"* Invoicing: choose how invoices will be paid\n"
+"* Incoterms: International Commercial terms\n"
+"\n"
+"You can choose flexible invoicing methods:\n"
+"\n"
+"* *On Demand*: Invoices are created manually from Sales Orders when needed\n"
+"* *On Delivery Order*: Invoices are generated from picking (delivery)\n"
+"* *Before Delivery*: A Draft invoice is created and must be paid before "
+"delivery\n"
+"\n"
+"\n"
+"The Dashboard for the Sales Manager will include\n"
+"------------------------------------------------\n"
+"* My Quotations\n"
+"* Monthly Turnover (Graph)\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,res_id:0
+#: field:ir.model.data,res_id:0
+#: field:ir.translation,res_id:0
+#: field:ir.values,res_id:0
+msgid "Record ID"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_docs
+msgid ""
+"\n"
+"Module to attach a google document to any model.\n"
+"================================================\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:333
+#, python-format
+msgid "Found multiple matches for field '%%(field)s' (%d matches)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (BE) / Français (BE)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pe
+msgid ""
+"\n"
+"Peruvian accounting chart and tax localization. According the PCGE 2010.\n"
+"========================================================================\n"
+"\n"
+"Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la\n"
+"SUNAT 2011 (PCGE 2010).\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:workflow.activity,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,params:0
+msgid "Arguments sent to the client along withthe view tag"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_contacts
+msgid "Contacts, People and Companies"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tt
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lv
+msgid "Latvia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mappings"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Translations"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_manager
+#: model:res.groups,name:base.group_sale_manager
+#: model:res.groups,name:base.group_tool_manager
+msgid "Manager"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:726
+#, python-format
+msgid "Sorry, you are not allowed to access this document."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.py
+msgid "Paraguay"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fj
+msgid "Fiji"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report Xml"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase
+msgid ""
+"\n"
+"Manage goods requirement by Purchase Orders easily\n"
+"==================================================\n"
+"\n"
+"Purchase management enables you to track your suppliers' price quotations "
+"and convert them into purchase orders if necessary.\n"
+"OpenERP has several methods of monitoring invoices and tracking the receipt "
+"of ordered goods. You can handle partial deliveries in OpenERP, so you can "
+"keep track of items that are still to be delivered in your orders, and you "
+"can issue reminders automatically.\n"
+"\n"
+"OpenERP’s replenishment management rules enable the system to generate draft "
+"purchase orders automatically, or you can configure it to run a lean process "
+"driven entirely by current production needs.\n"
+"\n"
+"Dashboard / Reports for Purchase Management will include:\n"
+"---------------------------------------------------------\n"
+"* Request for Quotations\n"
+"* Purchase Orders Waiting Approval \n"
+"* Monthly Purchases by Category\n"
+"* Receptions Analysis\n"
+"* Purchase Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_close
+msgid "ir.actions.act_window_close"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,col1:0
+msgid "Destination"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lt
+msgid "Lithuania"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_graph
+msgid ""
+"\n"
+"Graph Views for Web Client.\n"
+"===========================\n"
+"\n"
+"    * Parse a <graph> view but allows changing dynamically the presentation\n"
+"    * Graph Types: pie, lines, areas, bars, radar\n"
+"    * Stacked/Not Stacked for areas and bars\n"
+"    * Legends: top, inside (top/left), hidden\n"
+"    * Features: download as PNG or CSV, browse data grid, switch "
+"orientation\n"
+"    * Unlimited \"Group By\" levels (not stacked), two cross level analysis "
+"(stacked)\n"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid "Inherited"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "yes"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,serialization_field_id:0
+msgid "Serialization Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_hr_payroll
+msgid ""
+"\n"
+"Belgian Payroll Rules.\n"
+"======================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances/Deductions\n"
+"    * Allow to configure Basic/Gross/Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:174
+#, python-format
+msgid "'%s' does not seem to be an integer for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_report_designer
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%y - Year without century [00,99]."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_anglo_saxon
+msgid ""
+"\n"
+"This module supports the Anglo-Saxon accounting methodology by changing the "
+"accounting logic with stock transactions.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The difference between the Anglo-Saxon accounting countries and the Rhine \n"
+"(or also called Continental accounting) countries is the moment of taking \n"
+"the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does \n"
+"take the cost when sales invoice is created, Continental accounting will \n"
+"take the cost at the moment the goods are shipped.\n"
+"\n"
+"This module will add this functionality by using a interim account, to \n"
+"store the value of shipped goods and will contra book this interim \n"
+"account when the invoice is created to transfer this amount to the \n"
+"debtor or creditor account. Secondly, price differences between actual \n"
+"purchase price and fixed product standard price are booked on a separate \n"
+"account."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.si
+msgid "Slovenia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_status
+msgid ""
+"\n"
+"This module handles state and stage. It is derived from the crm_base and "
+"crm_case classes from crm.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"    * ``base_state``: state management\n"
+"    * ``base_stage``: stage management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_linkedin
+msgid "LinkedIn Integration"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2021
+#: code:addons/orm.py:2032
+#, python-format
+msgid "Invalid Object Architecture!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:372
+#: code:addons/base/ir/ir_model.py:374
+#: code:addons/base/ir/ir_model.py:404
+#: code:addons/base/ir/ir_model.py:418
+#: code:addons/base/ir/ir_model.py:420
+#: code:addons/base/ir/ir_model.py:422
+#: code:addons/base/ir/ir_model.py:429
+#: code:addons/base/ir/ir_model.py:432
+#: code:addons/base/module/wizard/base_module_import.py:58
+#: code:addons/base/module/wizard/base_module_import.py:66
+#: code:addons/base/module/wizard/base_update_translations.py:39
+#: code:addons/base/res/res_currency.py:52
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_rib
+msgid "French RIB Bank Details"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%p - Equivalent of either AM or PM."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Iteration Actions"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_manager
+msgid ""
+"the user will have an access to the sales configuration as well as statistic "
+"reports."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nz
+msgid "New Zealand"
+msgstr ""
+
+#. module: base
+#: field:ir.exports.line,name:0
+#: view:ir.model.fields:0
+#: field:res.partner.bank.type.field,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country
+msgid ""
+"Display and manage the list of all countries that can be assigned to your "
+"partner records. You can create or delete countries to make sure the ones "
+"you are working on will be maintained."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nf
+msgid "Norfolk Island"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KR) / 한국어 (KR)"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model:0
+msgid "The technical name of the model this field belongs to"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,action_id:0
+#: selection:ir.actions.server,state:0
+#: view:ir.values:0
+msgid "Client Action"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_subscription
+msgid ""
+"\n"
+"Create recurring documents.\n"
+"===========================\n"
+"\n"
+"This module allows to create new documents and add subscriptions on that "
+"document.\n"
+"\n"
+"e.g. To have an invoice generated automatically periodically:\n"
+"-------------------------------------------------------------\n"
+"    * Define a document type based on Invoice object\n"
+"    * Define a subscription whose source document is the document defined "
+"as\n"
+"      above. Specify the interval information and partner to be invoice.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "e.g. Global Business Solutions"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:674
+#: model:ir.model,name:base.model_ir_module_category
+#: field:ir.module.module,application:0
+#: field:res.groups,category_id:0
+#: view:res.users:0
+#, python-format
+msgid "Application"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_hr_manager
+msgid ""
+"the user will have an access to the human resources configuration as well as "
+"statistic reports."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:222
+#, python-format
+msgid "Connection Test Succeeded!"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params_store:0
+msgid "Params storage"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:525
+#, python-format
+msgid "Can not upgrade module '%s'. It is not installed."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cu
+msgid "Cuba"
+msgstr ""
+
+#. module: base
+#: code:addons/report_sxw.py:443
+#, python-format
+msgid "Unknown report type: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_expense
+msgid "Expenses Validation, Invoicing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
+msgid ""
+"\n"
+"Accounting Data for Belgian Payroll Rules.\n"
+"==========================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.am
+msgid "Armenia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_evaluation
+msgid "Periodical Evaluations, Appraisals, Surveys"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_property_form
+#: model:ir.ui.menu,name:base.menu_ir_property_form_all
+msgid "Configuration Parameters"
+msgstr ""
+
+#. module: base
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.se
+msgid "Sweden"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_file:0
+msgid "Report File"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Gantt"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in_hr_payroll
+msgid ""
+"\n"
+"Indian Payroll Salary Rules.\n"
+"============================\n"
+"\n"
+"    -Configuration of hr_payroll for India localization\n"
+"    -All main contributions rules for India payslip.\n"
+"    * New payslip report\n"
+"    * Employee Contracts\n"
+"    * Allow to configure Basic / Gross / Net Salary\n"
+"    * Employee PaySlip\n"
+"    * Allowance / Deduction\n"
+"    * Integrated with Holiday Management\n"
+"    * Medical Allowance, Travel Allowance, Child Allowance, ...\n"
+"    - Payroll Advice and Report\n"
+"    - Yearly Salary by Head and Yearly Salary by Employee Report\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
+#, python-format
+msgid "Missing document(s)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type
+#: field:res.partner.bank,state:0
+#: view:res.partner.bank.type:0
+msgid "Bank Account Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"For more details about translating OpenERP in your language, please refer to "
+"the"
+msgstr ""
+
+#. module: base
+#: field:res.partner,image:0
+msgid "Image"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.at
+msgid "Austria"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: model:ir.module.module,shortdesc:base.module_base_calendar
+#: model:ir.ui.menu,name:base.menu_calendar_configuration
+#: selection:ir.ui.view,type:0
+msgid "Calendar"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_knowledge_management
+msgid "Knowledge"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,signal_send:0
+msgid "Signal (subflow.*)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4685
+#, python-format
+msgid ""
+"Invalid \"order\" specified. A valid \"order\" specification is a comma-"
+"separated list of valid field names (optionally followed by asc/desc for the "
+"direction)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module_dependency
+msgid "Module dependency"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bd
+msgid "Bangladesh"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_contact
+msgid ""
+"Manage the contact titles you want to have available in your system and the "
+"way you want to print them in letters and other documents. Some example: "
+"Mr., Mrs. "
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:res.groups:0
+#: field:res.groups,model_access:0
+msgid "Access Controls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:277
+#, python-format
+msgid ""
+"The Selection Options expression is not a valid Pythonic expression.Please "
+"provide an expression in the [('key','Label'), ...] format."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_survey_user
+msgid "Survey / User"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,dependencies_id:0
+msgid "Dependencies"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover:0
+msgid "Web Icon File (hover)"
+msgstr ""
+
+#. module: base
+#: help:res.currency,name:0
+msgid "Currency Code (ISO 4217)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_contract
+msgid "Employee Contracts"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"If you use a formula type, use a python expression using the variable "
+"'object'."
+msgstr ""
+
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: base
+#: field:res.partner,birthdate:0
+msgid "Birthdate"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_contact
+#: model:ir.ui.menu,name:base.menu_partner_title_contact
+msgid "Contact Titles"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_manufacturer
+msgid "Products Manufacturers"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:240
+#, python-format
+msgid "SMTP-over-SSL mode unavailable"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_survey
+#: model:ir.ui.menu,name:base.next_id_10
+msgid "Survey"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (DO) / Español (DO)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_activity
+msgid "workflow.activity"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Complete"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view_sc,res_id:0
+msgid ""
+"Reference of the target resource, whose model/table depends on the 'Resource "
+"Name' field."
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,select_level:0
+msgid "Searchable"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uy
+msgid "Uruguay"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Finnish / Suomi"
+msgstr ""
+
+#. module: base
+#: view:ir.config_parameter:0
+msgid "System Properties"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "German / Deutsch"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:84
+#, python-format
+msgid "Unmet Dependency!"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_sir
+#: model:res.partner.title,shortcut:base.res_partner_title_sir
+msgid "Sir"
+msgstr "Señor"
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ca
+msgid ""
+"\n"
+"This is the module to manage the English and French - Canadian accounting "
+"chart in OpenERP.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Canadian accounting charts and localizations.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Select module package to import (.zip file):"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,modules:0
+msgid "Modules To Export"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mt
+msgid "Malta"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:732
+#, python-format
+msgid ""
+"Only users with the following access level are currently allowed to do that"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,fields_lines:0
+msgid "Field Mappings."
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "High"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp
+msgid ""
+"\n"
+"Manage the Manufacturing process in OpenERP\n"
+"===========================================\n"
+"\n"
+"The manufacturing module allows you to cover planning, ordering, stocks and "
+"the manufacturing or assembly of products from raw materials and components. "
+"It handles the consumption and production of products according to a bill of "
+"materials and the necessary operations on machinery, tools or human "
+"resources according to routings.\n"
+"\n"
+"It supports complete integration and planification of stockable goods, "
+"consumables or services. Services are completely integrated with the rest of "
+"the software. For instance, you can set up a sub-contracting service in a "
+"bill of materials to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Make to Stock/Make to Order\n"
+"* Multi-level bill of materials, no limit\n"
+"* Multi-level routing, no limit\n"
+"* Routing and work center integrated with analytic accounting\n"
+"* Periodical scheduler computation \n"
+"* Allows to browse bills of materials in a complete structure that includes "
+"child and phantom bills of materials\n"
+"\n"
+"Dashboard / Reports for MRP will include:\n"
+"-----------------------------------------\n"
+"* Procurements in Exception (Graph)\n"
+"* Stock Value Variation (Graph)\n"
+"* Work Order Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,description:0
+#: field:ir.mail_server,name:0
+#: field:ir.module.category,description:0
+#: view:ir.module.module:0
+#: field:ir.module.module,description:0
+msgid "Description"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_instance_form
+#: model:ir.ui.menu,name:base.menu_workflow_instance
+msgid "Instances"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_requisition
+msgid ""
+"\n"
+"This module allows you to manage your Purchase Requisition.\n"
+"===========================================================\n"
+"\n"
+"When a purchase order is created, you now have the opportunity to save the\n"
+"related requisition. This new object will regroup and will allow you to "
+"easily\n"
+"keep track and order all your purchase orders.\n"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_host:0
+msgid "Hostname or IP of SMTP server"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.aq
+msgid "Antarctica"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Persons"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: base
+#: field:res.users,action_id:0
+msgid "Home Action"
+msgstr ""
+
+#. module: base
+#: field:res.lang,grouping:0
+msgid "Separator Format"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_webkit
+msgid "Webkit Report Engine"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_9
+msgid "Database Structure"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_mass_mail
+msgid "Mass Mailing"
+msgstr "Envío masivo de correos"
+
+#. module: base
+#: model:res.country,name:base.yt
+msgid "Mayotte"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_todo
+msgid "Tasks on CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules_accounting
+#: view:res.company:0
+msgid "Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Interaction between rules"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_footer:0
+#: field:res.company,rml_footer_readonly:0
+msgid "Report Footer"
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Right-to-Left"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sx
+msgid "Sint Maarten (Dutch part)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.actions_ir_filters_view
+#: view:ir.filters:0
+#: model:ir.model,name:base.model_ir_filters
+msgid "Filters"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:67
+#, python-format
+msgid "Can not create the module file: %s!"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_cron_act
+#: view:ir.cron:0
+#: model:ir.ui.menu,name:base.menu_ir_cron_act
+msgid "Scheduled Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_reporting
+#: model:ir.ui.menu,name:base.menu_lunch_reporting
+#: model:ir.ui.menu,name:base.menu_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: base
+#: field:res.partner,title:0
+#: field:res.partner.title,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base
+#: help:ir.property,res_id:0
+msgid "If not set, acts as a default value for new resources"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4246
+#, python-format
+msgid "Recursivity Detected."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_user_function
+msgid ""
+"\n"
+"This module allows you to define what is the default function of a specific "
+"user on a given account.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"This is mostly used when a user encodes his timesheet: the values are "
+"retrieved\n"
+"and the fields are auto-filled. But the possibility to change these values "
+"is\n"
+"still available.\n"
+"\n"
+"Obviously if no data has been recorded for the current account, the default\n"
+"value is given as usual by the employee data so that this module is "
+"perfectly\n"
+"compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Create a Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tg
+msgid "Togo"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,res_model:0
+#: field:ir.actions.client,res_model:0
+msgid "Destination Model"
+msgstr ""
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ru
+msgid "Russian Federation"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Urdu / اردو"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:739
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
+#: code:addons/orm.py:3902
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: base
+#: field:res.company,name:0
+msgid "Company Name"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2808
+#, python-format
+msgid ""
+"Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
+"integer): \"%s\""
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country
+#: model:ir.ui.menu,name:base.menu_country_partner
+msgid "Countries"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "RML  (deprecated - use Report)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Search Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_calendar
+msgid ""
+"\n"
+"This is a full-featured calendar system.\n"
+"========================================\n"
+"\n"
+"It supports:\n"
+"------------\n"
+"    - Calendar of events\n"
+"    - Recurring events\n"
+"\n"
+"If you need to manage your meetings, you should install the CRM module.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.je
+msgid "Jersey"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "12. %w              ==> 5 ( Friday is the 6th day)"
+msgstr ""
+
+#. module: base
+#: constraint:res.partner.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%x - Appropriate date representation."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Tag"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%d - Day of the month [01,31]."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tj
+msgid "Tajikistan"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-2 or later version"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,kind:0
+msgid "Stop All"
+msgstr ""
+
+#. module: base
+#: field:res.company,paper_format:0
+msgid "Paper Format"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:644
+#, python-format
+msgid ""
+"Can not create the module file:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sk
+msgid "Slovakia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nr
+msgid "Nauru"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:166
+#, python-format
+msgid "Reg"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_property
+msgid "ir.property"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Form"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pf
+msgid "Polynesia (French)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_it
+msgid ""
+"\n"
+"Piano dei conti italiano di un'impresa generica.\n"
+"================================================\n"
+"\n"
+"Italian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.me
+msgid "Montenegro"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail
+msgid "Email Gateway"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:470
+#, python-format
+msgid ""
+"Mail delivery failed via SMTP server '%s'.\n"
+"%s: %s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tk
+msgid "Tokelau"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: view:ir.module.module:0
+msgid "Technical Data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_bank_statement_extensions
+msgid ""
+"\n"
+"Module that extends the standard account_bank_statement_line object for "
+"improved e-banking support.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"This module adds:\n"
+"-----------------\n"
+"    - valuta date\n"
+"    - batch payments\n"
+"    - traceability of changes to bank statement lines\n"
+"    - bank statement line views\n"
+"    - bank statements balances report\n"
+"    - performance improvements for digital import of bank statement (via \n"
+"      'ebanking_import' context flag)\n"
+"    - name_search on res.partner.bank enhanced to allow search on bank \n"
+"      and iban account numbers\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be upgraded"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ly
+msgid "Libya"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cf
+msgid "Central African Republic"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.li
+msgid "Liechtenstein"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue_sheet
+msgid "Timesheet on Issues"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_ltd
+msgid "Ltd"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
+#. module: base
+#: field:res.partner,ean13:0
+msgid "EAN13"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2247
+#, python-format
+msgid "Invalid Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pt
+msgid "Portugal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_share
+msgid "Share any Document"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "6.  %d, %m         ==> 05, 12"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_it
+msgid "Italy - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,help:0
+#: field:ir.actions.act_window,help:0
+#: field:ir.actions.act_window_close,help:0
+#: field:ir.actions.actions,help:0
+#: field:ir.actions.client,help:0
+#: field:ir.actions.report.xml,help:0
+#: field:ir.actions.server,help:0
+#: field:ir.actions.wizard,help:0
+msgid "Action description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ma
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Maroc.\n"
+"=================================================================\n"
+"\n"
+"Ce Module charge le modèle du plan de comptes standard Marocain et permet "
+"de\n"
+"générer les états comptables aux normes marocaines (Bilan, CPC (comptes de\n"
+"produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...).\n"
+"L'intégration comptable a été validé avec l'aide du Cabinet d'expertise "
+"comptable\n"
+"Seddik au cours du troisième trimestre 2010."
+msgstr ""
+
+#. module: base
+#: help:ir.module.module,auto_install:0
+msgid ""
+"An auto-installable module is automatically installed by the system when all "
+"its dependencies are satisfied. If the module has no dependency, it is "
+"always installed."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_lang_act_window
+#: model:ir.model,name:base.model_res_lang
+#: model:ir.ui.menu,name:base.menu_res_lang_act_window
+#: view:res.lang:0
+msgid "Languages"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization_account_charts
+msgid "Account Charts"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_event_main
+msgid "Events Organization"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_customer_form
+#: model:ir.actions.act_window,name:base.action_partner_form
+#: model:ir.ui.menu,name:base.menu_partner_form
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.au
+msgid "Australia"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Menu :"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Base Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
+msgid "Managing vehicles and contracts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_setup
+msgid ""
+"\n"
+"This module helps to configure the system at the installation of a new "
+"database.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Shows you a list of applications features to install from.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config
+msgid "res.config"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pl
+msgid "Poland - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Action to Trigger"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,name:0
+#: selection:ir.translation,type:0
+msgid "Constraint"
+msgstr ""
+
+#. module: base
+#: selection:ir.values,key:0
+#: selection:res.partner,type:0
+msgid "Default"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_lunch
+msgid "Lunch Order, Meal, Food"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,required:0
+#: field:res.partner.bank.type.field,required:0
+msgid "Required"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ro
+msgid "Romania"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,summary:0
+#: field:res.request.history,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden_dependency
+msgid "Dependency"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal
+msgid ""
+"\n"
+"Customize access to your OpenERP database to external users by creating "
+"portals.\n"
+"============================================================================="
+"===\n"
+"A portal defines a specific user menu and access rights for its members.  "
+"This\n"
+"menu can ben seen by portal members, anonymous users and any other user "
+"that\n"
+"have the access to technical features (e.g. the administrator).\n"
+"Also, each portal member is linked to a specific partner.\n"
+"\n"
+"The module also associates user groups to the portal users (adding a group "
+"in\n"
+"the portal automatically adds it to the portal users, etc).  That feature "
+"is\n"
+"very handy when used in combination with the module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Header/Footer"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,sequence:0
+msgid ""
+"When no specific mail server is requested for a mail, the highest priority "
+"one is used. Default priority is 10 (smaller number = higher priority)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
+#. module: base
+#: field:res.partner,parent_id:0
+msgid "Related Company"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_url,help:0
+#: help:ir.actions.act_window,help:0
+#: help:ir.actions.act_window_close,help:0
+#: help:ir.actions.actions,help:0
+#: help:ir.actions.client,help:0
+#: help:ir.actions.report.xml,help:0
+#: help:ir.actions.server,help:0
+#: help:ir.actions.wizard,help:0
+msgid ""
+"Optional help text for the users with a description of the target view, such "
+"as its usage and purpose."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.va
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_file:0
+msgid "Module .ZIP file"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_17
+msgid "Telecom sector"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_model:0
+msgid "Trigger Object"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.sequence.type:0
+msgid "`code` must be unique."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/workflow/workflow.py:99
+#, python-format
+msgid "Operation Forbidden"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_knowledge
+msgid "Knowledge Management System"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,in_transitions:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.values,value_unpickle:0
+msgid "Default value or action reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_sequence
+msgid ""
+"\n"
+"This module maintains internal sequence number for accounting entries.\n"
+"======================================================================\n"
+"\n"
+"Allows you to configure the accounting sequences to be maintained.\n"
+"\n"
+"You can customize the following attributes of the sequence:\n"
+"-----------------------------------------------------------\n"
+"    * Prefix\n"
+"    * Suffix\n"
+"    * Next Number\n"
+"    * Increment Number\n"
+"    * Number Padding\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_timesheet
+msgid "Bill Time on Tasks"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_marketing
+#: model:ir.module.module,shortdesc:base.module_marketing
+#: model:ir.ui.menu,name:base.marketing_menu
+#: model:ir.ui.menu,name:base.menu_report_marketing
+msgid "Marketing"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_calendar
+msgid ""
+"\n"
+"OpenERP Web Calendar view.\n"
+"==========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (HN) / Español (HN)"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequence Type"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Unicode/UTF-8"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hindi / हिंदी"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+#: model:ir.actions.act_window,name:base.action_view_base_language_install
+#: model:ir.ui.menu,name:base.menu_view_base_language_install
+msgid "Load a Translation"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,latest_version:0
+msgid "Installed Version"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,license:0
+msgid "License"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,url:0
+msgid "Url"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "SQL Constraint"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,groups_id:0
+msgid ""
+"If you have groups, the visibility of this menu will be based on these "
+"groups. If this field is empty, OpenERP will compute visibility based on the "
+"related object's read access."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,srcmodel_id:0
+#: view:ir.filters:0
+#: field:ir.filters,model_id:0
+#: view:ir.model:0
+#: field:ir.model,model:0
+#: field:ir.model.constraint,model:0
+#: field:ir.model.fields,model_id:0
+#: field:ir.model.relation,model:0
+#: view:ir.values:0
+msgid "Model"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"The selected language has been successfully installed. You must change the "
+"preferences of the user and open a new menu to view the changes."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,view_id:0
+#: field:ir.default,page:0
+#: selection:ir.translation,type:0
+#: view:ir.ui.view:0
+msgid "View"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_partner_assign
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to its partners, "
+"based on geolocalization.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"You can geolocalize your opportunities by using this module.\n"
+"\n"
+"Use geolocalization when assigning opportunities to partners.\n"
+"Determine the GPS coordinates according to the address of the partner.\n"
+"\n"
+"The most appropriate partner can be assigned.\n"
+"You can also use the geolocalization without using the GPS coordinates.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open a Window"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gq
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_api
+msgid "OpenERP Web API"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_rib
+msgid ""
+"\n"
+"This module lets users enter the banking details of Partners in the RIB "
+"format (French standard for bank accounts details).\n"
+"============================================================================="
+"==============================================\n"
+"\n"
+"RIB Bank Accounts can be entered in the \"Accounting\" tab of the Partner "
+"form by specifying the account type \"RIB\". \n"
+"\n"
+"The four standard RIB fields will then become mandatory:\n"
+"--------------------------------------------------------    \n"
+"    - Bank Code\n"
+"    - Office Code\n"
+"    - Account number\n"
+"    - RIB key\n"
+"    \n"
+"As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, "
+"and\n"
+"will refuse to record the data if the key is incorrect. Please bear in mind "
+"that\n"
+"this can only happen when the user presses the 'save' button, for example on "
+"the\n"
+"Partner Form. Since each bank account may relate to a Bank, users may enter "
+"the\n"
+"RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the "
+"RIB\n"
+"when they select the Bank. To make this easier, this module will also let "
+"users\n"
+"find Banks using their RIB code.\n"
+"\n"
+"The module base_iban can be a useful addition to this module, because French "
+"banks\n"
+"are now progressively adopting the international IBAN format instead of the "
+"RIB format.\n"
+"The RIB and IBAN codes for a single account can be entered by recording two "
+"Bank\n"
+"Accounts in OpenERP: the first with the type 'RIB', the second with the type "
+"'IBAN'. \n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ps
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ch
+msgid "Switzerland - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,zip:0
+#: field:res.company,zip:0
+#: field:res.partner,zip:0
+#: field:res.partner.bank,zip:0
+msgid "Zip"
+msgstr "Código Postal o Distrito"
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,author:0
+msgid "Author"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%c - Appropriate date and time representation."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:420
+#, python-format
+msgid ""
+"Your database is now fully configured.\n"
+"\n"
+"Click 'Continue' and enjoy your OpenERP experience..."
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_next_actual:0
+msgid ""
+"Next number that will be used. This number can be incremented frequently so "
+"the displayed value might already be obsolete"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_marketing
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hebrew / עִבְרִי"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bo
+msgid "Bolivia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gh
+msgid "Ghana"
+msgstr ""
+
+#. module: base
+#: field:res.lang,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4815
+#, python-format
+msgid "Sorting field %s not found on model %s"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.action_ui_view
+#: field:ir.actions.act_window,view_ids:0
+#: field:ir.actions.act_window,views:0
+#: view:ir.model:0
+#: field:ir.model,view_ids:0
+#: field:ir.module.module,views_by_module:0
+#: model:ir.ui.menu,name:base.menu_action_ui_view
+#: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
+msgid "Views"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+#: field:res.groups,rule_groups:0
+msgid "Rules"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_host:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:320
+#, python-format
+msgid "You try to remove a module that is installed or will be installed"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "The selected modules have been updated / installed !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PR) / Español (PR)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_profiling
+msgid ""
+"\n"
+"This module allows users to perform segmentation within partners.\n"
+"=================================================================\n"
+"\n"
+"It uses the profiles criteria from the earlier segmentation module and "
+"improve it. \n"
+"Thanks to the new concept of questionnaire. You can now regroup questions "
+"into a \n"
+"questionnaire and directly use it on a partner.\n"
+"\n"
+"It also has been merged with the earlier CRM & SRM segmentation tool because "
+"they \n"
+"were overlapping.\n"
+"\n"
+"    **Note:** this module is not compatible with the module segmentation, "
+"since it's the same which has been renamed.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gt
+msgid "Guatemala"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,message:0
+msgid ""
+"Email contents, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Dear [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_form
+#: model:ir.ui.menu,name:base.menu_workflow
+#: model:ir.ui.menu,name:base.menu_workflow_root
+msgid "Workflows"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_73
+msgid "Purchase"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portuguese (BR) / Português (BR)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_needaction_mixin
+msgid "ir.needaction_mixin"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "This file was generated using the universal"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_7
+msgid "IT Services"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_specific_industry_applications
+msgid "Specific Industry Applications"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_docs
+msgid "Google Docs integration"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
+#, python-format
+msgid "name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_operations
+msgid ""
+"\n"
+"This module adds state, date_start, date_stop in manufacturing order "
+"operation lines (in the 'Work Orders' tab).\n"
+"============================================================================="
+"===================================\n"
+"\n"
+"Status: draft, confirm, done, cancel\n"
+"When finishing/confirming, cancelling manufacturing orders set all state "
+"lines\n"
+"to the according state.\n"
+"\n"
+"Create menus:\n"
+"-------------\n"
+"    **Manufacturing** > **Manufacturing** > **Work Orders**\n"
+"\n"
+"Which is a view on 'Work Orders' lines in manufacturing order.\n"
+"\n"
+"Add buttons in the form view of manufacturing order under workorders tab:\n"
+"-------------------------------------------------------------------------\n"
+"    * start (set state to confirm), set date_start\n"
+"    * done (set state to done), set date_stop\n"
+"    * set to draft (set state to draft)\n"
+"    * cancel set state to cancel\n"
+"\n"
+"When the manufacturing order becomes 'ready to produce', operations must\n"
+"become 'confirmed'. When the manufacturing order is done, all operations\n"
+"must become done.\n"
+"\n"
+"The field 'Working Hours' is the delay(stop date - start date).\n"
+"So, that we can compare the theoretic delay and real delay. \n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Skip"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event_sale
+msgid "Events Sales"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ls
+msgid "Lesotho"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ", or your preferred text editor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_partner_assign
+msgid "Partners Geo-Localization"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ke
+msgid "Kenya"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_translation
+#: model:ir.ui.menu,name:base.menu_action_translation
+msgid "Translated Terms"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Abkhazian / аҧсуа"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid "System Configuration Done"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1540
+#, python-format
+msgid "Error occurred while validating the field(s) %s: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Generic"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_ftp
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sm
+msgid "San Marino"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bm
+msgid "Bermuda"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pe
+msgid "Peru"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Set NULL"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Save"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xml:0
+msgid "XML Path"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bj
+msgid "Benin"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
+msgid "Bank Account Types"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_user:0
+msgid "Optional username for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_actions
+msgid "ir.actions.actions"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Not Searchable"
+msgstr ""
+
+#. module: base
+#: view:ir.config_parameter:0
+#: field:ir.config_parameter,key:0
+msgid "Key"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header:0
+msgid "RML Header"
+msgstr ""
+
+#. module: base
+#: help:res.country,address_format:0
+msgid ""
+"You can state here the usual format to use for the addresses belonging to "
+"this country.\n"
+"\n"
+"You can use the python-style string patern with all the field of the address "
+"(for example, use '%(street)s' to display the field 'street') plus\n"
+"            \n"
+"%(state_name)s: the name of the state\n"
+"            \n"
+"%(state_code)s: the code of the state\n"
+"            \n"
+"%(country_name)s: the name of the country\n"
+"            \n"
+"%(country_code)s: the code of the country"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mu
+msgid "Mauritius"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+msgid "Full Access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: model:ir.ui.menu,name:base.menu_security
+msgid "Security"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portuguese / Português"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:372
+#, python-format
+msgid "Changing the storing system for field \"%s\" is not allowed."
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,company_id:0
+msgid "Only if this bank account belong to your company"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:337
+#, python-format
+msgid "Unknown sub-field '%s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.za
+msgid "South Africa"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Installed"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Ukrainian / українська"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sn
+msgid "Senegal"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hu
+msgid "Hungary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_recruitment
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.br
+msgid "Brazil"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%M - Minute [00,59]."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Affero GPL-3"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_next:0
+#: field:ir.sequence,number_next_actual:0
+msgid "Next Number"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,condition:0
+msgid "Expression to be satisfied if we want the transition done."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PA) / Español (PA)"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+#: field:res.currency,rate_ids:0
+msgid "Rates"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sy
+msgid "Syria"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "======================================================"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization
+#: model:ir.ui.menu,name:base.menu_localisation
+msgid "Localization"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_api
+msgid ""
+"\n"
+"Openerp Web API.\n"
+"================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "draft"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+#: field:res.currency,date:0
+#: field:res.currency.rate,name:0
+#: field:res.partner,date:0
+#: field:res.request,date_sent:0
+msgid "Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event_moodle
+msgid "Event Moodle"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_email_template
+msgid ""
+"\n"
+"Email Templating (simplified version of the original Power Email by "
+"Openlabs).\n"
+"============================================================================="
+"=\n"
+"\n"
+"Lets you design complete email templates related to any OpenERP document "
+"(Sale\n"
+"Orders, Invoices and so on), including sender, recipient, subject, body "
+"(HTML and\n"
+"Text). You may also automatically attach files to your templates, or print "
+"and\n"
+"attach a report.\n"
+"\n"
+"For advanced use, the templates may include dynamic attributes of the "
+"document\n"
+"they are related to. For example, you may use the name of a Partner's "
+"country\n"
+"when writing to them, also providing a safe default in case the attribute "
+"is\n"
+"not defined. Each template contains a built-in assistant to help with the\n"
+"inclusion of these dynamic values.\n"
+"\n"
+"If you enable the option, a composition assistant will also appear in the "
+"sidebar\n"
+"of the OpenERP documents to which the template applies (e.g. Invoices).\n"
+"This serves as a quick way to send a new email based on the template, after\n"
+"reviewing and adapting the contents, if needed.\n"
+"This composition assistant will also turn into a mass mailing system when "
+"called\n"
+"for multiple documents at once.\n"
+"\n"
+"These email templates are also at the heart of the marketing campaign "
+"system\n"
+"(see the ``marketing_campaign`` application), if you need to automate "
+"larger\n"
+"campaigns on any OpenERP document.\n"
+"\n"
+"    **Technical note:** only the templating system of the original Power "
+"Email by Openlabs was kept.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_partner_category_form
+msgid "Partner Tags"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Preview Header/Footer"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_id:0
+#: field:wizard.ir.model.menu.create,menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,owner_name:0
+msgid "Account Owner Name"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:420
+#, python-format
+msgid "Cannot rename column to %s, because that column already exists!"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr ""
+
+#. module: base
+#: field:res.lang,decimal_point:0
+msgid "Decimal Separator"
+msgstr "Separador Decimal"
+
+#. module: base
+#: code:addons/orm.py:5319
+#, python-format
+msgid "Missing required value for the field '%s'."
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Write Access Right"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_groups
+msgid ""
+"A group is a set of functional areas that will be assigned to the user in "
+"order to give them access and rights to specific applications and tasks in "
+"the system. You can create custom groups or edit the ones existing by "
+"default in order to customize the view of the menu that users will be able "
+"to see. Whether they can have a read, write, create and delete access right "
+"can be managed from here."
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+#: field:ir.filters,name:0
+msgid "Filter Name"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: view:res.partner:0
+#: field:res.request,history:0
+msgid "History"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.im
+msgid "Isle of Man"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,res_model:0
+msgid "Optional model, mostly used for needactions."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bv
+msgid "Bouvet Island"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,type:0
+msgid "Constraint Type"
+msgstr ""
+
+#. module: base
+#: field:res.company,child_ids:0
+msgid "Child Companies"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ni
+msgid "Nicaragua"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_invoice_directly
+msgid ""
+"\n"
+"Invoice Wizard for Delivery.\n"
+"============================\n"
+"\n"
+"When you send or deliver goods, this module automatically launch the "
+"invoicing\n"
+"wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.property,fields_id:0
+#: selection:ir.translation,type:0
+#: field:multi_company.default,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_long_term
+msgid "Long Term Projects"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ve
+msgid "Venezuela"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "9.  %j              ==> 340"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zm
+msgid "Zambia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch Configuration Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_mrp
+msgid "Manufacturing Orders, Bill of Materials, Routing"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Upgrade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_webkit
+msgid ""
+"\n"
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"\n"
+"The module allows:\n"
+"------------------\n"
+"    - HTML report definition\n"
+"    - Multi header support\n"
+"    - Multi logo\n"
+"    - Multi company support\n"
+"    - HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+"    - JavaScript support\n"
+"    - Raw HTML debugger\n"
+"    - Book printing capabilities\n"
+"    - Margins definition\n"
+"    - Paper size definition\n"
+"\n"
+"Multiple headers and logos can be defined per company. CSS style, header "
+"and\n"
+"footer body are defined per company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Requirements and Installation:\n"
+"------------------------------\n"
+"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"as\n"
+"PDF. Version 0.9.9 or later is necessary, and can be found at\n"
+"http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
+"(32bits).\n"
+"\n"
+"After installing the library on the OpenERP Server machine, you need to set "
+"the\n"
+"path to the ``wkthtmltopdf`` executable file on each Company.\n"
+"\n"
+"If you are experiencing missing header/footer problems on Linux, be sure to\n"
+"install a 'static' version of the library. The default ``wkhtmltopdf`` on\n"
+"Ubuntu is known to have this issue.\n"
+"\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    * JavaScript support activation deactivation\n"
+"    * Collated and book format support\n"
+"    * Zip return for separated PDF\n"
+"    * Web client WYSIWYG\n"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman_all_leads
+msgid "See all Leads"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ci
+msgid "Ivory Coast (Cote D'Ivoire)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kz
+msgid "Kazakhstan"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%w - Weekday number [0(Sunday),6]."
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_ir_filters
+msgid "User-defined Filters"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window_close,name:0
+#: field:ir.actions.actions,name:0
+#: field:ir.actions.report.xml,name:0
+#: field:ir.actions.todo,name:0
+#: field:ir.cron,name:0
+#: field:ir.model.access,name:0
+#: field:ir.model.fields,name:0
+#: field:ir.module.category,name:0
+#: field:ir.module.module.dependency,name:0
+#: report:ir.module.reference:0
+#: view:ir.property:0
+#: field:ir.property,name:0
+#: field:ir.rule,name:0
+#: field:ir.sequence,name:0
+#: field:ir.sequence.type,name:0
+#: field:ir.values,name:0
+#: view:multi_company.default:0
+#: field:multi_company.default,name:0
+#: field:res.bank,name:0
+#: view:res.currency.rate.type:0
+#: field:res.currency.rate.type,name:0
+#: field:res.groups,name:0
+#: field:res.lang,name:0
+#: view:res.partner:0
+#: field:res.partner,name:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank.type,name:0
+#: field:res.request.link,name:0
+#: view:res.users:0
+#: field:workflow,name:0
+#: field:workflow.activity,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ms
+msgid "Montserrat"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_decimal_precision
+msgid "Decimal Precision Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_url
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.act_url"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_app
+msgid "Application Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.open_module_tree
+msgid ""
+"<p><b>No module found!</b></p>\n"
+"              <p>You should try others search criteria.</p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module
+#: field:ir.model.constraint,module:0
+#: view:ir.model.data:0
+#: field:ir.model.data,module:0
+#: field:ir.model.relation,module:0
+#: view:ir.module.module:0
+#: field:ir.module.module.dependency,module_id:0
+#: report:ir.module.reference:0
+#: field:ir.translation,module:0
+msgid "Module"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (UK)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Japanese / 日本語"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_import
+msgid "Language Import"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_from:0
+msgid ""
+"Source activity. When this activity is over, the condition is tested to "
+"determine if we can start the ACT_TO activity."
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation_field:0
+msgid ""
+"For one2many fields, the field on the target model that implement the "
+"opposite many2one relationship"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_vat
+msgid ""
+"\n"
+"VAT validation for Partner's VAT numbers.\n"
+"=========================================\n"
+"\n"
+"After installing this module, values entered in the VAT field of Partners "
+"will\n"
+"be validated for all supported countries. The country is inferred from the\n"
+"2-letter country code that prefixes the VAT number, e.g. ``BE0477472701``\n"
+"will be validated using the Belgian rules.\n"
+"\n"
+"There are two different levels of VAT number validation:\n"
+"--------------------------------------------------------\n"
+"    * By default, a simple off-line check is performed using the known "
+"validation\n"
+"      rules for the country, usually a simple check digit. This is quick and "
+"\n"
+"      always available, but allows numbers that are perhaps not truly "
+"allocated,\n"
+"      or not valid anymore.\n"
+"      \n"
+"    * When the \"VAT VIES Check\" option is enabled (in the configuration of "
+"the user's\n"
+"      Company), VAT numbers will be instead submitted to the online EU VIES\n"
+"      database, which will truly verify that the number is valid and "
+"currently\n"
+"      allocated to a EU company. This is a little bit slower than the "
+"simple\n"
+"      off-line check, requires an Internet connection, and may not be "
+"available\n"
+"      all the time. If the service is not available or does not support the\n"
+"      requested country (e.g. for non-EU countries), a simple check will be "
+"performed\n"
+"      instead.\n"
+"\n"
+"Supported countries currently include EU countries, and a few non-EU "
+"countries\n"
+"such as Chile, Colombia, Mexico, Norway or Russia. For unsupported "
+"countries,\n"
+"only the country code will be validated.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_view
+msgid "ir.actions.act_window.view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web
+#: report:ir.module.reference:0
+msgid "Web"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_lunch
+msgid "Lunch Orders"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (CA)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_human_resources
+msgid "Human Resources"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_syscohada
+msgid ""
+"\n"
+"This module implements the accounting chart for OHADA area.\n"
+"===========================================================\n"
+"    \n"
+"It allows any company or association to manage its financial accounting.\n"
+"\n"
+"Countries that use OHADA are the following:\n"
+"-------------------------------------------\n"
+"    Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, "
+"Congo,\n"
+"    \n"
+"    Ivory Coast, Gabon, Guinea, Guinea Bissau, Equatorial Guinea, Mali, "
+"Niger,\n"
+"    \n"
+"    Replica of Democratic Congo, Senegal, Chad, Togo.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Comments"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.et
+msgid "Ethiopia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_authentication
+msgid "Authentication"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gd
+msgid "Grenada"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_wizard
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_kanban
+msgid "Base Kanban"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.server:0
+msgid "Group By"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "true"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_install
+msgid "Install Language"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_11
+msgid "Services"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Translation"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "closed"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "get"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,on_delete:0
+msgid "On delete property for many2one fields"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_accounting_and_finance
+msgid "Accounting & Finance"
+msgstr "Contabilidad y Finanzas"
+
+#. module: base
+#: field:ir.actions.server,write_id:0
+msgid "Write Id"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_product
+msgid "Products"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_defaults
+#: model:ir.ui.menu,name:base.menu_values_form_defaults
+#: view:ir.values:0
+msgid "User-defined Defaults"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_usability
+#: view:res.users:0
+msgid "Usability"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,domain:0
+msgid "Domain Value"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_association
+msgid ""
+"\n"
+"This module is to configure modules related to an association.\n"
+"==============================================================\n"
+"\n"
+"It installs the profile for associations to manage events, registrations, "
+"memberships, \n"
+"membership products (schemes).\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_config
+#: model:ir.ui.menu,name:base.menu_config
+#: model:ir.ui.menu,name:base.menu_definitions
+#: model:ir.ui.menu,name:base.menu_event_config
+#: model:ir.ui.menu,name:base.menu_lunch_survey_root
+#: model:ir.ui.menu,name:base.menu_marketing_config_association
+#: model:ir.ui.menu,name:base.menu_marketing_config_root
+#: model:ir.ui.menu,name:base.menu_reporting_config
+#: view:res.company:0
+#: view:res.config:0
+msgid "Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_edi
+msgid ""
+"\n"
+"Provides a common EDI platform that other Applications can use.\n"
+"===============================================================\n"
+"\n"
+"OpenERP specifies a generic EDI format for exchanging business documents "
+"between \n"
+"different systems, and provides generic mechanisms to import and export "
+"them.\n"
+"\n"
+"More details about OpenERP's EDI format may be found in the technical "
+"OpenERP \n"
+"documentation at http://doc.openerp.com.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "SMS Configuration"
+msgstr ""
+
+#. module: base
+#: help:ir.rule,active:0
+msgid ""
+"If you uncheck the active field, it will disable the record rule without "
+"deleting it (if you delete a native record rule, it may be re-created when "
+"you reload the module."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (BO) / Español (BO)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_board
+msgid ""
+"\n"
+"Lets the user create a custom dashboard.\n"
+"========================================\n"
+"\n"
+"Allows users to create custom dashboard.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_access_act
+#: model:ir.ui.menu,name:base.menu_ir_access_act
+msgid "Access Controls List"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.um
+msgid "USA Minor Outlying Islands"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "e.g. English"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,numbercall:0
+msgid ""
+"How many times the method is called,\n"
+"a negative number indicates no limit."
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type.field,bank_type_id:0
+msgid "Bank Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:99
+#, python-format
+msgid "The name of the group can not start with \"-\""
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
+#: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
+msgid "Apps"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view_sc:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,date_init:0
+msgid "Init Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Gujarati / ગુજરાતી"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:361
+#, python-format
+msgid ""
+"Unable to process module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
+msgid "Belgium - Payroll"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_start:0
+msgid "Flow Start"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_title
+msgid "res.partner.title"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank Account Owner"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_uncategorized
+msgid "Uncategorized"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
+
+#. module: base
+#: field:res.partner,is_company:0
+msgid "Is a Company"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "e.g. www.openerp.com"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gp
+msgid "Guadeloupe (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:185
+#: code:addons/base/res/res_lang.py:187
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,signal:0
+msgid ""
+"When the operation of transition comes from a button pressed in the client "
+"form, signal tests the name of the pressed button. If signal is NULL, no "
+"button is necessary to validate this transition."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_kanban
+msgid ""
+"\n"
+"OpenERP Web kanban view.\n"
+"========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:182
+#, python-format
+msgid "'%s' does not seem to be a number for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: help:res.country.state,name:0
+msgid ""
+"Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
+msgstr ""
+"División administrativa de un país. Por ejemplo Departamento, Provincia, "
+"Distrito"
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "My Banks"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.filters:0
+msgid "Filter names must be unique"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,object_id:0
+msgid "Object affected by this rule"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Inline View"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,is_default:0
+msgid "Default filter"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Directory"
+msgstr ""
+
+#. module: base
+#: field:wizard.ir.model.menu.create,name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: base
+#: field:ir.values,key2:0
+msgid "Qualifier"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_vn
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Vietnam in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"This module applies to companies based in Vietnamese Accounting Standard "
+"(VAS).\n"
+"\n"
+"**Credits:** General Solutions.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_coda
+msgid ""
+"\n"
+"Module to import CODA bank statements.\n"
+"======================================\n"
+"\n"
+"Supported are CODA flat files in V2 format from Belgian bank accounts.\n"
+"----------------------------------------------------------------------\n"
+"    * CODA v1 support.\n"
+"    * CODA v2.2 support.\n"
+"    * Foreign Currency support.\n"
+"    * Support for all data record types (0, 1, 2, 3, 4, 8, 9).\n"
+"    * Parsing & logging of all Transaction Codes and Structured Format \n"
+"      Communications.\n"
+"    * Automatic Financial Journal assignment via CODA configuration "
+"parameters.\n"
+"    * Support for multiple Journals per Bank Account Number.\n"
+"    * Support for multiple statements from different bank accounts in a "
+"single \n"
+"      CODA file.\n"
+"    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' "
+"in \n"
+"      the CODA Bank Account configuration records).\n"
+"    * Multi-language CODA parsing, parsing configuration data provided for "
+"EN, \n"
+"      NL, FR.\n"
+"\n"
+"The machine readable CODA Files are parsed and stored in human readable "
+"format in \n"
+"CODA Bank Statements. Also Bank Statements are generated containing a subset "
+"of \n"
+"the CODA information (only those transaction lines that are required for the "
+"\n"
+"creation of the Financial Accounting records). The CODA Bank Statement is a "
+"\n"
+"'read-only' object, hence remaining a reliable representation of the "
+"original\n"
+"CODA file whereas the Bank Statement will get modified as required by "
+"accounting \n"
+"business processes.\n"
+"\n"
+"CODA Bank Accounts configured as type 'Info' will only generate CODA Bank "
+"Statements.\n"
+"\n"
+"A removal of one object in the CODA processing results in the removal of the "
+"\n"
+"associated objects. The removal of a CODA File containing multiple Bank \n"
+"Statements will also remove those associated statements.\n"
+"\n"
+"The following reconciliation logic has been implemented in the CODA "
+"processing:\n"
+"-----------------------------------------------------------------------------"
+"--\n"
+"    1) The Company's Bank Account Number of the CODA statement is compared "
+"against \n"
+"       the Bank Account Number field of the Company's CODA Bank Account \n"
+"       configuration records (whereby bank accounts defined in type='info' \n"
+"       configuration records are ignored). If this is the case an 'internal "
+"transfer'\n"
+"       transaction is generated using the 'Internal Transfer Account' field "
+"of the \n"
+"       CODA File Import wizard.\n"
+"    2) As a second step the 'Structured Communication' field of the CODA "
+"transaction\n"
+"       line is matched against the reference field of in- and outgoing "
+"invoices \n"
+"       (supported : Belgian Structured Communication Type).\n"
+"    3) When the previous step doesn't find a match, the transaction "
+"counterparty is \n"
+"       located via the Bank Account Number configured on the OpenERP "
+"Customer and \n"
+"       Supplier records.\n"
+"    4) In case the previous steps are not successful, the transaction is "
+"generated \n"
+"       by using the 'Default Account for Unrecognized Movement' field of the "
+"CODA \n"
+"       File Import wizard in order to allow further manual processing.\n"
+"\n"
+"In stead of a manual adjustment of the generated Bank Statements, you can "
+"also \n"
+"re-import the CODA after updating the OpenERP database with the information "
+"that \n"
+"was missing to allow automatic reconciliation.\n"
+"\n"
+"Remark on CODA V1 support:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"In some cases a transaction code, transaction category or structured \n"
+"communication code has been given a new or clearer description in CODA "
+"V2.The\n"
+"description provided by the CODA configuration tables is based upon the CODA "
+"\n"
+"V2.2 specifications.\n"
+"If required, you can manually adjust the descriptions via the CODA "
+"configuration menu.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Month"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.my
+msgid "Malaysia"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_sequence.py:134
+#: code:addons/base/ir/ir_sequence.py:160
+#, python-format
+msgid "Increment number must not be zero."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_cancel
+msgid "Cancel Journal Entries"
+msgstr ""
+
+#. module: base
+#: field:res.partner,tz_offset:0
+msgid "Timezone offset"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"The campaigns are dynamic and multi-channels. The process is as follows:\n"
+"------------------------------------------------------------------------\n"
+"    * Design marketing campaigns like workflows, including email templates "
+"to\n"
+"      send, reports to print and send by email, custom actions\n"
+"    * Define input segments that will select the items that should enter "
+"the\n"
+"      campaign (e.g leads from certain countries.)\n"
+"    * Run you campaign in simulation mode to test it real-time or "
+"accelerated,\n"
+"      and fine-tune it\n"
+"    * You may also start the real campaign in manual mode, where each "
+"action\n"
+"      requires manual validation\n"
+"    * Finally launch your campaign live, and watch the statistics as the\n"
+"      campaign does everything fully automatically.\n"
+"\n"
+"While the campaign runs you can of course continue to fine-tune the "
+"parameters,\n"
+"input segments, workflow.\n"
+"\n"
+"**Note:** If you need demo data, you can install the "
+"marketing_campaign_crm_demo\n"
+"      module, but this will also install the CRM application as it depends "
+"on\n"
+"      CRM Leads.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_debug:0
+msgid ""
+"If enabled, the full output of SMTP sessions will be written to the server "
+"log at DEBUG level(this is very verbose and may include confidential info!)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_margin
+msgid ""
+"\n"
+"This module adds the 'Margin' on sales order.\n"
+"=============================================\n"
+"\n"
+"This gives the profitability by calculating the difference between the Unit\n"
+"Price and Cost Price.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Automatically"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,translate:0
+msgid ""
+"Whether values for this field can be translated (enables the translation "
+"mechanism for that field)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Indonesian / Bahasa Indonesia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cv
+msgid "Cape Verde"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_salesman
+msgid "the user will have access to his own data in the sales application."
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_user
+msgid ""
+"the user will be able to manage his own human resources stuff (leave "
+"request, timesheets, ...), if he is linked to an employee in the system."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2247
+#, python-format
+msgid "There is no view of type '%s' defined for the structure!"
+msgstr ""
+
+#. module: base
+#: help:ir.values,key:0
+msgid ""
+"- Action: an action attached to one slot of the given model\n"
+"- Default: a default value for a model field"
+msgstr ""
+
+#. module: base
+#: field:base.module.update,add:0
+msgid "Number of modules added"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Price Accuracy"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Latvian / latviešu valoda"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French / Français"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Menus"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:502
+#: view:ir.module.module:0
+#, python-format
+msgid "Uninstall"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_budget
+msgid "Budgets Management"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,workitem_id:0
+msgid "Workitem"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_anonymization
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: base
+#: field:res.partner,commercial_partner_id:0
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "SSL/TLS"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.act_window.view,act_window_id:0
+#: view:ir.actions.actions:0
+#: field:ir.actions.todo,action_id:0
+#: field:ir.ui.menu,action:0
+#: selection:ir.values,key:0
+msgid "Action"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Email Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_sales_followup
+msgid "Payment Follow-up"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cw
+msgid "Curaçao"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year without Century: %(y)s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_es
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,tag:0
+msgid ""
+"An arbitrary string, interpreted by the client according to its own needs "
+"and wishes. There is no central tag repository across clients."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.rule:0
+msgid "Rule must have at least one checked access right !"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,format_layout:0
+msgid "Format Layout"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_ftp
+msgid ""
+"\n"
+"This is a support FTP Interface with document management system.\n"
+"================================================================\n"
+"\n"
+"With this module you would not only be able to access documents through "
+"OpenERP\n"
+"but you would also be able to connect with them through the file system "
+"using the\n"
+"FTP client.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,size:0
+msgid "Size"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_audittrail
+msgid "Audit Trail"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:264
+#, python-format
+msgid "Value '%s' not found in selection field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sd
+msgid "Sudan"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_rate_type_form
+#: model:ir.model,name:base.model_res_currency_rate_type
+#: field:res.currency.rate,currency_rate_type_id:0
+#: view:res.currency.rate.type:0
+msgid "Currency Rate Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid ""
+"You cannot delete the language which is Active!\n"
+"Please de-activate the language first."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for France in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"This module applies to companies based in France mainland. It doesn't apply "
+"to\n"
+"companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, "
+"Mayotte).\n"
+"\n"
+"This localisation module creates the VAT taxes of type 'tax included' for "
+"purchases\n"
+"(it is notably required when you use the module 'hr_expense'). Beware that "
+"these\n"
+"'tax included' VAT taxes are not managed by the fiscal positions provided by "
+"this\n"
+"module (because it is complex to manage both 'tax excluded' and 'tax "
+"included'\n"
+"scenarios in fiscal positions).\n"
+"\n"
+"This localisation module doesn't properly handle the scenario when a France-"
+"mainland\n"
+"company sells services to a company based in the DOMs. We could manage it in "
+"the\n"
+"fiscal positions, but it would require to differentiate between 'product' "
+"VAT taxes\n"
+"and 'service' VAT taxes. We consider that it is too 'heavy' to have this by "
+"default\n"
+"in l10n_fr; companies that sell services to DOM-based companies should "
+"update the\n"
+"configuration of their taxes and fiscal positions manually.\n"
+"\n"
+"**Credits:** Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fm
+msgid "Micronesia"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,menus_by_module:0
+#: view:res.groups:0
+msgid "Menus"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually Once"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+#: view:workflow.activity:0
+#: field:workflow.activity,wkf_id:0
+#: field:workflow.instance,wkf_id:0
+#: field:workflow.transition,wkf_id:0
+#: field:workflow.workitem,wkf_id:0
+msgid "Workflow"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Latin) / srpski"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.il
+msgid "Israel"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:475
+#, python-format
+msgid "Cannot duplicate configuration!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_syscohada
+msgid "OHADA - Accounting"
+msgstr ""
+
+#. module: base
+#: help:res.bank,bic:0
+msgid "Sometimes called BIC or Swift."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in
+msgid "Indian - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.lang,time_format:0
+msgid "Time Format"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header3:0
+msgid "RML Internal Header for Landscape Reports"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_partner_manager
+msgid "Contact Creation"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Defined Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_gtd
+msgid "Todo Lists"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report xml"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_module_open_categ
+#: field:ir.module.category,module_ids:0
+#: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.menu_management
+msgid "Modules"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: selection:workflow.activity,kind:0
+#: field:workflow.activity,subflow_id:0
+#: field:workflow.workitem,subflow_id:0
+msgid "Subflow"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_bank_form
+#: model:ir.ui.menu,name:base.menu_action_res_bank_form
+#: view:res.bank:0
+#: field:res.partner,bank_ids:0
+msgid "Banks"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web
+msgid ""
+"\n"
+"OpenERP Web core module.\n"
+"========================\n"
+"\n"
+"This module provides the core of the OpenERP Web Client.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Week of the Year: %(woy)s"
+msgstr ""
+
+#. module: base
+#: field:res.users,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,doall:0
+msgid "Repeat Missed"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,state:0
+msgid "Type of the Action that is to be executed"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,server_id:0
+msgid "Object Mapping"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,xml_id:0
+#: field:ir.ui.view,xml_id:0
+msgid "External ID"
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,rate:0
+msgid "The rate of the currency to the currency of rate 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uk
+msgid "United Kingdom"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: help:res.partner.category,active:0
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Object:"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bw
+msgid "Botswana"
+msgstr ""
+
+#. module: base
+#: view:res.partner.title:0
+msgid "Partner Titles"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
+#, python-format
+msgid "Use the format '%s'"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,auto_refresh:0
+msgid "Add an auto-refresh on the view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_profiling
+msgid "Customer Profiling"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Work Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_multi_company
+msgid "Multi-Company"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_workitem_form
+#: model:ir.ui.menu,name:base.menu_workflow_workitem
+msgid "Workitems"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:195
+#, python-format
+msgid "Invalid Bank Account Type Name format."
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters visible only for one user"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4348
+#, python-format
+msgid ""
+"You cannot perform this operation. New Record Creation is not allowed for "
+"this object as this object is for reporting purpose."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_import
+msgid ""
+"\n"
+"New extensible file import for OpenERP\n"
+"======================================\n"
+"\n"
+"Re-implement openerp's file import system:\n"
+"\n"
+"* Server side, the previous system forces most of the logic into the\n"
+"  client which duplicates the effort (between clients), makes the\n"
+"  import system much harder to use without a client (direct RPC or\n"
+"  other forms of automation) and makes knowledge about the\n"
+"  import/export system much harder to gather as it is spread over\n"
+"  3+ different projects.\n"
+"\n"
+"* In a more extensible manner, so users and partners can build their\n"
+"  own front-end to import from other file formats (e.g. OpenDocument\n"
+"  files) which may be simpler to handle in their work flow or from\n"
+"  their data production sources.\n"
+"\n"
+"* In a module, so that administrators and users of OpenERP who do not\n"
+"  need or want an online import can avoid it being available to users.\n"
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "After Amount"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Lithuanian / Lietuvių kalba"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,record_id:0
+msgid ""
+"Provide the field name where the record id is stored after the create "
+"operations. If it is empty, you can not track the new record."
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_hr_user
+msgid "the user will be able to approve document created by employees."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,needaction_enabled:0
+msgid "Target model uses the need action mechanism"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation:0
+msgid "For relationship fields, the technical name of the target model"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%S - Seconds [00,61]."
+msgstr ""
+
+#. module: base
+#: help:base.language.import,overwrite:0
+msgid ""
+"If you enable this option, existing translations (including custom ones) "
+"will be overwritten and replaced by those in this file"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,inherit_id:0
+msgid "Inherited View"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Source Term"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_project_management
+#: model:ir.ui.menu,name:base.menu_main_pm
+#: model:ir.ui.menu,name:base.menu_project_config
+#: model:ir.ui.menu,name:base.menu_project_report
+msgid "Project"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover_data:0
+msgid "Web Icon Image (hover)"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Module file successfully imported!"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_constraint
+#: view:ir.model.constraint:0
+#: model:ir.ui.menu,name:base.ir_model_constraint_menu
+msgid "Model Constraints"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: base
+#: help:ir.values,company_id:0
+msgid "If set, action binding only applies for this company"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lc
+msgid "Saint Lucia"
+msgstr ""
+
+#. module: base
+#: help:res.users,new_password:0
+msgid ""
+"Specify a value only when creating a user or if you're changing the user's "
+"password, otherwise leave empty. After a change of password, the user has to "
+"login again."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.so
+msgid "Somalia"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_doctor
+msgid "Dr."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_user
+#: field:res.partner,employee:0
+#: model:res.partner.category,name:base.res_partner_category_3
+msgid "Employee"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue
+msgid ""
+"\n"
+"Track Issues/Bugs Management for Projects\n"
+"=========================================\n"
+"This application allows you to manage the issues you might face in a project "
+"like bugs in a system, client complaints or material breakdowns. \n"
+"\n"
+"It allows the manager to quickly check the issues, assign them and decide on "
+"their status quickly as they evolve.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_create:0
+msgid "Create Access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet
+msgid ""
+"\n"
+"This module implements a timesheet system.\n"
+"==========================================\n"
+"\n"
+"Each employee can encode and track their time spent on the different "
+"projects.\n"
+"A project is an analytic account and the time spent on a project generates "
+"costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you "
+"to set\n"
+"up a management by affair.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.bank,state:0
+#: field:res.company,state_id:0
+#: field:res.partner.bank,state_id:0
+msgid "Fed. State"
+msgstr "Departamento"
+
+#. module: base
+#: field:ir.actions.server,copy_object:0
+msgid "Copy Of"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,display_name:0
+msgid "Record Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_client
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.client"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.io
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_server_module_immediate_install
+msgid "Module Immediate Install"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mapping"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,ttype:0
+msgid "Field Type"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,code:0
+msgid "State Code"
+msgstr "Código de Departamento"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_multilang
+msgid "Multi Language Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gt
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Guatemala.\n"
+"=====================================================================\n"
+"\n"
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y\n"
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also "
+"includes\n"
+"taxes and the Quetzal currency."
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Left-to-Right"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,translate:0
+#: view:res.lang:0
+#: field:res.lang,translatable:0
+msgid "Translatable"
+msgstr ""
+
+#. module: base
+#: help:base.language.import,code:0
+msgid "ISO Language and Country code, e.g. en_US"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vn
+msgid "Vietnam"
+msgstr ""
+
+#. module: base
+#: field:res.users,signature:0
+msgid "Signature"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,complete_name:0
+msgid "Full Name"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "on"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Parameters that are used by all resources."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mz
+msgid "Mozambique"
+msgstr ""
+
+#. module: base
+#: help:ir.values,action_id:0
+msgid ""
+"Action bound to this entry - helper field for binding an action, will "
+"automatically set the correct reference"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_long_term
+msgid "Long Term Planning"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,message:0
+msgid "Message"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,multi:0
+#: field:ir.actions.report.xml,multi:0
+msgid "On Multiple Doc."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:change.password.wizard:0
+#: view:ir.actions.configuration.wizard:0
+#: view:res.config:0
+#: view:res.config.installer:0
+#: view:res.users:0
+#: view:wizard.ir.model.menu.create:0
+msgid "or"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_accountant
+msgid "Accounting and Finance"
+msgstr "Contabilidad y Finanzas"
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Upgrade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_action_rule
+msgid ""
+"\n"
+"This module allows to implement action rules for any object.\n"
+"============================================================\n"
+"\n"
+"Use automated actions to automatically trigger actions for various screens.\n"
+"\n"
+"**Example:** A lead created by a specific user may be automatically set to a "
+"specific\n"
+"sales team, or an opportunity which still has status pending after 14 days "
+"might\n"
+"trigger an automatic reminder email.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner,function:0
+msgid "Job Position"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,child_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fo
+msgid "Faroe Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_encryption:0
+msgid "Connection Security"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ec
+msgid "Ecuador - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,name:0
+msgid "Category Name"
+msgstr "Nombre de la Categoría"
+
+#. module: base
+#: model:res.country,name:base.mp
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters created by myself"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hn
+msgid "Honduras - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_intrastat
+msgid "Intrastat Reporting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
+#, python-format
+msgid ""
+"Please use the change password wizard (in User Preferences or User menu) to "
+"change your own password."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_long_term
+msgid ""
+"\n"
+"Long Term Project management module that tracks planning, scheduling, "
+"resources allocation.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Features:\n"
+"---------\n"
+"    * Manage Big project\n"
+"    * Define various Phases of Project\n"
+"    * Compute Phase Scheduling: Compute start date and end date of the "
+"phases\n"
+"      which are in draft, open and pending state of the project given. If "
+"no\n"
+"      project given then all the draft, open and pending state phases will "
+"be taken.\n"
+"    * Compute Task Scheduling: This works same as the scheduler button on\n"
+"      project.phase. It takes the project as argument and computes all the "
+"open,\n"
+"      draft and pending tasks.\n"
+"    * Schedule Tasks: All the tasks which are in draft, pending and open "
+"state\n"
+"      are scheduled with taking the phase's start date.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2021
+#, python-format
+msgid "Insufficient fields for Calendar View!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_rml:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another data field"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_14
+msgid "Manufacturer"
+msgstr ""
+
+#. module: base
+#: help:res.users,company_id:0
+msgid "The company this user is currently working for."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_wizard_ir_model_menu_create
+msgid "wizard.ir.model.menu.create"
+msgstr ""
+
+#. module: base
+#: view:workflow.transition:0
+msgid "Transition"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,active:0
+#: field:ir.mail_server,active:0
+#: field:ir.model.access,active:0
+#: field:ir.rule,active:0
+#: field:ir.sequence,active:0
+#: field:res.bank,active:0
+#: field:res.currency,active:0
+#: field:res.lang,active:0
+#: field:res.partner,active:0
+#: field:res.partner.category,active:0
+#: field:res.request,active:0
+#: field:res.users,active:0
+#: view:workflow.instance:0
+#: view:workflow.workitem:0
+msgid "Active"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.na
+msgid "Namibia"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:606
+#: code:addons/base/ir/ir_actions.py:702
+#: code:addons/base/ir/ir_actions.py:705
+#: code:addons/base/ir/ir_model.py:165
+#: code:addons/base/ir/ir_model.py:276
+#: code:addons/base/ir/ir_model.py:290
+#: code:addons/base/ir/ir_model.py:320
+#: code:addons/base/ir/ir_model.py:339
+#: code:addons/base/ir/ir_model.py:344
+#: code:addons/base/ir/ir_model.py:347
+#: code:addons/base/ir/ir_translation.py:341
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:525
+#: code:addons/base/module/module.py:539
+#: code:addons/base/module/module.py:644
+#: code:addons/base/res/res_currency.py:194
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:787
+#: code:addons/orm.py:3961
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:566
+#, python-format
+msgid "Couldn't create contact without email address!"
+msgstr ""
+
+#. module: base
+#: help:res.partner,tz:0
+msgid ""
+"The partner's timezone, used to output proper date and time values inside "
+"printed reports. It is important to set a value for this field. You should "
+"use the same timezone that is otherwise used to pick and render date and "
+"time values: your computer's timezone."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_default
+msgid "Account Analytic Defaults"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "mdx"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Scheduled Action"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bi
+msgid "Burundi"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.install:0
+#: view:base.module.configuration:0
+#: view:base.module.update:0
+msgid "Close"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (MX) / Español (MX)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Wizards to be Launched"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bt
+msgid "Bhutan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_event
+msgid ""
+"\n"
+"This module adds event menu and features to your portal if event and portal "
+"are installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.users:0
+msgid "Tags..."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "at"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Rule Definition (Domain Filter)"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_url,target:0
+msgid "This Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,format:0
+msgid "File Format"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "My filters"
+msgstr ""
+
+#. module: base
+#: field:res.lang,iso_code:0
+msgid "ISO code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_association
+msgid "Associations Management"
+msgstr ""
+
+#. module: base
+#: help:ir.model,modules:0
+msgid "List of modules in which the object is defined or inherited"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization_payroll
+#: model:ir.module.module,shortdesc:base.module_hr_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country_state
+msgid ""
+"If you are working on the American market, you can manage the different "
+"federal states you are working on from here. Each state is attached to one "
+"country."
+msgstr ""
+
+#. module: base
+#: view:workflow.workitem:0
+msgid "Workflow Workitems"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vc
+msgid "Saint Vincent & Grenadines"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_pass:0
+#: field:res.users,password:0
+msgid "Password"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_claim
+msgid "Portal Claim"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pe
+msgid "Peru Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_oauth
+msgid ""
+"\n"
+"Allow users to login through OAuth2 Provider.\n"
+"=============================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_fields
+#: view:ir.model:0
+#: field:ir.model,field_id:0
+#: model:ir.model,name:base.model_ir_model_fields
+#: view:ir.model.fields:0
+#: model:ir.ui.menu,name:base.ir_model_model_fields
+msgid "Fields"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_employee_form
+msgid "Employees"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header2:0
+msgid "RML Internal Header"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view_id:0
+msgid "Search View Ref."
+msgstr ""
+
+#. module: base
+#: help:res.users,partner_id:0
+msgid "Partner-related data of the user"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_todo
+msgid ""
+"\n"
+"Todo list for CRM leads and opportunities.\n"
+"==========================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mm
+msgid "Myanmar"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,modules:0
+msgid "List of modules in which the field is defined"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (CN) / 简体中文"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selection:0
+msgid "Selection Options"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street:0
+#: field:res.company,street:0
+#: field:res.partner,street:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,street:0
+msgid "Street"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.yu
+msgid "Yugoslavia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fetchmail
+msgid ""
+"\n"
+"Retrieve incoming email on POP/IMAP servers.\n"
+"============================================\n"
+"\n"
+"Enter the parameters of your POP/IMAP account(s), and any incoming emails "
+"on\n"
+"these accounts will be automatically downloaded into your OpenERP system. "
+"All\n"
+"POP3/IMAP-compatible servers are supported, included those that require an\n"
+"encrypted SSL/TLS connection.\n"
+"\n"
+"This can be used to easily create email-based workflows for many email-"
+"enabled OpenERP documents, such as:\n"
+"-----------------------------------------------------------------------------"
+"-----------------------------\n"
+"    * CRM Leads/Opportunities\n"
+"    * CRM Claims\n"
+"    * Project Issues\n"
+"    * Project Tasks\n"
+"    * Human Resource Recruitments (Applicants)\n"
+"\n"
+"Just install the relevant application, and you can assign any of these "
+"document\n"
+"types (Leads, Project Issues) to your incoming email accounts. New emails "
+"will\n"
+"automatically spawn new documents of the chosen type, so it's a snap to "
+"create a\n"
+"mailbox-to-OpenERP integration. Even better: these documents directly act as "
+"mini\n"
+"conversations synchronized by email. You can reply from within OpenERP, and "
+"the\n"
+"answers will automatically be collected when they come back, and attached to "
+"the\n"
+"same *conversation* document.\n"
+"\n"
+"For more specific needs, you may also assign custom-defined actions\n"
+"(technically: Server Actions) to be triggered for each incoming mail.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.currency,rounding:0
+msgid "Rounding Factor"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ca
+msgid "Canada"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Launchpad"
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,currency_rate_type_id:0
+msgid ""
+"Allow you to define your own currency rate types, like 'Average' or 'Year to "
+"Date'. Leave empty if you simply want to use the normal 'spot' rate type"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Unknown"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_users_my
+msgid "Change My Preferences"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:171
+#, python-format
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ro
+msgid ""
+"\n"
+"This is the module to manage the accounting chart, VAT structure and "
+"Registration Number for Romania in OpenERP.\n"
+"============================================================================="
+"===================================\n"
+"\n"
+"Romanian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cm
+msgid "Cameroon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bf
+msgid "Burkina Faso"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Custom Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_account_accountant
+msgid "Financial and Analytic Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_project
+msgid "Portal Project"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cc
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "init"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "11. %U or %W       ==> 48 (49th week)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type_field
+msgid "Bank type fields"
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules can not be applied on Transient models."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:215
+#, python-format
+msgid "Connection Test Failed!"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Dutch / Nederlands"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "US Letter"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.bank_account_update
+msgid "Company Bank Accounts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:473
+#, python-format
+msgid "Setting empty passwords is not allowed for security reasons!"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_pass:0
+msgid "Optional password for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:727
+#, python-format
+msgid "Sorry, you are not allowed to modify this document."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:380
+#, python-format
+msgid ""
+"\n"
+"\n"
+"This addon is already installed on your system"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,interval_number:0
+msgid "Repeat every x."
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,name:base.bank_normal
+msgid "Normal Bank Account"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,wizard_id:0
+#: view:ir.actions.wizard:0
+msgid "Wizard"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:303
+#, python-format
+msgid "database id"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_import
+msgid "Base import"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "1cm 28cm 20cm 28cm"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,maintainer:0
+msgid "Maintainer"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mo
+msgid "Macau"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.res_partner_address_report
+msgid "Labels"
+msgstr ""
+
+#. module: base
+#: help:res.partner,use_parent_address:0
+msgid ""
+"Select this if you want to set company's address information  for this "
+"contact"
+msgstr ""
+
+#. module: base
+#: field:ir.default,field_name:0
+msgid "Object Field"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PE) / Español (PE)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (CH) / Français (CH)"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_13
+msgid "Distributor"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,subject:0
+msgid ""
+"Email subject, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Hello [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image:0
+msgid ""
+"This field holds the image used as avatar for this contact, limited to "
+"1024x1024px"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.to
+msgid "Tonga"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,serialization_field_id:0
+msgid ""
+"If set, this field will be stored in the sparse structure of the "
+"serialization field, instead of having its own database column. This cannot "
+"be changed after creation."
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank accounts belonging to one of your companies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_plans
+msgid ""
+"\n"
+"This module allows to use several analytic plans according to the general "
+"journal.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"Here multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"-------------------------------------------------------------\n"
+"  * **Projects**\n"
+"      * Project 1\n"
+"          + SubProj 1.1\n"
+"          \n"
+"          + SubProj 1.2\n"
+"\n"
+"      * Project 2\n"
+"      \n"
+"  * **Salesman**\n"
+"      * Eric\n"
+"      \n"
+"      * Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must be able "
+"to write analytic entries in the 2 plans: SubProj 1.1 and Fabien. The amount "
+"can also be split.\n"
+" \n"
+"The following example is for an invoice that touches the two subprojects and "
+"assigned to one salesman:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"**Plan1:**\n"
+"\n"
+"    * SubProject 1.1 : 50%\n"
+"    \n"
+"    * SubProject 1.2 : 50%\n"
+"    \n"
+"**Plan2:**\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,for one account entry.\n"
+"\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation of distribution models.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_sequence
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "POEdit"
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Client Actions"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,field_ids:0
+msgid "Type Fields"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_recruitment
+msgid "Jobs, Recruitment, Applications, Job Interviews"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:539
+#, python-format
+msgid ""
+"You try to upgrade a module that depends on the module: %s.\n"
+"But this module is not available in your system."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_project_long_term
+msgid ""
+"\n"
+"This module adds necessary security rules and access rights for project long "
+"term and portal.\n"
+"============================================================================="
+"================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:res.currency,position:0
+msgid ""
+"Determines where the currency symbol should be placed after or before the "
+"amount."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad_project
+msgid "Pad on tasks"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_update_translations
+msgid "base.update.translations"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Full Access Right"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fi
+msgid "Finland"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_shortcuts
+msgid "Web Shortcuts"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: selection:res.partner,type:0
+#: selection:res.partner.title,domain:0
+#: view:res.users:0
+msgid "Contact"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_at
+msgid "Austria - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project
+msgid "Project Management"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Uninstall"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+msgid "Communication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_constraint
+msgid "ir.model.constraint"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_graph
+msgid "Graph Views"
+msgstr ""
+
+#. module: base
+#: help:ir.model.relation,name:0
+msgid "PostgreSQL table name implementing a many2many relation."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base
+msgid ""
+"\n"
+"The kernel of OpenERP, needed for all installation.\n"
+"===================================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_server_object_lines
+msgid "ir.server.object.lines"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be
+msgid "Belgium - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+msgid "Access Control"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kw
+msgid "Kuwait"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_followup
+msgid "Payment Follow-up Management"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:5334
+#, python-format
+msgid "The value for the field '%s' already exists."
+msgstr ""
+
+#. module: base
+#: field:workflow.workitem,inst_id:0
+msgid "Instance"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment:0
+msgid ""
+"This is the filename of the attachment used to store the printing result. "
+"Keep empty to not save the printed reports. You can use a python expression "
+"with the object and time variables."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model.data:0
+msgid ""
+"You cannot have multiple records with the same external ID in the same "
+"module!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Many2One"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ng
+msgid "Nigeria"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:339
+#, python-format
+msgid "For selection fields, the Selection Options must be given!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_iban
+msgid "IBAN Bank Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.company,user_ids:0
+msgid "Accepted Users"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_data:0
+msgid "Web Icon Image"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,wkf_model_id:0
+msgid "Target Object"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Always Searchable"
+msgstr ""
+
+#. module: base
+#: help:res.country.state,code:0
+msgid "The state code in max. three chars."
+msgstr "El código de Departamento en tres caracteres como máximo."
+
+#. module: base
+#: model:res.country,name:base.hk
+msgid "Hong Kong"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_sale
+msgid "Portal Sale"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_id:0
+msgid "ID Ref."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ph
+msgid "Philippines"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_timesheet_sheet
+msgid "Timesheets, Attendances, Activities"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ma
+msgid "Morocco"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model_id:0
+msgid ""
+"Model to which this entry applies - helper field for setting a model, will "
+"automatically set the correct model name"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "2.  %a ,%A         ==> Fri, Friday"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_translation.py:341
+#, python-format
+msgid ""
+"Translation features are unavailable until you install an extra OpenERP "
+"translation."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_nl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Netherlands in "
+"OpenERP.\n"
+"============================================================================="
+"\n"
+"\n"
+"Read changelog in file __openerp__.py for version information.\n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor\n"
+"Nederlandse bedrijven te installeren in OpenERP versie 7.0.\n"
+"\n"
+"De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren,\n"
+"denk b.v. aan intracommunautaire verwervingen waarbij u 21% BTW moet "
+"opvoeren,\n"
+"maar tegelijkertijd ook 21% als voorheffing weer mag aftrekken.\n"
+"\n"
+"Na installatie van deze module word de configuratie wizard voor 'Accounting' "
+"aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het\n"
+"      Nederlandse grootboekschema bevind.\n"
+"\n"
+"    * Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
+"bedrijf\n"
+"      in te voeren, welke grootboekschema te installeren, uit hoeveel "
+"cijfers een\n"
+"      grootboekrekening mag bestaan, het rekeningnummer van uw bank en de "
+"currency\n"
+"      om Journalen te creeren.\n"
+"\n"
+"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
+"4\n"
+"cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
+"verhogen.\n"
+"De extra cijfers worden dan achter het rekeningnummer aangevult met "
+"'nullen'.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.rule,global:0
+msgid "If no group is specified the rule is global and applied to everyone"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.td
+msgid "Chad"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,priority:0
+msgid ""
+"The priority of the job, as an integer: 0 means higher priority, 10 means "
+"lower priority."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_transition
+msgid "workflow.transition"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%a - Abbreviated weekday name."
+msgstr ""
+
+#. module: base
+#: view:ir.ui.menu:0
+msgid "Submenus"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Introspection report on objects"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_analytics
+msgid "Google Analytics"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_note
+msgid ""
+"\n"
+"This module allows users to create their own notes inside OpenERP\n"
+"=================================================================\n"
+"\n"
+"Use notes to write meeting minutes, organize ideas, organize personnal todo\n"
+"lists, etc. Each user manages his own personnal Notes. Notes are available "
+"to\n"
+"their authors only, but they can share notes to others users so that "
+"several\n"
+"people can work on the same note in real time. It's very efficient to share\n"
+"meeting minutes.\n"
+"\n"
+"Notes can be found in the 'Home' menu.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dm
+msgid "Dominica"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,name:0
+msgid "Translated field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_location
+msgid "Advanced Routes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad
+msgid "Collaborative Pads"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.np
+msgid "Nepal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_page
+msgid "Document Page"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ar
+msgid "Argentina Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,description_html:0
+msgid "Description HTML"
+msgstr ""
+
+#. module: base
+#: help:res.groups,implied_ids:0
+msgid "Users of this group automatically inherit those groups"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_note
+msgid "Sticky notes, Collaborative, Memos"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_attendance
+#: model:res.groups,name:base.group_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_warning
+msgid "Warning Messages and Alerts"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ui_view_custom
+#: model:ir.ui.menu,name:base.menu_action_ui_view_custom
+#: view:ir.ui.view.custom:0
+msgid "Customized Views"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_import
+msgid "Module Import"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_action
+#: model:ir.ui.menu,name:base.menu_values_form_action
+#: view:ir.values:0
+msgid "Action Bindings"
+msgstr ""
+
+#. module: base
+#: help:res.partner,lang:0
+msgid ""
+"If the selected language is loaded in the system, all documents related to "
+"this contact will be printed in this language. If not, it will be English."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_evaluation
+msgid ""
+"\n"
+"Periodical Employees evaluation and appraisals\n"
+"==============================================\n"
+"\n"
+"By using this application you can maintain the motivational process by doing "
+"periodical evaluations of your employees' performance. The regular "
+"assessment of human resources can benefit your people as well your "
+"organization. \n"
+"\n"
+"An evaluation plan can be assigned to each employee. These plans define the "
+"frequency and the way you manage your periodic personal evaluations. You "
+"will be able to define steps and attach interview forms to each step. \n"
+"\n"
+"Manages several types of evaluations: bottom-up, top-down, self-evaluations "
+"and the final evaluation by the manager.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Ability to create employees evaluations.\n"
+"* An evaluation can be created by an employee for subordinates, juniors as "
+"well as his manager.\n"
+"* The evaluation is done according to a plan in which various surveys can be "
+"created. Each survey can be answered by a particular level in the employees "
+"hierarchy. The final review and evaluation is done by the manager.\n"
+"* Every evaluation filled by employees can be viewed in a PDF form.\n"
+"* Interview Requests are generated automatically by OpenERP according to "
+"employees evaluation plans. Each user receives automatic emails and requests "
+"to perform a periodical evaluation of their colleagues.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_view_base_module_update
+msgid "Update Modules List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:359
+#, python-format
+msgid ""
+"Unable to upgrade module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account
+msgid "eInvoicing"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:171
+#, python-format
+msgid ""
+"Please keep in mind that documents currently displayed may not be relevant "
+"after switching to another company. If you have unsaved changes, please make "
+"sure to save and close all forms before switching to a different company. "
+"(You can click on Cancel in the User Preferences now)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2818
+#, python-format
+msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Continue"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Thai / ภาษาไทย"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%j - Day of the year [001,366]."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovenian / slovenščina"
+msgstr ""
+
+#. module: base
+#: field:res.currency,position:0
+msgid "Symbol Position"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_de
+msgid ""
+"\n"
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03.\n"
+"============================================================================="
+"=\n"
+"\n"
+"German accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment_use:0
+msgid "Reload from Attachment"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mx
+msgid "Mexico"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3903
+#, python-format
+msgid ""
+"For this kind of document, you may only access records you created "
+"yourself.\n"
+"\n"
+"(Document type: %s)"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "documentation"
+msgstr ""
+
+#. module: base
+#: help:ir.model,osv_memory:0
+msgid ""
+"This field specifies whether the model is transient or not (i.e. if records "
+"are automatically deleted from the database or not)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:445
+#, python-format
+msgid "Missing SMTP Server"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,data:0
+#: field:base.language.import,data:0
+msgid "File"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
+msgid "Module Upgrade Install"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_configuration_wizard
+msgid "ir.actions.configuration.wizard"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%b - Abbreviated month name."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:729
+#, python-format
+msgid "Sorry, you are not allowed to delete this document."
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules can not be applied on the Record Rules model."
+msgstr ""
+
+#. module: base
+#: field:res.partner,supplier:0
+#: model:res.partner.category,name:base.res_partner_category_1
+msgid "Supplier"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Multi Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_mail
+msgid "Discussions, Mailing Lists, News"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fleet
+msgid ""
+"\n"
+"Vehicle, leasing, insurances, cost\n"
+"==================================\n"
+"With this module, OpenERP helps you managing all your vehicles, the\n"
+"contracts associated to those vehicle as well as services, fuel log\n"
+"entries, costs and many other features necessary to the management \n"
+"of your fleet of vehicle(s)\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Add vehicles to your fleet\n"
+"* Manage contracts for vehicles\n"
+"* Reminder when a contract reach its expiration date\n"
+"* Add services, fuel log entry, odometer values for all vehicles\n"
+"* Show all costs associated to a vehicle or to a type of service\n"
+"* Analysis graph for costs\n"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (EC) / Español (EC)"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,xml_id:0
+msgid "ID of the view defined in xml file"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_import
+msgid "Import Module"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.as
+msgid "American Samoa"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_model:0
+msgid "Model name of the object to open in the view window"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selectable:0
+msgid "Selectable"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:222
+#, python-format
+msgid "Everything seems properly set up!"
+msgstr ""
+
+#. module: base
+#: view:res.request.link:0
+msgid "Request Link"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: field:ir.module.module,url:0
+msgid "URL"
+msgstr ""
+
+#. module: base
+#: help:res.country,name:0
+msgid "The full name of the country."
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Iteration"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4246
+#: code:addons/orm.py:4347
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project_issue
+msgid "Support, Bug Tracker, Helpdesk"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ae
+msgid "United Arab Emirates"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,needaction_enabled:0
+msgid ""
+"If the menu entry action is an act_window action, and if this action is "
+"related to a model that uses the need_action mechanism, this field is set to "
+"true. Otherwise, it is false."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3961
+#, python-format
+msgid ""
+"Unable to delete this document because it is used as a default property"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_5
+msgid "Silver"
+msgstr ""
+
+#. module: base
+#: field:res.partner.title,shortcut:0
+msgid "Abbreviation"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
+msgid "Recruitment"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gr
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Greece.\n"
+"==================================================================\n"
+"\n"
+"Greek accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_ldap
+msgid ""
+"\n"
+"Adds support for authentication by LDAP server.\n"
+"===============================================\n"
+"This module allows users to login with their LDAP username and password, "
+"and\n"
+"will automatically create OpenERP users for them on the fly.\n"
+"\n"
+"**Note:** This module only work on servers who have Python's ``ldap`` module "
+"installed.\n"
+"\n"
+"Configuration:\n"
+"--------------\n"
+"After installing this module, you need to configure the LDAP parameters in "
+"the\n"
+"Configuration tab of the Company details. Different companies may have "
+"different\n"
+"LDAP servers, as long as they have unique usernames (usernames need to be "
+"unique\n"
+"in OpenERP, even across multiple companies).\n"
+"\n"
+"Anonymous LDAP binding is also supported (for LDAP servers that allow it), "
+"by\n"
+"simply keeping the LDAP user and password empty in the LDAP configuration.\n"
+"This does not allow anonymous authentication for users, it is only for the "
+"master\n"
+"LDAP account that is used to verify if a user exists before attempting to\n"
+"authenticate it.\n"
+"\n"
+"Securing the connection with STARTTLS is available for LDAP servers "
+"supporting\n"
+"it, by enabling the TLS option in the LDAP configuration.\n"
+"\n"
+"For further options configuring the LDAP settings, refer to the ldap.conf\n"
+"manpage: manpage:`ldap.conf(5)`.\n"
+"\n"
+"Security Considerations:\n"
+"------------------------\n"
+"Users' LDAP passwords are never stored in the OpenERP database, the LDAP "
+"server\n"
+"is queried whenever a user needs to be authenticated. No duplication of the\n"
+"password occurs, and passwords are managed in one place only.\n"
+"\n"
+"OpenERP does not manage password changes in the LDAP, so any change of "
+"password\n"
+"should be conducted by other means in the LDAP directory directly (for LDAP "
+"users).\n"
+"\n"
+"It is also possible to have local OpenERP users in the database along with\n"
+"LDAP-authenticated users (the Administrator account is one obvious "
+"example).\n"
+"\n"
+"Here is how it works:\n"
+"---------------------\n"
+"    * The system first attempts to authenticate users against the local "
+"OpenERP\n"
+"      database;\n"
+"    * if this authentication fails (for example because the user has no "
+"local\n"
+"      password), the system then attempts to authenticate against LDAP;\n"
+"\n"
+"As LDAP users have blank passwords by default in the local OpenERP database\n"
+"(which means no access), the first step always fails and the LDAP server is\n"
+"queried to do the authentication.\n"
+"\n"
+"Enabling STARTTLS ensures that the authentication query to the LDAP server "
+"is\n"
+"encrypted.\n"
+"\n"
+"User Template:\n"
+"--------------\n"
+"In the LDAP configuration on the Company form, it is possible to select a "
+"*User\n"
+"Template*. If set, this user will be used as template to create the local "
+"users\n"
+"whenever someone authenticates for the first time via LDAP authentication. "
+"This\n"
+"allows pre-setting the default groups and menus of the first-time users.\n"
+"\n"
+"**Warning:** if you set a password for the user template, this password will "
+"be\n"
+"         assigned as local password for each new LDAP user, effectively "
+"setting\n"
+"         a *master password* for these users (until manually changed). You\n"
+"         usually do not want this. One easy way to setup a template user is "
+"to\n"
+"         login once with a valid LDAP user, let OpenERP create a blank "
+"local\n"
+"         user with the same login (and a blank password), then rename this "
+"new\n"
+"         user to a username that does not exist in LDAP, and setup its "
+"groups\n"
+"         the way you want.\n"
+"\n"
+"Interaction with base_crypt:\n"
+"----------------------------\n"
+"The base_crypt module is not compatible with this module, and will disable "
+"LDAP\n"
+"authentication if installed at the same time.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.re
+msgid "Reunion (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:422
+#, python-format
+msgid ""
+"New column name must still start with x_ , because it is a custom field!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_repair
+msgid "Repairs Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_asset
+msgid "Assets Management"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:ir.rule:0
+#: field:ir.rule,global:0
+msgid "Global"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cz
+msgid "Czech Republic"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_claim_from_delivery
+msgid "Claim on Deliveries"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sb
+msgid "Solomon Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4152
+#: code:addons/orm.py:4685
+#, python-format
+msgid "AccessError"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_gantt
+msgid ""
+"\n"
+"OpenERP Web Gantt chart view.\n"
+"=============================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_status
+msgid "State/Stage Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_warehouse_management
+msgid "Warehouse"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,resource:0
+#: model:ir.module.module,shortdesc:base.module_resource
+#: field:ir.property,res_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_process
+msgid ""
+"\n"
+"This module shows the basic processes involved in the selected modules and "
+"in the sequence they occur.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"**Note:** This applies to the modules containing modulename_process.xml.\n"
+"\n"
+"**e.g.** product/process/product_process.xml.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters shared with all users"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+#: model:ir.ui.menu,name:base.menu_translation
+msgid "Translations"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_prof
+msgid "Prof."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:241
+#, python-format
+msgid ""
+"Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
+"instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should "
+"do the trick."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ua
+msgid "Ukraine"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:164
+#: field:ir.module.module,website:0
+#: field:res.company,website:0
+#: field:res.partner,website:0
+#, python-format
+msgid "Website"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "None"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_holidays
+msgid "Leave Management"
+msgstr ""
+
+#. module: base
+#: model:res.company,overdue_msg:base.main_company
+msgid ""
+"Dear Sir/Madam,\n"
+"\n"
+"Our records indicate that some payments on your account are still due. "
+"Please find details below.\n"
+"If the amount has already been paid, please disregard this notice. "
+"Otherwise, please forward us the total amount stated below.\n"
+"If you have any queries regarding your account, Please contact us.\n"
+"\n"
+"Thank you in advance for your cooperation.\n"
+"Best Regards,"
+msgstr ""
+
+#. module: base
+#: view:ir.module.category:0
+msgid "Module Category"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.us
+msgid "United States"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+msgid "Architecture"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ml
+msgid "Mali"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_config_project
+msgid "Stages"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Flemish (BE) / Vlaams (BE)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_number:0
+msgid "Interval Number"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dz
+msgid "Algeria"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_hr_employees
+msgid ""
+"\n"
+"This module adds a list of employees to your portal's contact page if hr and "
+"portal_crm (which creates the contact page) are installed.\n"
+"============================================================================="
+"==========================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bn
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.act_window,view_type:0
+#: field:ir.actions.act_window.view,view_mode:0
+#: field:ir.ui.view,type:0
+msgid "View Type"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_2
+msgid "User Interface"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_byproduct
+msgid "MRP Byproducts"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_partner_id:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_expense
+msgid "Expense Management"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_name:0
+msgid "The workflow signal to trigger"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "done"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "General Settings"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in
+msgid ""
+"\n"
+"Indian Accounting: Chart of Account.\n"
+"====================================\n"
+"\n"
+"Indian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uy
+msgid "Uruguay - Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration_shortcut
+msgid "Custom Shortcuts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_cancel
+msgid ""
+"\n"
+"Allows canceling accounting entries.\n"
+"====================================\n"
+"\n"
+"This module adds 'Allow Canceling Entries' field on form view of account "
+"journal.\n"
+"If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin
+msgid "CRM Plugins"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_model
+#: model:ir.model,name:base.model_ir_model
+#: model:ir.ui.menu,name:base.ir_model_model_menu
+msgid "Models"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:499
+#, python-format
+msgid "The `base` module cannot be uninstalled"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:262
+#, python-format
+msgid "Record cannot be modified right now"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.be
+msgid "Belgium"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_osv_memory_autovacuum
+msgid "osv_memory.autovacuum"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:728
+#, python-format
+msgid "Sorry, you are not allowed to create this kind of document."
+msgstr ""
+
+#. module: base
+#: field:base.language.export,lang:0
+#: field:base.language.install,lang:0
+#: field:base.update.translations,lang:0
+#: field:ir.translation,lang:0
+#: view:res.lang:0
+#: field:res.partner,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gm
+msgid "Gambia"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_form
+#: model:ir.actions.act_window,name:base.company_normal_action_tree
+#: model:ir.model,name:base.model_res_company
+#: model:ir.ui.menu,name:base.menu_action_res_company_form
+#: model:ir.ui.menu,name:base.menu_res_company_global
+#: view:res.company:0
+#: view:res.partner:0
+#: field:res.users,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: base
+#: help:res.currency,symbol:0
+msgid "Currency sign, to be used when printing amounts."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%H - Hour (24-hour clock) [00,23]."
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,on_delete:0
+msgid "On Delete"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:347
+#, python-format
+msgid "Model %s does not exist!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_jit
+msgid "Just In Time Scheduling"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:ir.actions.server,code:0
+#: selection:ir.actions.server,state:0
+msgid "Python Code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_crm
+msgid ""
+"\n"
+"This module adds a contact page (with a contact form creating a lead when "
+"submitted) to your portal if crm and portal are installed.\n"
+"============================================================================="
+"=======================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_us
+msgid "United States - Chart of accounts"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:change.password.wizard:0
+#: view:ir.actions.configuration.wizard:0
+#: view:res.config:0
+#: view:res.users:0
+#: view:wizard.ir.model.menu.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1507
+#, python-format
+msgid "Unknown database identifier '%s'"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "PO File"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_diagram
+msgid ""
+"\n"
+"Openerp Web Diagram view.\n"
+"=========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nt
+msgid "Neutral Zone"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_sale
+msgid ""
+"\n"
+"This module adds a Sales menu to your portal as soon as sale and portal are "
+"installed.\n"
+"============================================================================="
+"=========\n"
+"\n"
+"After installing this module, portal users will be able to access their own "
+"documents\n"
+"via the following menus:\n"
+"\n"
+"  - Quotations\n"
+"  - Sale Orders\n"
+"  - Delivery Orders\n"
+"  - Products (public ones)\n"
+"  - Invoices\n"
+"  - Payments/Refunds\n"
+"\n"
+"If online payment acquirers are configured, portal users will also be given "
+"the opportunity to\n"
+"pay online on their Sale Orders and Invoices that are not paid yet. Paypal "
+"is included\n"
+"by default, you simply need to configure a Paypal account in the "
+"Accounting/Invoicing settings.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:316
+#, python-format
+msgid "external id"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Custom"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_margin
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase
+msgid "Purchase Management"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,published_version:0
+msgid "Published Version"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.is
+msgid "Iceland"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_window
+#: model:ir.ui.menu,name:base.menu_ir_action_window
+msgid "Window Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_project_issue
+msgid ""
+"\n"
+"This module adds issue menu and features to your portal if project_issue and "
+"portal are installed.\n"
+"============================================================================="
+"=====================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%I - Hour (12-hour clock) [01,12]."
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.de
+msgid "Germany"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_oauth
+msgid "OAuth2 Authentication"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid ""
+"When customizing a workflow, be sure you do not modify an existing node or "
+"arrow, but rather add new nodes or arrows. If you absolutly need to modify a "
+"node or arrow, you can only change fields that are empty or set to the "
+"default value. If you don't do that, your customization will be overwrited "
+"at the next update or upgrade to a future version of OpenERP."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Reports :"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_multi_company
+msgid ""
+"\n"
+"This module is for managing a multicompany environment.\n"
+"=======================================================\n"
+"\n"
+"This module is the base module for other multi-company modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:39
+#, python-format
+msgid "New Language (Empty translation template)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_report_company
+msgid "Invoice Analysis per Company"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,email:0
+msgid ""
+"Expression that returns the email address to send to. Can be based on the "
+"same values as for the condition field.\n"
+"Example: object.invoice_address_id.email, or 'me@example.com'"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue_sheet
+msgid ""
+"\n"
+"This module adds the Timesheet support for the Issues/Bugs Management in "
+"Project.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Worklogs can be maintained to signify number of hours spent by users to "
+"handle an issue.\n"
+"                "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gy
+msgid "Guyana"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_expiry
+msgid "Products Expiry Date"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:419
+#, python-format
+msgid "Click 'Continue' to configure the next addon..."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,record_id:0
+msgid "Create Id"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hn
+msgid "Honduras"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eg
+msgid "Egypt"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Creation"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,model_id:0
+msgid ""
+"Select the object on which the action will work (read, write, create)."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_location
+msgid ""
+"\n"
+"This module supplements the Warehouse application by effectively "
+"implementing Push and Pull inventory flows.\n"
+"============================================================================="
+"===============================\n"
+"\n"
+"Typically this could be used to:\n"
+"--------------------------------\n"
+"    * Manage product manufacturing chains\n"
+"    * Manage default locations per product\n"
+"    * Define routes within your warehouse according to business needs, such "
+"as:\n"
+"        - Quality Control\n"
+"        - After Sales Services\n"
+"        - Supplier Returns\n"
+"\n"
+"    * Help rental management, by generating automated return moves for "
+"rented products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product "
+"form,\n"
+"where you can add Push and Pull flow specifications. The demo data of CPU1\n"
+"product for that push/pull :\n"
+"\n"
+"Push flows:\n"
+"-----------\n"
+"Push flows are useful when the arrival of certain products in a given "
+"location\n"
+"should always be followed by a corresponding move to another location, "
+"optionally\n"
+"after a certain delay. The original Warehouse application already supports "
+"such\n"
+"Push flow specifications on the Locations themselves, but these cannot be\n"
+"refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which "
+"location,\n"
+"and with what parameters. As soon as a given quantity of products is moved "
+"in the\n"
+"source location, a chained move is automatically foreseen according to the\n"
+"parameters set on the flow specification (destination location, delay, type "
+"of\n"
+"move, journal). The new move can be automatically processed, or require a "
+"manual\n"
+"confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows:\n"
+"-----------\n"
+"Pull flows are a bit different from Push flows, in the sense that they are "
+"not\n"
+"related to the processing of product moves, but rather to the processing of\n"
+"procurement orders. What is being pulled is a need, not directly products. "
+"A\n"
+"classical example of Pull flow is when you have an Outlet company, with a "
+"parent\n"
+"Company that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale "
+"Order\n"
+"for example) arrives in the Outlet, it is converted into another "
+"procurement\n"
+"(B, via a Pull flow of type 'move') requested from the Holding. When "
+"procurement\n"
+"order B is processed by the Holding company, and if the product is out of "
+"stock,\n"
+"it can be converted into a Purchase Order (C) from the Supplier (Pull flow "
+"of\n"
+"type Purchase). The result is that the procurement order, the need, is "
+"pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, "
+"not\n"
+"only depending on the product being considered, but also depending on which\n"
+"location holds the 'need' for that product (i.e. the destination location "
+"of\n"
+"that procurement order).\n"
+"\n"
+"Use-Case:\n"
+"---------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"  **CPU1:** Sell some CPU1 from Chicago Shop and run the scheduler\n"
+"     - Warehouse: delivery order, Chicago Shop: reception\n"
+"  **CPU3:**\n"
+"     - When receiving the product, it goes to Quality Control location then\n"
+"       stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order "
+"from Gate A\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Boolean"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_encryption:0
+msgid ""
+"Choose the connection encryption scheme:\n"
+"- None: SMTP sessions are done in cleartext.\n"
+"- TLS (STARTTLS): TLS encryption is requested at start of SMTP session "
+"(Recommended)\n"
+"- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
+"(default: 465)"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Fields Description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_contract_hr_expense
+msgid "Contracts Management: hr_expense link"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:670
+#, python-format
+msgid ""
+"The `%s` module appears to be unavailable at the moment, please try again "
+"later."
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: view:ir.cron:0
+#: view:ir.filters:0
+#: view:ir.model.access:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: view:ir.module.module:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: view:res.partner:0
+#: view:workflow.activity:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Module Update Result"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_contract_hr_expense
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show some data related "
+"to the hr_expense module.\n"
+"============================================================================="
+"=========================\n"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
+#. module: base
+#: field:res.partner,use_parent_address:0
+msgid "Use Company Address"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_holidays
+msgid "Holidays, Allocation and Leave Requests"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_hello
+msgid ""
+"\n"
+"OpenERP Web example module.\n"
+"===========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be installed"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: model:ir.module.module,shortdesc:base.module_base
+#: field:res.currency,base:0
+msgid "Base"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,model:0
+#: field:ir.values,model:0
+msgid "Model Name"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Telugu / తెలుగు"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_supplier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a supplier: discussions, history of purchases,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lr
+msgid "Liberia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_tests
+msgid ""
+"\n"
+"OpenERP Web test suite.\n"
+"=======================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: model:ir.module.module,shortdesc:base.module_note
+#: view:res.groups:0
+#: field:res.partner,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: base
+#: field:ir.config_parameter,value:0
+#: field:ir.property,value_binary:0
+#: field:ir.property,value_datetime:0
+#: field:ir.property,value_float:0
+#: field:ir.property,value_integer:0
+#: field:ir.property,value_reference:0
+#: field:ir.property,value_text:0
+#: selection:ir.server.object.lines,type:0
+#: field:ir.server.object.lines,value:0
+#: field:ir.values,value:0
+msgid "Value"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+#: field:ir.sequence,code:0
+#: field:ir.sequence.type,code:0
+#: selection:ir.translation,type:0
+#: field:res.partner.bank.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_installer
+msgid "res.config.installer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mc
+msgid "Monaco"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Display"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_multi_company
+msgid "Multi Companies"
+msgstr ""
+
+#. module: base
+#: help:res.users,menu_id:0
+msgid ""
+"If specified, the action will replace the standard menu for this user."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.preview_report
+msgid "Preview Report"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_type
+#: model:ir.ui.menu,name:base.menu_ir_sequence_type
+msgid "Sequence Codes"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CO) / Español (CO)"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid ""
+"All pending configuration wizards have been executed. You may restart "
+"individual wizards via the list of configuration wizards."
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year with Century: %(year)s"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,export_fields:0
+msgid "Export ID"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fr
+msgid "France"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_stop:0
+msgid "Flow Stop"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.af
+msgid "Afghanistan, Islamic State of"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
+msgid "Marketing Campaign - Demo"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:360
+#, python-format
+msgid ""
+"Can not create Many-To-One records indirectly, import the field separately"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,kind:0
+msgid "Kind"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4647
+#, python-format
+msgid "This method does not exist anymore"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+#: model:ir.actions.act_window,name:base.action_wizard_update_translations
+#: model:ir.ui.menu,name:base.menu_wizard_update_translations
+msgid "Synchronize Terms"
+msgstr ""
+
+#. module: base
+#: field:res.lang,thousands_sep:0
+msgid "Thousands Separator"
+msgstr ""
+
+#. module: base
+#: field:res.request,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn
+msgid "中国会计科目表 - Accounting"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model.constraint:0
+msgid "Constraints with the same name are unique per module."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_intrastat
+msgid ""
+"\n"
+"A module that adds intrastat reports.\n"
+"=====================================\n"
+"\n"
+"This module gives the details of the goods traded between the countries of\n"
+"European Union."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,loop_action:0
+msgid ""
+"Select the action that will be executed. Loop action will not be avaliable "
+"inside loop."
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,res_id:0
+msgid "ID of the target record in the database"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
+msgid "Contracts Management"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (TW) / 正體字"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request
+msgid "res.request"
+msgstr ""
+
+#. module: base
+#: field:res.partner,image_medium:0
+msgid "Medium-sized image"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "In Memory"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Todo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_es
+msgid ""
+"\n"
+"Spanish Charts of Accounts (PGCE 2008).\n"
+"=======================================\n"
+"\n"
+"    * Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies\n"
+"        * Spanish General Chart of Accounts 2008 for associations\n"
+"    * Defines templates for sale and purchase VAT\n"
+"    * Defines tax code templates\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_visible_discount
+msgid "Prices Visible Discounts"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,datas:0
+msgid "File Content"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_relation
+#: view:ir.model.relation:0
+#: model:ir.ui.menu,name:base.ir_model_relation_menu
+msgid "ManyToMany Relations"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pa
+msgid "Panama"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,group_id:0
+msgid ""
+"The group that a user must have to be authorized to validate this transition."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "Street..."
+msgstr ""
+
+#. module: base
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gi
+msgid "Gibraltar"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_name:0
+msgid "Service Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pn
+msgid "Pitcairn Island"
+msgstr ""
+
+#. module: base
+#: field:res.partner,category_id:0
+msgid "Tags"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid ""
+"We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_rule
+#: view:ir.rule:0
+#: model:ir.ui.menu,name:base.menu_action_rule
+msgid "Record Rules"
+msgstr ""
+
+#. module: base
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_portal
+#: model:ir.module.module,shortdesc:base.module_portal
+msgid "Portal"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "To Translate"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:294
+#, python-format
+msgid "See all possible values"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_claim_from_delivery
+msgid ""
+"\n"
+"Create a claim from a delivery order.\n"
+"=====================================\n"
+"\n"
+"Adds a Claim link to the delivery order.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:workflow.activity:0
+msgid "Properties"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: base
+#: help:ir.model.constraint,name:0
+msgid "PostgreSQL constraint or foreign key name."
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%A - Full weekday name."
+msgstr ""
+
+#. module: base
+#: help:ir.values,user_id:0
+msgid "If set, action binding only applies for this user."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gw
+msgid "Guinea Bissau"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,header:0
+msgid "Add RML Header"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_footer:0
+msgid "Footer text displayed at the bottom of all reports."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_note_pad
+msgid "Memos pad"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client.\n"
+"===================================================================\n"
+"\n"
+"Lets the company customize which Pad installation should be used to link to "
+"new\n"
+"pads (by default, http://ietherpad.com/).\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The code of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_attachment
+#: view:ir.actions.report.xml:0
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:base.menu_action_attachment
+msgid "Attachments"
+msgstr ""
+
+#. module: base
+#: help:res.company,bank_ids:0
+msgid "Bank accounts related to this company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_sales_management
+#: model:ir.ui.menu,name:base.menu_base_partner
+#: model:ir.ui.menu,name:base.menu_sale_config
+#: model:ir.ui.menu,name:base.menu_sale_config_sales
+#: model:ir.ui.menu,name:base.menu_sales
+#: model:ir.ui.menu,name:base.next_id_64
+msgid "Sales"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,child_ids:0
+msgid "Other Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_coda
+msgid "Belgium - Import Bank CODA Statements"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,doall:0
+msgid ""
+"Specify if missed occurrences should be executed when the server restarts."
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_miss
+#: model:res.partner.title,shortcut:base.res_partner_title_miss
+msgid "Miss"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_write:0
+msgid "Write Access"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%m - Month number [01,12]."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: field:res.bank,city:0
+#: view:res.company:0
+#: field:res.company,city:0
+#: view:res.partner:0
+#: field:res.partner,city:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,city:0
+#: view:res.users:0
+msgid "City"
+msgstr "Provincia"
+
+#. module: base
+#: model:res.country,name:base.qa
+msgid "Qatar"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.it
+msgid "Italy"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman
+msgid "See Own Leads"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+#: selection:ir.actions.todo,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_hr_employees
+msgid "Portal HR employees"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Estonian / Eesti keel"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-3 or later version"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2033
+#, python-format
+msgid ""
+"Insufficient fields to generate a Calendar View for %s, missing a date_stop "
+"or a date_delay"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,action:0
+msgid "Python Action"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (US)"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_partner
+msgid ""
+"Manage the partner titles you want to have available in your system. The "
+"partner titles is the legal status of the company: Private Limited, SA, etc."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "Address"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Mongolian / монгол"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mr
+msgid "Mauritania"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_resource
+msgid ""
+"\n"
+"Module for resource management.\n"
+"===============================\n"
+"\n"
+"A resource represent something that can be scheduled (a developer on a task "
+"or a\n"
+"work center on manufacturing orders). This module manages a resource "
+"calendar\n"
+"associated to every resource. It also manages the leaves of every resource.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:735
+#, python-format
+msgid ""
+"Please contact your system administrator if you think this is an error."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:545
+#: view:base.module.upgrade:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
+#, python-format
+msgid "Apply Schedule Upgrade"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.workitem,act_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
+#: model:ir.actions.act_window,name:base.action_res_users
+#: field:ir.default,uid:0
+#: model:ir.model,name:base.model_res_users
+#: model:ir.ui.menu,name:base.menu_action_res_users
+#: model:ir.ui.menu,name:base.menu_users
+#: view:res.groups:0
+#: field:res.groups,users:0
+#: field:res.partner,user_ids:0
+#: view:res.users:0
+msgid "Users"
+msgstr ""
+
+#. module: base
+#: field:res.company,parent_id:0
+msgid "Parent Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3872
+#, python-format
+msgid ""
+"One of the documents you are trying to access has been deleted, please try "
+"again after refreshing."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_mail_server
+msgid "ir.mail_server"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CR) / Español (CR)"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Global rules (non group-specific) are restrictions, and cannot be bypassed. "
+"Group-local rules grant additional permissions, but are constrained within "
+"the bounds of global ones. The first group rules restrict further than "
+"global rules, but any additional group rule will add more permissions"
+msgstr ""
+
+#. module: base
+#: field:res.currency.rate,rate:0
+msgid "Rate"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cg
+msgid "Congo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Examples"
+msgstr ""
+
+#. module: base
+#: field:ir.default,value:0
+msgid "Default Value"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country_state
+msgid "Country state"
+msgstr "Departamento"
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_5
+msgid "Sequences & Identifiers"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_th
+msgid ""
+"\n"
+"Chart of Accounts for Thailand.\n"
+"===============================\n"
+"\n"
+"Thai accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kn
+msgid "Saint Kitts & Nevis Anguilla"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_currency.py:194
+#, python-format
+msgid ""
+"No rate found \n"
+"for the currency: %s \n"
+"at the date: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view_custom
+msgid ""
+"Customized views are used when users reorganize the content of their "
+"dashboard views (via web client)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_stock
+msgid "Sales and Warehouse Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,srcmodel_id:0
+msgid ""
+"Object in which you want to create / write the object. If it is empty then "
+"refer to the Object field."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Not Installed"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,out_transitions:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,icon_image:0
+#: field:ir.ui.menu,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_human_resources
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+
+#. module: base
+#: help:res.partner,ean13:0
+msgid "BarCode"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model_id:0
+msgid "The model this field belongs to"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,sms:0
+#: selection:ir.actions.server,state:0
+msgid "SMS"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mq
+msgid "Martinique (French)"
+msgstr ""
+
+#. module: base
+#: help:res.partner,is_company:0
+msgid "Check if the contact is a company, otherwise it is a person"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequences Type"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:195
+#, python-format
+msgid "Formating Error"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ye
+msgid "Yemen"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,split_mode:0
+msgid "Or"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_br
+msgid "Brazilian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pk
+msgid "Pakistan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_margin
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins "
+"and other interesting indicators based on invoices.\n"
+"============================================================================="
+"================================================\n"
+"\n"
+"The wizard to launch the report has several options to help you get the data "
+"you need.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.al
+msgid "Albania"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ws
+msgid "Samoa"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:509
+#: code:addons/base/ir/ir_model.py:570
+#: code:addons/base/ir/ir_model.py:1031
+#, python-format
+msgid "Permission Denied"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,child_id:0
+msgid "Child IDs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:702
+#: code:addons/base/ir/ir_actions.py:705
+#, python-format
+msgid "Problem in configuration `Record Id` in Server Action!"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2807
+#: code:addons/orm.py:2817
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: view:base.module.update:0
+msgid "Open Modules"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Import module"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,loop_action:0
+msgid "Loop Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_file:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another field"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.la
+msgid "Laos"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:163
+#: selection:ir.actions.server,state:0
+#: model:ir.ui.menu,name:base.menu_email
+#: field:res.bank,email:0
+#: field:res.company,email:0
+#: field:res.partner,email:0
+#, python-format
+msgid "Email"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_12
+msgid "Office Supplies"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
+#, python-format
+msgid ""
+"The sum of the data (2nd field) is null.\n"
+"We can't draw a pie chart !"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Information About the Bank"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,condition:0
+msgid ""
+"Condition that is tested before the action is executed, and prevent "
+"execution if it is not verified.\n"
+"Example: object.list_price > 5000\n"
+"It is a Python expression that can use the following values:\n"
+" - self: ORM model of the record on which the action is triggered\n"
+" - object or obj: browse_record of the record on which the action is "
+"triggered\n"
+" - pool: ORM model pool (i.e. self.pool)\n"
+" - time: Python time module\n"
+" - cr: database cursor\n"
+" - uid: current user id\n"
+" - context: current context"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"2. Group-specific rules are combined together with a logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bl
+msgid "Saint Barthélémy"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other Proprietary"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ec
+msgid "Ecuador"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Read Access Right"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_user_function
+msgid "Jobs on Contracts"
+msgstr ""
+
+#. module: base
+#: view:ir.model.data:0
+msgid "Updatable"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Cascade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_knowledge_management
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Arabic / الْعَرَبيّة"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "Translated"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_inventory_form
+#: model:ir.ui.menu,name:base.menu_action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_hello
+msgid "Hello"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Next Configuration Step"
+msgstr ""
+
+#. module: base
+#: field:res.groups,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,domain:0
+#: field:ir.model.fields,domain:0
+#: field:ir.rule,domain:0
+#: field:ir.rule,domain_force:0
+#: field:res.partner.title,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:166
+#, python-format
+msgid "Use '1' for yes and '0' for no"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign
+msgid "Marketing Campaigns"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,name:0
+msgid "State Name"
+msgstr "Nombre de Departamento"
+
+#. module: base
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:313
+#, python-format
+msgid "Invalid database id '%s' for the field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Languague Terms"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,join_mode:0
+msgid "Join Mode"
+msgstr ""
+
+#. module: base
+#: field:res.partner,tz:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:base.menu_ir_sequence_form
+msgid "Sequences"
+msgstr ""
+
+#. module: base
+#: help:res.lang,code:0
+msgid "This field is used to set/get locales for user"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sj
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Shared"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:357
+#, python-format
+msgid ""
+"Unable to install module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Search modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.by
+msgid "Belarus"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,name:0
+#: field:ir.actions.act_window,name:0
+#: field:ir.actions.client,name:0
+#: field:ir.actions.server,name:0
+msgid "Action Name"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_users
+msgid ""
+"Create and manage users that will connect to the system. Users can be "
+"deactivated should there be a period of time during which they will/should "
+"not connect to the system. You can assign them groups in order to give them "
+"specific access to the applications they need to use in the system."
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_double_validation
+msgid "Double Validation on Purchases"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street2:0
+#: field:res.company,street2:0
+#: field:res.partner,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_update
+msgid "Module Update"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:85
+#, python-format
+msgid "Following modules are not installed or unknown: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_oauth_signup
+msgid ""
+"\n"
+"Allow users to sign up through OAuth2 Provider.\n"
+"===============================================\n"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,user_id:0
+#: view:ir.cron:0
+#: field:ir.cron,user_id:0
+#: view:ir.filters:0
+#: field:ir.filters,user_id:0
+#: field:ir.ui.view.custom,user_id:0
+#: field:ir.values,user_id:0
+#: model:res.groups,name:base.group_document_user
+#: model:res.groups,name:base.group_tool_user
+#: view:res.users:0
+msgid "User"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pr
+msgid "Puerto Rico"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tests_demo
+msgid "Demonstration of web/javascript tests"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,signal:0
+msgid "Signal (Button Name)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open Window"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_search:0
+msgid "Auto Search"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_category_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new partner category.\n"
+"              </p><p>\n"
+"                Manage the partner categories in order to better classify "
+"them for tracking and analysis purposes.\n"
+"                A partner may belong to several categories and categories "
+"have a hierarchy structure: a partner belonging to a category also belong to "
+"his parent category.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,filter:0
+msgid "Filter"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ch
+msgid "Switzerland"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:361
+#, python-format
+msgid ""
+"Changing the company of a contact should only be done if it was never "
+"correctly set. If an existing contact starts working for a new company then "
+"a new contact should be created under that new company. You can use the "
+"\"Discard\" button to abandon this change."
+msgstr ""
+
+#. module: base
+#: help:res.partner,customer:0
+msgid "Check this box if this contact is a customer."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Trigger Configuration"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid "Load"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_warning
+msgid ""
+"\n"
+"Module to trigger warnings in OpenERP objects.\n"
+"==============================================\n"
+"\n"
+"Warning messages can be displayed for objects like sale order, purchase "
+"order,\n"
+"picking and invoice. The message is triggered by the form's onchange event.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:172
+#: code:addons/osv.py:174
+#, python-format
+msgid "Integrity Error"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_history
+msgid "res.request.history"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_operations
+msgid "Manufacturing Operations"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Here is the exported translation file:"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml_content:0
+#: field:ir.actions.report.xml,report_rml_content_data:0
+msgid "RML Content"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Terms"
+msgstr ""
+
+#. module: base
+#: field:res.request,act_to:0
+#: field:res.request.history,act_to:0
+msgid "To"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr
+msgid "Employee Directory"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,args:0
+msgid "Arguments"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 2"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 3"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,name:0
+msgid "Language Name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_decimal_precision
+msgid ""
+"\n"
+"Configure the price accuracy you need for different kinds of usage: "
+"accounting, sales, purchases.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "A4"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Configuration Installer"
+msgstr ""
+
+#. module: base
+#: field:res.partner,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.users:0
+msgid "e.g. +32.81.81.37.00"
+msgstr "ej. +51.1.818.1370"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (NI) / Español (NI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad_project
+msgid ""
+"\n"
+"This module adds a PAD in all project kanban views.\n"
+"===================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,context:0
+#: field:ir.actions.client,context:0
+msgid "Context Value"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->24: %(h24)s"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,nextcall:0
+msgid "Next Execution Date"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,padding:0
+msgid "Number Padding"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,field_id:0
+msgid "Select field property"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,date_sent:0
+msgid "Date sent"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Month: %(month)s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,sequence:0
+#: field:ir.actions.server,sequence:0
+#: field:ir.actions.todo,sequence:0
+#: view:ir.cron:0
+#: field:ir.module.category,sequence:0
+#: field:ir.module.module,sequence:0
+#: view:ir.sequence:0
+#: field:ir.ui.menu,sequence:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,priority:0
+#: field:ir.ui.view_sc,sequence:0
+#: field:multi_company.default,sequence:0
+#: field:res.partner.bank,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tn
+msgid "Tunisia"
+msgstr ""
+
+#. module: base
+#: help:ir.model.access,active:0
+msgid ""
+"If you uncheck the active field, it will disable the ACL without deleting it "
+"(if you delete a native ACL, it will be re-created when you reload the "
+"module."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_fields_converter
+msgid "ir.fields.converter"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.km
+msgid "Comoros"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Install"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_relation
+msgid "ir.model.relation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_check_writing
+msgid "Check Writing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_outlook
+msgid ""
+"\n"
+"This module provides the Outlook Plug-in.\n"
+"=========================================\n"
+"\n"
+"Outlook plug-in allows you to select an object that you would like to add "
+"to\n"
+"your email and its attachments from MS Outlook. You can select a partner, a "
+"task,\n"
+"a project, an analytical account, or any other object and archive selected "
+"mail\n"
+"into mail.message with attachments.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_thunderbird
+msgid ""
+"\n"
+"This module is required for the Thuderbird Plug-in to work properly.\n"
+"====================================================================\n"
+"\n"
+"The plugin allows you archive email and its attachments to the selected\n"
+"OpenERP objects. You can select a partner, a task, a project, an analytical\n"
+"account, or any other object and attach the selected mail as a .eml file in\n"
+"the attachment of a selected record. You can create documents for CRM Lead,\n"
+"HR Applicant and Project Issue from selected mails.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Legends for Date and Time Formats"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Copy Object"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_name:0
+msgid "Trigger Signal"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country_state
+#: model:ir.ui.menu,name:base.menu_country_state_partner
+msgid "Fed. States"
+msgstr "Departamentos"
+
+#. module: base
+#: view:ir.model:0
+#: view:res.groups:0
+msgid "Access Rules"
+msgstr ""
+
+#. module: base
+#: field:res.groups,trans_implied_ids:0
+msgid "Transitively inherits"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_table:0
+msgid "Table Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_journal
+msgid ""
+"\n"
+"The sales journal modules allows you to categorise your sales and deliveries "
+"(picking lists) between different journals.\n"
+"============================================================================="
+"===========================================\n"
+"\n"
+"This module is very helpful for bigger companies that works by departments.\n"
+"\n"
+"You can use journal for different purposes, some examples:\n"
+"----------------------------------------------------------\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"Journals have a responsible and evolves between different status:\n"
+"-----------------------------------------------------------------\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"Batch operations can be processed on the different journals to confirm all "
+"sales\n"
+"at once, to validate or invoice packing.\n"
+"\n"
+"It also supports batch invoicing methods that can be configured by partners "
+"and sales orders, examples:\n"
+"-----------------------------------------------------------------------------"
+"--------------------------\n"
+"    * daily invoicing\n"
+"    * monthly invoicing\n"
+"\n"
+"Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:474
+#, python-format
+msgid "Mail delivery failed"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.report.xml,model:0
+#: field:ir.actions.server,model_id:0
+#: field:ir.actions.wizard,model:0
+#: field:ir.cron,model:0
+#: field:ir.default,field_tbl:0
+#: view:ir.model.access:0
+#: field:ir.model.access,model_id:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: field:ir.rule,model_id:0
+#: selection:ir.translation,type:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,model:0
+#: field:multi_company.default,object_id:0
+#: field:res.request.link,object:0
+#: field:workflow.triggers,model:0
+msgid "Object"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:169
+#, python-format
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_plans
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_default
+msgid "ir.default"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Minute: %(min)s"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_ir_cron
+msgid "Scheduler"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event_moodle
+msgid ""
+"\n"
+"Configure your moodle server.\n"
+"============================= \n"
+"\n"
+"With this module you are able to connect your OpenERP with a moodle "
+"platform.\n"
+"This module will create courses and students automatically in your moodle "
+"platform \n"
+"to avoid wasting time.\n"
+"Now you have a simple way to create training or courses with OpenERP and "
+"moodle.\n"
+"\n"
+"STEPS TO CONFIGURE:\n"
+"-------------------\n"
+"\n"
+"1. Activate web service in moodle.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+">site administration >plugins >web services >manage protocols activate the "
+"xmlrpc web service \n"
+"\n"
+"\n"
+">site administration >plugins >web services >manage tokens create a token \n"
+"\n"
+"\n"
+">site administration >plugins >web services >overview activate webservice\n"
+"\n"
+"\n"
+"2. Create confirmation email with login and password.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"We strongly suggest you to add those following lines at the bottom of your "
+"event\n"
+"confirmation email to communicate the login/password of moodle to your "
+"subscribers.\n"
+"\n"
+"\n"
+"........your configuration text.......\n"
+"\n"
+"**URL:** your moodle link for exemple: http://openerp.moodle.com\n"
+"\n"
+"**LOGIN:** ${object.moodle_username}\n"
+"\n"
+"**PASSWORD:** ${object.moodle_user_password}\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uk
+msgid "UK - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_madam
+msgid "Mrs."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:432
+#, python-format
+msgid ""
+"Changing the type of a column is not yet supported. Please drop it and "
+"create it again!"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,user_id:0
+msgid "User Ref."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:226
+#, python-format
+msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
+msgid "bank_bic"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,expression:0
+msgid "Loop Expression"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_16
+msgid "Retailer"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,readonly:0
+#: field:res.partner.bank.type.field,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gt
+msgid "Guatemala - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,args:0
+msgid "Arguments to be passed to the method, e.g. (uid,)."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Reference Guide"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner
+#: field:res.company,partner_id:0
+#: model:res.partner.category,name:base.res_partner_category_0
+#: selection:res.partner.title,domain:0
+#: model:res.request.link,name:base.req_link_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:482
+#, python-format
+msgid ""
+"Your server does not seem to support SSL, you may want to try STARTTLS "
+"instead"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/workflow/workflow.py:100
+#, python-format
+msgid ""
+"Please make sure no workitems refer to an activity before deleting it!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tr
+msgid "Turkey"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fk
+msgid "Falkland Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:606
+#, python-format
+msgid "Please specify an action to launch!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lb
+msgid "Lebanon"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,report_type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.country.state:0
+#: view:res.partner:0
+#: field:res.partner,state_id:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "State"
+msgstr "Departamento"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Galician / Galego"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.no
+msgid "Norway"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "4.  %b, %B         ==> Dec, December"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cl
+msgid "Chile Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Sinhalese / සිංහල"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "waiting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_triggers
+msgid "workflow.triggers"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "XSL"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Connection Information"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_prof
+msgid "Professor"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hm
+msgid "Heard and McDonald Islands"
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,name:0
+msgid ""
+"External Key/Identifier that can be used for data integration with third-"
+"party systems"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_id:0
+msgid "View Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_sales_management
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+
+#. module: base
+#: field:res.users,login_date:0
+msgid "Latest connection"
+msgstr ""
+
+#. module: base
+#: field:res.groups,implied_ids:0
+msgid "Inherits"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: base
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,type:0
+#: field:ir.actions.act_window,type:0
+#: field:ir.actions.act_window_close,type:0
+#: field:ir.actions.actions,type:0
+#: field:ir.actions.client,type:0
+#: field:ir.actions.report.xml,type:0
+#: view:ir.actions.server:0
+#: field:ir.actions.server,state:0
+#: field:ir.actions.server,type:0
+#: field:ir.actions.wizard,type:0
+msgid "Action Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:372
+#, python-format
+msgid ""
+"You try to install module '%s' that depends on module '%s'.\n"
+"But the latter module is not available in your system."
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_import_language
+#: model:ir.ui.menu,name:base.menu_view_base_import_language
+msgid "Import Translation"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: selection:ir.property,type:0
+msgid "Binary"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_doctor
+msgid "Doctor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_repair
+msgid ""
+"\n"
+"The aim is to have a complete module to manage all products repairs.\n"
+"====================================================================\n"
+"\n"
+"The following topics should be covered by this module:\n"
+"------------------------------------------------------\n"
+"    * Add/remove products in the reparation\n"
+"    * Impact for stocks\n"
+"    * Invoicing (products and/or services)\n"
+"    * Warranty concept\n"
+"    * Repair quotation report\n"
+"    * Notes for the technician and for the final customer\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cd
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cr
+msgid "Costa Rica"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_ldap
+msgid "Authentication via LDAP"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_other_form
+msgid "Other Partners"
+msgstr ""
+
+#. module: base
+#: field:base.language.install,state:0
+#: field:base.module.import,state:0
+#: field:base.module.update,state:0
+#: field:ir.actions.todo,state:0
+#: field:ir.module.module,state:0
+#: field:ir.module.module.dependency,state:0
+#: field:ir.translation,state:0
+#: field:res.request,state:0
+#: field:workflow.instance,state:0
+#: view:workflow.workitem:0
+#: field:workflow.workitem,state:0
+msgid "Status"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_form
+#: model:ir.ui.menu,name:base.menu_action_currency_form
+#: view:res.currency:0
+msgid "Currencies"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_8
+msgid "Consultancy Services"
+msgstr ""
+
+#. module: base
+#: help:ir.values,value:0
+msgid "Default value (pickled) or reference to an action"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,auto:0
+msgid "Custom Python Parser"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: base
+#: help:ir.translation,module:0
+msgid "Module this term belongs to"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_view_editor
+msgid ""
+"\n"
+"OpenERP Web to edit views.\n"
+"==========================\n"
+"\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->12: %(h12)s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dk
+msgid "Denmark"
+msgstr ""
+
+#. module: base
+#: field:res.country,code:0
+msgid "Country Code"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_instance
+msgid "workflow.instance"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:479
+#, python-format
+msgid "Unknown attribute %s in %s "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "10. %S              ==> 20"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ar
+msgid ""
+"\n"
+"Argentinian accounting chart and tax localization.\n"
+"==================================================\n"
+"\n"
+"Plan contable argentino e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:130
+#, python-format
+msgid "undefined get method !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Norwegian Bokmål / Norsk bokmål"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_madam
+msgid "Madam"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ee
+msgid "Estonia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_board
+#: model:ir.ui.menu,name:base.menu_reporting_dashboard
+msgid "Dashboards"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_procurement
+msgid "Procurements"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_6
+msgid "Bronze"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_payroll_account
+msgid "Payroll Accounting"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Change password"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_order_dates
+msgid "Dates on Sales Order"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,demo:0
+msgid "Demo Data"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_mister
+msgid "Mr."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mv
+msgid "Maldives"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_crm
+msgid "Portal CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_4
+msgid "Low Level Objects"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model:0
+msgid "Model to which this entry applies"
+msgstr ""
+
+#. module: base
+#: field:res.country,address_format:0
+msgid "Address Format"
+msgstr ""
+
+#. module: base
+#: constraint:res.partner:0
+msgid "You cannot create recursive Partner hierarchies."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_no_one
+msgid "Technical Features"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Occitan (FR, post 1500) / Occitan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:215
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_data
+#: view:ir.model.data:0
+#: model:ir.ui.menu,name:base.ir_model_data_menu
+msgid "External Identifiers"
+msgstr ""
+
+#. module: base
+#. openerp-web
+#: code:addons/base/static/src/js/apps.js:104
+#, python-format
+msgid "Showing locally available modules"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Malayalam / മലയാളം"
+msgstr ""
+
+#. module: base
+#: field:res.request,body:0
+#: field:res.request.history,req_id:0
+msgid "Request"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
+msgid ""
+"The configuration wizards are used to help you configure a new instance of "
+"OpenERP. They are launched during the installation of new modules, but you "
+"can choose to restart some wizards manually from this menu."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw:0
+msgid "SXW Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_asset
+msgid ""
+"\n"
+"Financial and accounting asset management.\n"
+"==========================================\n"
+"\n"
+"This Module manages the assets owned by a company or an individual. It will "
+"keep \n"
+"track of depreciation's occurred on those assets. And it allows to create "
+"Move's \n"
+"of the depreciation lines.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.cron,numbercall:0
+msgid "Number of Calls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:192
+#, python-format
+msgid "BANK"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_point_of_sale
+#: model:ir.module.module,shortdesc:base.module_point_of_sale
+msgid "Point of Sale"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mail
+msgid ""
+"\n"
+"Business oriented Social Networking\n"
+"===================================\n"
+"The Social Networking module provides a unified social network abstraction "
+"layer allowing applications to display a complete\n"
+"communication history on documents with a fully-integrated email and message "
+"management system.\n"
+"\n"
+"It enables the users to read and send messages as well as emails. It also "
+"provides a feeds page combined to a subscription mechanism that allows to "
+"follow documents and to be constantly updated about recent news.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Clean and renewed communication history for any OpenERP document that can "
+"act as a discussion topic\n"
+"* Subscription mechanism to be updated about new messages on interesting "
+"documents\n"
+"* Unified feeds page to see recent messages and activity on followed "
+"documents\n"
+"* User communication through the feeds page\n"
+"* Threaded discussion design on documents\n"
+"* Relies on the global outgoing mail server - an integrated email management "
+"system - allowing to send emails with a configurable scheduler-based "
+"processing engine\n"
+"* Includes an extensible generic email composition assistant, that can turn "
+"into a mass-mailing assistant and is capable of interpreting simple "
+"*placeholder expressions* that will be replaced with dynamic data when each "
+"email is actually sent.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:295
+#, python-format
+msgid "Size of the field can never be less than 0 !"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,sequence:0
+msgid ""
+"Important when you deal with multiple actions, the execution order will be "
+"decided based on this, low number is higher priority."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gr
+msgid "Greece"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "Apply"
+msgstr ""
+
+#. module: base
+#: field:res.request,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Croatian / hrvatski jezik"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uy
+msgid ""
+"\n"
+"General Chart of Accounts.\n"
+"==========================\n"
+"\n"
+"Provide Templates for Chart of Accounts, Taxes for Uruguay.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gr
+msgid "Greece - Accounting"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Uninstallable"
+msgstr ""
+
+#. module: base
+#: view:res.partner.category:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Trigger"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_warehouse_management
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_update
+msgid "Update Module"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+msgid "Translate"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,body:0
+msgid "Body"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_gtd
+msgid ""
+"\n"
+"Implement concepts of the \"Getting Things Done\" methodology \n"
+"===========================================================\n"
+"\n"
+"This module implements a simple personal to-do list based on tasks. It adds "
+"an editable list of tasks simplified to the minimum required fields in the "
+"project application.\n"
+"\n"
+"The to-do list is based on the GTD methodology. This world-wide used "
+"methodology is used for personal time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management "
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by recording them externally. That way, the mind is freed from the job of "
+"remembering everything that needs to be done, and can concentrate on "
+"actually performing those tasks.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,menu_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,selection:0
+msgid ""
+"List of options for a selection field, specified as a Python expression "
+"defining a list of (key, label) pairs. For example: "
+"[('blue','Blue'),('yellow','Yellow')]"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "choose"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:446
+#, python-format
+msgid ""
+"Please define at least one SMTP server, or provide the SMTP parameters "
+"explicitly."
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Filter on my documents"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project_gtd
+msgid "Personal Tasks, Contexts, Timeboxes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cr
+msgid ""
+"\n"
+"Chart of accounts for Costa Rica.\n"
+"=================================\n"
+"\n"
+"Includes:\n"
+"---------\n"
+"    * account.type\n"
+"    * account.account.template\n"
+"    * account.tax.template\n"
+"    * account.tax.code.template\n"
+"    * account.chart.template\n"
+"\n"
+"Everything is in English with Spanish translation. Further translations are "
+"welcome,\n"
+"please go to http://translations.launchpad.net/openerp-costa-rica.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_supplier_form
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc2:0
+msgid "Document Ref 2"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc1:0
+msgid "Document Ref 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ga
+msgid "Gabon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_stock
+msgid "Inventory, Logistic, Storage"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: selection:ir.translation,type:0
+msgid "Help"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:ir.rule:0
+#: view:res.groups:0
+#: model:res.groups,name:base.group_erp_manager
+#: view:res.users:0
+msgid "Access Rights"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gl
+msgid "Greenland"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+#: field:res.partner.bank,acc_number:0
+msgid "Account Number"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 OR "
+"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 OR GROUP_B_RULE_2) )"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_th
+msgid "Thailand - Accounting"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nc
+msgid "New Caledonia (French)"
+msgstr ""
+
+#. module: base
+#: field:ir.model,osv_memory:0
+msgid "Transient Model"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cy
+msgid "Cyprus"
+msgstr ""
+
+#. module: base
+#: field:res.users,new_password:0
+msgid "Set Password"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,subject:0
+#: field:res.request,name:0
+#: view:res.request.link:0
+msgid "Subject"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_membership
+msgid ""
+"\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"=========================================================================\n"
+"\n"
+"It supports different kind of members:\n"
+"--------------------------------------\n"
+"    * Free member\n"
+"    * Associated member (e.g.: a group subscribes to a membership for all "
+"subsidiaries)\n"
+"    * Paid members\n"
+"    * Special member prices\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "Before Amount"
+msgstr ""
+
+#. module: base
+#: field:res.request,act_from:0
+#: field:res.request.history,act_from:0
+msgid "From"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Preferences"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_9
+msgid "Components Buyer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_tests_demo
+msgid ""
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.cron,function:0
+msgid "Name of the method to be called when this job is processed."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,tag:0
+msgid "Client action tag"
+msgstr ""
+
+#. module: base
+#: field:ir.values,model_id:0
+msgid "Model (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
+msgid ""
+"\n"
+"Demo data for the module marketing_campaign.\n"
+"============================================\n"
+"\n"
+"Creates demo data like leads, campaigns and segments for the module "
+"marketing_campaign.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Kanban"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:291
+#, python-format
+msgid ""
+"The Selection Options expression is must be in the [('key','Label'), ...] "
+"format!"
+msgstr ""
+
+#. module: base
+#: field:res.company,company_registry:0
+msgid "Company Registry"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+#: view:res.currency:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ir_mail_server_list
+#: view:ir.mail_server:0
+#: model:ir.ui.menu,name:base.menu_mail_servers
+msgid "Outgoing Mail Servers"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom
+msgid "Technical"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cn
+msgid "China"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,wkf_model_id:0
+msgid ""
+"The object that should receive the workflow signal (must have an associated "
+"workflow)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_account_voucher
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eh
+msgid "Western Sahara"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_account_voucher
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_company_form
+msgid ""
+"Create and manage the companies that will be managed by OpenERP from here. "
+"Shops or subsidiaries can be created and maintained from here."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.id
+msgid "Indonesia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_no_autopicking
+msgid ""
+"\n"
+"This module allows an intermediate picking process to provide raw materials "
+"to production orders.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"One example of usage of this module is to manage production made by your\n"
+"suppliers (sub-contracting). To achieve this, set the assembled product "
+"which is\n"
+"sub-contracted to 'No Auto-Picking' and put the location of the supplier in "
+"the\n"
+"routing of the assembly operation.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,expression:0
+msgid ""
+"Expression, must be True to match\n"
+"use context.get or user (browse)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bg
+msgid "Bulgaria"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tf
+msgid "French Southern Territories"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency
+#: field:res.company,currency_id:0
+#: field:res.company,currency_ids:0
+#: field:res.country,currency_id:0
+#: view:res.currency:0
+#: field:res.currency,name:0
+#: field:res.currency.rate,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "5.  %y, %Y         ==> 08, 2008"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_ltd
+msgid "ltd"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_double_validation
+msgid ""
+"\n"
+"Double-validation for purchases exceeding minimum amount.\n"
+"=========================================================\n"
+"\n"
+"This module modifies the purchase workflow in order to validate purchases "
+"that\n"
+"exceeds minimum amount set by configuration wizard.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_administration
+msgid "Administration"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Click on Update below to start the process..."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ir
+msgid "Iran"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovak / Slovenský jazyk"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,state:0
+#: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
+#: field:res.users,user_email:0
+msgid "unknown"
+msgstr ""
+
+#. module: base
+#: field:res.currency,symbol:0
+msgid "Symbol"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image_medium:0
+msgid ""
+"Medium-sized image of this contact. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved. Use this field in form views "
+"or some kanban views."
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+msgid "Synchronize Translation"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+#: field:res.partner.bank,bank_name:0
+msgid "Bank Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ki
+msgid "Kiribati"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.iq
+msgid "Iraq"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_association
+#: model:ir.ui.menu,name:base.menu_association
+#: model:ir.ui.menu,name:base.menu_report_association
+msgid "Association"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Action to Launch"
+msgstr ""
+
+#. module: base
+#: field:ir.model,modules:0
+#: field:ir.model.fields,modules:0
+msgid "In Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_contacts
+#: model:ir.ui.menu,name:base.menu_config_address_book
+msgid "Address Book"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence_type
+msgid "ir.sequence.type"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "CSV File"
+msgstr ""
+
+#. module: base
+#: field:res.company,account_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uk
+msgid ""
+"\n"
+"This is the latest UK OpenERP localisation necessary to run OpenERP "
+"accounting for UK SME's with:\n"
+"============================================================================="
+"====================\n"
+"    - a CT600-ready chart of accounts\n"
+"    - VAT100-ready tax structure\n"
+"    - InfoLogic UK counties listing\n"
+"    - a few other adaptations"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Base Object"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,priority:0
+#: field:ir.mail_server,sequence:0
+#: field:res.request,priority:0
+#: field:res.request.link,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Dependencies :"
+msgstr ""
+
+#. module: base
+#: field:res.company,vat:0
+msgid "Tax ID"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
+msgid "Bank Statement Extensions to Support e-banking"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,field_description:0
+msgid "Field Label"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_stock
+msgid ""
+"\n"
+"Manage sales quotations and orders\n"
+"==================================\n"
+"\n"
+"This module makes the link between the sales and warehouses management "
+"applications.\n"
+"\n"
+"Preferences\n"
+"-----------\n"
+"* Shipping: Choice of delivery at once or partial delivery\n"
+"* Invoicing: choose how invoices will be paid\n"
+"* Incoterms: International Commercial terms\n"
+"\n"
+"You can choose flexible invoicing methods:\n"
+"\n"
+"* *On Demand*: Invoices are created manually from Sales Orders when needed\n"
+"* *On Delivery Order*: Invoices are generated from picking (delivery)\n"
+"* *Before Delivery*: A Draft invoice is created and must be paid before "
+"delivery\n"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,value:0
+msgid "Translation Value"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ag
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zr
+msgid "Zaire"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project
+msgid "Projects, Tasks"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_id:0
+#: field:workflow.instance,res_id:0
+#: field:workflow.triggers,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: field:ir.model,info:0
+msgid "Information"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "false"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_analysis
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show important data to "
+"project manager of services companies.\n"
+"============================================================================="
+"======================================\n"
+"\n"
+"Adds menu to show relevant information to each manager.You can also view the "
+"report of account analytic summary user-wise as well as month-wise.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll_account
+msgid ""
+"\n"
+"Generic Payroll system Integrated with Accounting.\n"
+"==================================================\n"
+"\n"
+"    * Expense Encoding\n"
+"    * Payment Encoding\n"
+"    * Company Contribution Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Update Module List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:685
+#: code:addons/base/res/res_users.py:825
+#: selection:res.partner,type:0
+#: view:res.users:0
+#, python-format
+msgid "Other"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Turkish / Türkçe"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_activity_form
+#: model:ir.ui.menu,name:base.menu_workflow_activity
+#: field:workflow,activities:0
+msgid "Activities"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product
+msgid "Products & Pricelists"
+msgstr "Productos y Listas de Precios"
+
+#. module: base
+#: help:ir.filters,user_id:0
+msgid ""
+"The user this filter is private to. When left empty the filter is public and "
+"available to all users."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_refresh:0
+msgid "Auto-Refresh"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_expiry
+msgid ""
+"\n"
+"Track different dates on products and production lots.\n"
+"======================================================\n"
+"\n"
+"Following dates can be tracked:\n"
+"-------------------------------\n"
+"    - end of life\n"
+"    - best before date\n"
+"    - removal date\n"
+"    - alert date\n"
+"\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: base
+#: help:ir.translation,state:0
+msgid ""
+"Automatically set to let administators find new terms that might need to be "
+"translated"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "The osv_memory field can only be compared with = and != operator."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
+msgid "Picking Before Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_note_pad
+msgid "Sticky memos, Collaborative"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.wf
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr
+msgid ""
+"\n"
+"Human Resources Management\n"
+"==========================\n"
+"\n"
+"This application enables you to manage important aspects of your company's "
+"staff and other details such as their skills, contacts, working time...\n"
+"\n"
+"\n"
+"You can manage:\n"
+"---------------\n"
+"* Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"* HR Departments\n"
+"* HR Jobs\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_contract
+msgid ""
+"\n"
+"Add all information on the employee form to manage contracts.\n"
+"=============================================================\n"
+"\n"
+"    * Contract\n"
+"    * Place of Birth,\n"
+"    * Medical Examination Date\n"
+"    * Company Vehicle\n"
+"\n"
+"You can assign several contracts per employee.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:187
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language!"
+msgstr ""
+
+#. module: base
+#: view:ir.model.data:0
+#: field:ir.model.data,name:0
+msgid "External Identifier"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_audittrail
+msgid ""
+"\n"
+"This module lets administrator track every user operation on all the objects "
+"of the system.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"The administrator can subscribe to rules for read, write and delete on "
+"objects \n"
+"and can check logs.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.grant_menu_access
+#: model:ir.ui.menu,name:base.menu_grant_menu_access
+msgid "Menu Items"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_salesman_all_leads
+msgid ""
+"the user will have access to all records of everyone in the sales "
+"application."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event
+msgid "Events Organisation"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_actions
+#: model:ir.ui.menu,name:base.menu_ir_sequence_actions
+#: model:ir.ui.menu,name:base.next_id_6
+#: view:workflow.activity:0
+msgid "Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_delivery
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:263
+#, python-format
+msgid ""
+"This cron task is currently being executed and may not be modified, please "
+"try again in a few minutes"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: field:ir.exports.line,export_id:0
+msgid "Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ma
+msgid "Maroc - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,bic:0
+#: field:res.partner.bank,bank_bic:0
+msgid "Bank Identifier Code"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"CSV format: you may edit it directly with your favorite spreadsheet "
+"software,\n"
+"                                the rightmost column (value) contains the "
+"translations"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_chart
+msgid ""
+"\n"
+"Remove minimal account chart.\n"
+"=============================\n"
+"\n"
+"Deactivates minimal chart of accounts.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_to:0
+msgid "The destination activity."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue
+msgid "Issue Tracker"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+msgid "Update"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin
+msgid ""
+"\n"
+"The common interface for plug-in.\n"
+"=================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_crm
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"===========================================================================\n"
+"\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module, if you installed both the sale and "
+"the crm\n"
+"modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bq
+msgid "Bonaire, Sint Eustatius and Saba"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.ir_module_reference_print
+msgid "Technical guide"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tz
+msgid "Tanzania"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Danish / Dansk"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Advanced Search (deprecated)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cx
+msgid "Christmas Island"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_contacts
+msgid ""
+"\n"
+"This module gives you a quick view of your address book, accessible from "
+"your home page.\n"
+"You can track your suppliers, customers and other contacts.\n"
+msgstr ""
+
+#. module: base
+#: help:res.company,custom_footer:0
+msgid ""
+"Check this to define the report footer manually.  Otherwise it will be "
+"filled in automatically."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Supplier Partners"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Install Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_import_crm
+msgid "Import & Synchronize"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Customer Partners"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_multi_company_default
+msgid "Default multi company"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,src:0
+msgid "Source"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,date_init:0
+#: field:ir.model.relation,date_init:0
+msgid "Initialization Date"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vu
+msgid "Vanuatu"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_visible_discount
+msgid ""
+"\n"
+"This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"============================================================================="
+"==================================\n"
+"\n"
+"To this end, a new check box named 'Visible Discount' is added to the "
+"pricelist form.\n"
+"\n"
+"**Example:**\n"
+"    For the product PC1 and the partner \"Asustek\": if listprice=450, and "
+"the price\n"
+"    calculated using Asustek's pricelist is 225. If the check box is "
+"checked, we\n"
+"    will have on the sale order line: Unit price=450, Discount=50,00, Net "
+"price=225.\n"
+"    If the check box is unchecked, we will have on Sale Order and Invoice "
+"lines:\n"
+"    Unit price=225, Discount=0,00, Net price=225.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm
+msgid "CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_report_designer
+msgid ""
+"\n"
+"This module is used along with OpenERP OpenOffice Plugin.\n"
+"=========================================================\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that you can modify in "
+"OpenOffice. \n"
+"Once you have modified it you can upload the report using the same wizard.\n"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Start configuration"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Catalan / Català"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.do
+msgid "Dominican Republic"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Cyrillic) / српски"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2650
+#, python-format
+msgid ""
+"Invalid group_by specification: \"%s\".\n"
+"A group_by specification must be a list of valid fields."
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "TLS (STARTTLS)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,usage:0
+msgid "Used to filter menu and home actions from the user form."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sa
+msgid "Saudi Arabia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_mrp
+msgid ""
+"\n"
+"This module provides facility to the user to install mrp and sales modulesat "
+"a time.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"It is basically used when we want to keep track of production orders "
+"generated\n"
+"from sales order. It adds sales name and sales Reference on production "
+"order.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_obj_id:0
+#: field:ir.model.fields,relation_field:0
+msgid "Relation Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_project
+msgid ""
+"\n"
+"This module adds project menu and features (tasks) to your portal if project "
+"and portal are installed.\n"
+"============================================================================="
+"=========================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_configuration.py:38
+#, python-format
+msgid "System Configuration done"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,instance_id:0
+msgid "Destination Instance"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,multi:0
+#: field:ir.actions.wizard,multi:0
+msgid "Action on Multiple Doc."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_partner
+#: model:ir.ui.menu,name:base.menu_partner_title_partner
+msgid "Titles"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_anonymization
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"===============================================\n"
+"\n"
+"This module allows you to keep your data confidential for a given database.\n"
+"This process is useful, if you want to use the migration process and "
+"protect\n"
+"your own or your customer’s confidential data. The principle is that you "
+"run\n"
+"an anonymization tool which will hide your confidential data(they are "
+"replaced\n"
+"by ‘XXX’ characters). Then you can send the anonymized database to the "
+"migration\n"
+"team. Once you get back your migrated database, you restore it and reverse "
+"the\n"
+"anonymization process to recover your previous data.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,implementation:0
+msgid ""
+"Two sequence object implementations are offered: Standard and 'No gap'. The "
+"later is slower than the former but forbids any gap in the sequence (while "
+"they are possible in the former)."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gn
+msgid "Guinea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_diagram
+msgid "OpenERP Web Diagram"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "(edit company address)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_base_calendar
+msgid "Personal & Shared Calendar"
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_ui_menu.py:379
+#, python-format
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Web-only translations"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"3. If user belongs to several groups, the results from step 2 are combined "
+"with logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Belgium in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+"Thus, the pure copy of Chart Template is generated.\n"
+"\n"
+"Wizards provided by this module:\n"
+"--------------------------------\n"
+"    * Partner VAT Intra: Enlist the partners with their related VAT and "
+"invoiced\n"
+"      amounts. Prepares an XML file format.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Partner VAT Intra\n"
+"    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration "
+"of\n"
+"      the Main company of the User currently Logged in.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Periodical VAT Declaration\n"
+"    * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for "
+"Vat\n"
+"      Declaration of the Main company of the User currently Logged in Based "
+"on\n"
+"      Fiscal year.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Annual Listing Of VAT-Subjected Customers\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_gengo
+msgid "Automated Translations through Gengo API"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_payment
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sv
+msgid "El Salvador"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:161
+#: field:res.bank,phone:0
+#: field:res.company,phone:0
+#: field:res.partner,phone:0
+#, python-format
+msgid "Phone"
+msgstr ""
+
+#. module: base
+#: field:res.groups,menu_access:0
+msgid "Access Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.th
+msgid "Thailand"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_account_voucher
+msgid "Send Invoices and Track Payments"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_lead
+msgid "Leads & Opportunities"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gg
+msgid "Guernsey"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Romanian / română"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_tr
+msgid ""
+"\n"
+"Türkiye için Tek düzen hesap planı şablonu OpenERP Modülü.\n"
+"==========================================================\n"
+"\n"
+"Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır\n"
+"    * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket, banka "
+"hesap\n"
+"      bilgileriniz, ilgili para birimi gibi bilgiler isteyecek.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "And"
+msgstr ""
+
+#. module: base
+#: help:ir.values,res_id:0
+msgid ""
+"Database identifier of the record to which this applies. 0 = for all records"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,relation:0
+msgid "Object Relation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_voucher
+msgid "eInvoicing & Payments"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "General"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uz
+msgid "Uzbekistan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vi
+msgid "Virgin Islands (USA)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tw
+msgid "Taiwan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency_rate
+msgid "Currency Rate"
+msgstr "Tasa de Cambio"
+
+#. module: base
+#. openerp-web
+#: code:addons/base/static/src/js/apps.js:104
+#, python-format
+msgid "OpenERP Apps Unreachable"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+#: field:base.module.upgrade,module_info:0
+msgid "Modules to Update"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
+#. module: base
+#: field:workflow,osv:0
+#: view:workflow.instance:0
+#: field:workflow.instance,res_type:0
+msgid "Resource Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_helpdesk
+msgid "Helpdesk"
+msgstr "Mesa de Ayuda (Helpdesk)"
+
+#. module: base
+#: field:ir.rule,perm_write:0
+msgid "Apply for Write"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_page
+msgid ""
+"\n"
+"Pages\n"
+"=====\n"
+"Web pages\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,code:0
+msgid ""
+"Python code to be executed if condition is met.\n"
+"It is a Python block that can use the same values as for the condition field"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.grant_menu_access
+msgid ""
+"Manage and customize the items available and displayed in your OpenERP "
+"system menu. You can delete an item by clicking on the box at the beginning "
+"of each line and then delete it through the button that appeared. Items can "
+"be assigned to specific groups in order to make them accessible to some "
+"users within the system."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,field_parent:0
+msgid "Child Field"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Detailed algorithm:"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,usage:0
+#: field:ir.actions.act_window,usage:0
+#: field:ir.actions.act_window_close,usage:0
+#: field:ir.actions.actions,usage:0
+#: field:ir.actions.client,usage:0
+#: field:ir.actions.report.xml,usage:0
+#: field:ir.actions.server,usage:0
+#: field:ir.actions.wizard,usage:0
+msgid "Action Usage"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,name:0
+msgid "Technical Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_workitem
+msgid "workflow.workitem"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_tools
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+msgid "Not Installable"
+msgstr ""
+
+#. module: base
+#: help:res.lang,iso_code:0
+msgid "This ISO code is the name of po files to use for translations"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "View :"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,view_load:0
+msgid "View Auto-Load"
+msgstr ""
+
+#. module: base
+#: view:res.country:0
+msgid "Address format..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Allowed Companies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_de
+msgid "Deutschland - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the Year: %(doy)s"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon:0
+msgid "Web Icon File"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
+msgid "Apply Scheduled Upgrades"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_journal
+msgid "Invoicing Journals"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,groups_id:0
+msgid ""
+"If this field is empty, the view applies to all users. Otherwise, the view "
+"applies to the users of those groups only."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Persian / فارس"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Settings"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,src_model:0
+msgid "Source Model"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the Week (0:Monday): %(weekday)s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:509
+#: code:addons/base/ir/ir_model.py:570
+#: code:addons/base/ir/ir_model.py:1031
+#, python-format
+msgid "Administrator access is required to uninstall a module"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_configuration
+msgid "base.module.configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3568
+#: code:addons/orm.py:3861
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_idea
+msgid ""
+"\n"
+"This module allows user to easily and efficiently participate in enterprise "
+"innovation.\n"
+"============================================================================="
+"==========\n"
+"\n"
+"It allows everybody to express ideas about different subjects.\n"
+"Then, other users can comment on these ideas and vote for particular ideas.\n"
+"Each idea has a score based on the different votes.\n"
+"The managers can obtain an easy view of best ideas from all the users.\n"
+"Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:5322
+#: code:addons/orm.py:5337
+#, python-format
+msgid ""
+"%s This might be '%s' in the current model, or a field of the same name in "
+"an o2m."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_payment
+msgid ""
+"\n"
+"Module to manage the payment of your supplier invoices.\n"
+"=======================================================\n"
+"\n"
+"This module allows you to create and manage your payment orders, with "
+"purposes to\n"
+"-----------------------------------------------------------------------------"
+"---- \n"
+"    * serve as base for an easy plug-in of various automated payment "
+"mechanisms.\n"
+"    * provide a more efficient way to manage invoice payment.\n"
+"\n"
+"Warning:\n"
+"~~~~~~~~\n"
+"The confirmation of a payment order does _not_ create accounting entries, it "
+"just \n"
+"records the fact that you gave your payment order to your bank. The booking "
+"of \n"
+"your order must be encoded as usual through a bank statement. Indeed, it's "
+"only \n"
+"when you get the confirmation from your bank that your order has been "
+"accepted \n"
+"that you can book it in your accounting. To help you with that operation, "
+"you \n"
+"have a new option to import payment orders as bank statement lines.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.model,access_ids:0
+#: view:ir.model.access:0
+msgid "Access"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:165
+#: field:res.partner,vat:0
+#, python-format
+msgid "TIN"
+msgstr "RUC"
+
+#. module: base
+#: model:res.country,name:base.aw
+msgid "Aruba"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:58
+#, python-format
+msgid "File is not a zip file!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ar
+msgid "Argentina"
+msgstr ""
+
+#. module: base
+#: field:res.groups,full_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bh
+msgid "Bahrain"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:162
+#: field:res.bank,fax:0
+#: field:res.company,fax:0
+#: field:res.partner,fax:0
+#, python-format
+msgid "Fax"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,company_id:0
+#: field:ir.default,company_id:0
+#: field:ir.property,company_id:0
+#: field:ir.sequence,company_id:0
+#: field:ir.values,company_id:0
+#: view:res.company:0
+#: field:res.currency,company_id:0
+#: view:res.partner:0
+#: field:res.partner,company_id:0
+#: field:res.partner.bank,company_id:0
+#: view:res.users:0
+#: field:res.users,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_report_designer
+msgid "Advanced Reporting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_purchase
+msgid "Purchase Orders, Receptions, Supplier Invoices"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll
+msgid ""
+"\n"
+"Generic Payroll system.\n"
+"=======================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances/Deductions\n"
+"    * Allow to configure Basic/Gross/Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_data
+msgid "ir.model.data"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bulgarian / български език"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_aftersale
+msgid "After-Sale Services"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,code:0
+msgid "ISO Code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr
+msgid "France - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch"
+msgstr ""
+
+#. module: base
+#: selection:res.partner,type:0
+msgid "Shipping"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_mrp
+msgid ""
+"\n"
+"Automatically creates project tasks from procurement lines.\n"
+"===========================================================\n"
+"\n"
+"This module will automatically create a new task for each procurement order "
+"line\n"
+"(e.g. for sale order lines), if the corresponding product meets the "
+"following\n"
+"characteristics:\n"
+"\n"
+"    * Product Type = Service\n"
+"    * Procurement Method (Order fulfillment) = MTO (Make to Order)\n"
+"    * Supply/Procurement Method = Manufacture\n"
+"\n"
+"If on top of that a projet is specified on the product form (in the "
+"Procurement\n"
+"tab), then the new task will be created in that specific project. Otherwise, "
+"the\n"
+"new task will not belong to any project, and may be added to a project "
+"manually\n"
+"later.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly. For example, if this procurement "
+"corresponds\n"
+"to a sale order line, the sale order line will be considered delivered when "
+"the\n"
+"task is completed.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,limit:0
+msgid "Limit"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_user
+msgid "Officer"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:787
+#, python-format
+msgid "Serialization field `%s` not found for sparse field `%s`!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jm
+msgid "Jamaica"
+msgstr ""
+
+#. module: base
+#: field:res.partner,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_manufacturing
+#: model:ir.ui.menu,name:base.menu_mrp_config
+#: model:ir.ui.menu,name:base.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_survey
+msgid ""
+"\n"
+"This module is used for surveying.\n"
+"==================================\n"
+"\n"
+"It depends on the answers or reviews of some questions by different users. "
+"A\n"
+"survey may have multiple pages. Each page may contain multiple questions and "
+"each\n"
+"question may have multiple answers. Different users may give different "
+"answers of\n"
+"question and according to that survey is done. Partners are also sent mails "
+"with\n"
+"user name and password for the invitation of the survey.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:165
+#, python-format
+msgid "Model '%s' contains module data and cannot be removed!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.az
+msgid "Azerbaijan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:481
+#: code:addons/base/ir/ir_sequence.py:259
+#: code:addons/base/res/res_partner.py:360
+#: code:addons/base/res/res_partner.py:566
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_edi
+msgid "Electronic Data Interchange (EDI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cn
+msgid ""
+"\n"
+"添加中文省份数据\n"
+"科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"============================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vg
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+#: model:ir.ui.menu,name:base.menu_ir_property
+msgid "Parameters"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "e.g. Sales Director"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Czech / Čeština"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules
+msgid "Generic Modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mk
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rw
+msgid "Rwanda"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_openid
+msgid ""
+"\n"
+"Allow users to login through OpenID.\n"
+"====================================\n"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_port:0
+msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ck
+msgid "Cook Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,noupdate:0
+msgid "Non Updatable"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Klingon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sg
+msgid "Singapore"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Current Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden
+#: view:res.users:0
+msgid "Technical Settings"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_accounting_and_finance
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
+msgid "Thunderbird Plug-In"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_event
+msgid "Trainings, Conferences, Meetings, Exhibitions, Registrations"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country
+#: view:res.bank:0
+#: field:res.bank,country:0
+#: view:res.company:0
+#: field:res.company,country_id:0
+#: view:res.country:0
+#: field:res.country.state,country_id:0
+#: view:res.partner:0
+#: field:res.partner,country:0
+#: field:res.partner,country_id:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,country_id:0
+#: view:res.users:0
+msgid "Country"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_15
+msgid "Wholesaler"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_vat
+msgid "VAT Number Validation"
+msgstr "Validación del RUC"
+
+#. module: base
+#: field:ir.model.fields,complete_name:0
+msgid "Complete Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.wizard,multi:0
+msgid ""
+"If set to true, the wizard will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Bindings/Defaults"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"file encoding, please be sure to view and edit\n"
+"                           using the same encoding."
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"1. Global rules are combined together with a logical AND operator, and with "
+"the result of the following steps"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_nl
+msgid "Netherlands - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gs
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%X - Appropriate time representation."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (SV) / Español (SV)"
+msgstr ""
+
+#. module: base
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
+"106,500. Provided ',' as the thousand separator in each case."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,auto_install:0
+msgid "Automatic Installation"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "e.g. en_US"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_hn
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Honduras.\n"
+"====================================================================\n"
+"    \n"
+"Agrega una nomenclatura contable para Honduras. También incluye impuestos y "
+"la\n"
+"moneda Lempira. -- Adds accounting chart for Honduras. It also includes "
+"taxes\n"
+"and the Lempira currency."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jp
+msgid "Japan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:418
+#, python-format
+msgid "Can only rename one column at a time!"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Report/Template"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_budget
+msgid ""
+"\n"
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"==========================================================================\n"
+"\n"
+"Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project "
+"Managers \n"
+"can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget in order to ensure the total planned is not greater/lower than what "
+"he \n"
+"planned for this Budget. Each list of record can also be switched to a "
+"graphical \n"
+"view of it.\n"
+"\n"
+"Three reports are available:\n"
+"----------------------------\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for \n"
+"       these Budgets, of the Analytic Accounts.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, \n"
+"       for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives \n"
+"       the spreading, for the selected Analytic Accounts of Budgets.\n"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Graph"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_server
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.server"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ca
+msgid "Canada - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
+#: model:ir.model,name:base.model_ir_actions_todo
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
+msgid "Configuration Wizards"
+msgstr ""
+
+#. module: base
+#: field:res.lang,code:0
+msgid "Locale Code"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,split_mode:0
+msgid "Split Mode"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Note that this operation might take a few minutes."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:363
+#, python-format
+msgid ""
+"Ambiguous specification for field '%(field)s', only provide one of name, "
+"external id or database id"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,implementation:0
+msgid "Implementation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ve
+msgid "Venezuela - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cl
+msgid "Chile"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_view_editor
+msgid "View Editor"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Execution"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,condition:0
+#: view:ir.values:0
+#: field:workflow.transition,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:669
+#, python-format
+msgid "Module not found"
+msgstr ""
+
+#. module: base
+#: help:res.currency,rate:0
+msgid "The rate of the currency to the currency of rate 1."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,name:0
+msgid "View Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Italian / Italiano"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Only one client action will be executed, last client action will be "
+"considered in case of multiple client actions."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_jit
+msgid ""
+"\n"
+"This module allows Just In Time computation of procurement orders.\n"
+"==================================================================\n"
+"\n"
+"If you install this module, you will not have to run the regular "
+"procurement\n"
+"scheduler anymore (but you still need to run the minimum order point rule\n"
+"scheduler, or for example let it run daily).\n"
+"All procurement orders will be processed immediately, which could in some\n"
+"cases entail a small performance impact.\n"
+"\n"
+"It may also increase your stock size because products are reserved as soon\n"
+"as possible and the scheduler time range is not taken into account anymore.\n"
+"In that case, you can not use priorities any more on the different picking.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hr
+msgid "Croatia"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,mobile:0
+msgid "Mobile No"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_by_category
+#: model:ir.actions.act_window,name:base.action_partner_category_form
+#: model:ir.model,name:base.model_res_partner_category
+#: view:res.partner.category:0
+msgid "Partner Categories"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "System Update"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw_content:0
+#: field:ir.actions.report.xml,report_sxw_content_data:0
+msgid "SXW Content"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sc
+msgid "Seychelles"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_4
+msgid "Gold"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:173
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
+#: model:ir.model,name:base.model_res_partner_bank
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
+#: view:res.company:0
+#: field:res.company,bank_ids:0
+#: view:res.partner.bank:0
+#, python-format
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:185
+#, python-format
+msgid "Base Language 'en_US' can not be deleted!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sl
+msgid "Sierra Leone"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "General Information"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,complete_name:0
+msgid "Complete ID"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:res.partner,vat:0
+msgid ""
+"Tax Identification Number. Check the box if this contact is subjected to "
+"taxes. Used by the some of the legal statements."
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,partner_id:0
+msgid "Account Owner"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_procurement
+msgid ""
+"\n"
+"This is the module for computing Procurements.\n"
+"==============================================\n"
+"\n"
+"In the MRP process, procurements orders are created to launch manufacturing\n"
+"orders, purchase orders, stock allocations. Procurement orders are\n"
+"generated automatically by the system and unless there is a problem, the\n"
+"user will not be notified. In case of problems, the system will raise some\n"
+"procurement exceptions to inform the user about blocking problems that need\n"
+"to be resolved manually (like, missing BoM structure or missing supplier).\n"
+"\n"
+"The procurement order will schedule a proposal for automatic procurement\n"
+"for the product which needs replenishment. This procurement will start a\n"
+"task, either a purchase order form for the supplier, or a production order\n"
+"depending on the product's configuration.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.open_module_tree
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
+#, python-format
+msgid "Company Switch Warning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_manufacturing
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,kind:0
+msgid "Function"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_customer_relationship_management
+msgid ""
+"Manage relations with prospects and customers using leads, opportunities, "
+"requests or issues."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project
+msgid ""
+"\n"
+"Track multi-level projects, tasks, work done on tasks\n"
+"=====================================================\n"
+"\n"
+"This application allows an operational project management system to organize "
+"your activities into tasks and plan the work you need to get the tasks "
+"completed.\n"
+"\n"
+"Gantt diagrams will give you a graphical representation of your project "
+"plans, as well as resources availability and workload.\n"
+"\n"
+"Dashboard / Reports for Project Management will include:\n"
+"--------------------------------------------------------\n"
+"* My Tasks\n"
+"* Open Tasks\n"
+"* Tasks Analysis\n"
+"* Cumulative Flow\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_pvt_ltd
+#: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
+msgid "Corp."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_requisition
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Inline Edit"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base
+#: view:workflow.instance:0
+msgid "Workflow Instances"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:684
+#, python-format
+msgid "Partners: "
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Is a Company?"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:173
+#: field:res.partner.bank,name:0
+#, python-format
+msgid "Bank Account"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kp
+msgid "North Korea"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Create Object"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ss
+msgid "South Sudan"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,context:0
+msgid "Context"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_mrp
+msgid "Sales and MRP Management"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer; discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_2
+msgid "Prospect"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
+msgid "Invoice Picking Directly"
+msgstr "Facturar Guía Directamente"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Polish / Język polski"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,name:0
+msgid "Export Name"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_sequence.py:259
+#, python-format
+msgid "Invalid prefix or suffix for sequence '%s'"
+msgstr ""
+
+#. module: base
+#: help:res.partner,type:0
+msgid ""
+"Used to select automatically the right address according to the context in "
+"sales and purchases documents."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and purchase orders.\n"
+"====================================================================\n"
+"\n"
+"Allows the user to maintain several analysis plans. These let you split a "
+"line\n"
+"on a supplier purchase order into several accounts and analytic plans.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lk
+msgid "Sri Lanka"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view:0
+msgid "Search View"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Russian / русский язык"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_signup
+msgid "Signup"
+msgstr ""

From a48c8119ca44ad8e90756f2d86627ab0edf8bf67 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Wed, 11 Dec 2013 11:38:42 +0100
Subject: [PATCH 446/547] [FIX] name_search() where _rec_name is a reference
 field and links are broken

bzr revid: cto@openerp.com-20131211103842-i1n9t8mg9kuw77v3
---
 openerp/osv/fields.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index da09fe0e27e..9921e3f762d 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -204,7 +204,8 @@ class reference(_column):
             model_name, res_id = value.split(',')
             model = obj.pool.get(model_name)
             if model and res_id:
-                return model.name_get(cr, uid, [int(res_id)], context=context)[0][1]
+                names = model.name_get(cr, uid, [int(res_id)], context=context)
+                return names[0][1] if names else False
         return tools.ustr(value)
 
 # takes a string (encoded in utf8) and returns a string (encoded in utf8)

From 89a9dbee75bbf53b9ef5f62da5629d566d42ab54 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 11 Dec 2013 14:41:20 +0100
Subject: [PATCH 447/547] [FIX] mrp: cost structure report, do not display
 twice main supplier

bzr revid: dle@openerp.com-20131211134120-fco4rlqjh258ba36
---
 addons/mrp/report/price.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 2e37011e2bc..2bfab5dd6ca 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -69,6 +69,8 @@ class report_custom(report_rml):
             main_strd_price = str(std_price) + '\r\n'
             sum_strd = prod_qtty*std_price
             for seller_id in prod.seller_ids:
+                if seller_id.name.id == prod.seller_id.id:
+                    continue
                 sellers +=  '- <i>'+ to_xml(seller_id.name.name) +'</i>\r\n'
                 pricelist = seller_id.name.property_product_pricelist_purchase
                 price = pricelist_pool.price_get(cr,uid,[pricelist.id],

From 920ba459353d13946c2bde804fb64c8e146b15cf Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 11 Dec 2013 17:18:10 +0100
Subject: [PATCH 448/547] [FIX] filter the context keys only on the result
 action of the button

bzr revid: chs@openerp.com-20131211161810-hetgizet5mv3xkys
---
 addons/web/static/src/js/views.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 1ee89238e7d..517a6ced723 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1355,20 +1355,19 @@ instance.web.View = instance.web.Widget.extend({
                 return self.getParent().on_action_executed.apply(null, arguments);
             }
         };
-        var context = dataset.get_context();
-        if (action_data.model !== dataset.model) {
-            // filter out context keys that are specific to the action model.
-            // Wrong default_ and search_default values will no give the expected views
-            // Wrong group_by values will simply fail and forbid rendering of the destination view
-            context = _.object(_.reject(_.pairs(context.eval()), function(pair) {
-                return pair[0].match('^(?:(?:default_|search_default_).+|group_by|group_by_no_leaf)$') !== null;
-            }));
-        }
+        var context = new instance.web.CompoundContext(dataset.get_context(), action_data.context || {});
 
-        context = new instance.web.CompoundContext(context, action_data.context || {});
+        // response handler
         var handler = function (action) {
             if (action && action.constructor == Object) {
-                var ncontext = new instance.web.CompoundContext(context);
+                // filter out context keys that are specific to the current action.
+                // Wrong default_* and search_default_* values will no give the expected result
+                // Wrong group_by values will simply fail and forbid rendering of the destination view
+                var ncontext = new instance.web.CompoundContext(
+                    _.object(_.reject(_.pairs(context.eval()), function(pair) {
+                      return pair[0].match('^(?:(?:default_|search_default_).+|group_by|group_by_no_leaf)$') !== null;
+                    }))
+                );
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,

From 9241d5f6993a662c1bc194f828cf39f4c04efb7a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 11 Dec 2013 17:36:09 +0100
Subject: [PATCH 449/547] [FIX] when executing action received from a button
 call, set active_id and active_ids if there is one, remove existing if not;
 always set active_model

bzr revid: chs@openerp.com-20131211163609-i3s2mlncf5n91uda
---
 addons/web/static/src/js/views.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 517a6ced723..1d7ed406378 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1365,14 +1365,14 @@ instance.web.View = instance.web.Widget.extend({
                 // Wrong group_by values will simply fail and forbid rendering of the destination view
                 var ncontext = new instance.web.CompoundContext(
                     _.object(_.reject(_.pairs(context.eval()), function(pair) {
-                      return pair[0].match('^(?:(?:default_|search_default_).+|group_by|group_by_no_leaf)$') !== null;
+                      return pair[0].match('^(?:(?:default_|search_default_).+|group_by|group_by_no_leaf|active_id|active_ids)$') !== null;
                     }))
                 );
+                ncontext.add({active_model: dataset.model});
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,
                         active_ids: [record_id],
-                        active_model: dataset.model
                     });
                 }
                 ncontext.add(action.context || {});

From 942a10f2b37b06e71481bdd2224e533beff1646e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 11 Dec 2013 18:14:29 +0100
Subject: [PATCH 450/547] [REVERT] rev 9007
 dle@openerp.com-20131122150606-ruqe2l0e7gn84upf

default_model and default_res_id were not present when doing this fix, because in the web client, we prevented the propagation of the context keys beginning with "_default" in some cases.
The fact is that, in this specific case, the keys "default_" should not have been removed. This has been fix in web client in
rev 3892 revid:chs@openerp.com-20131211163609-i3s2mlncf5n91uda

Besides, active_model cannot be used here, as active_model is not 'sale.order' but the model of the wizard.

bzr revid: dle@openerp.com-20131211171429-6bxuh7o4ueiy9dd1
---
 addons/sale/sale.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 88cd20bd786..6584d25bdad 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -997,9 +997,9 @@ class mail_compose_message(osv.Model):
 
     def send_mail(self, cr, uid, ids, context=None):
         context = context or {}
-        if context.get('active_model') == 'sale.order' and context.get('active_ids') and context.get('mark_so_as_sent'):
+        if context.get('default_model') == 'sale.order' and context.get('default_res_id') and context.get('mark_so_as_sent'):
             context = dict(context, mail_post_autofollow=True)
-            self.pool.get('sale.order').signal_quotation_sent(cr, uid, context['active_ids'])
+            self.pool.get('sale.order').signal_quotation_sent(cr, uid, [context['default_res_id']])
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
 
 

From 291bc4a69d4a057fb0a4e27a098a718d243555b3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 11 Dec 2013 19:00:25 +0100
Subject: [PATCH 451/547] [FIX] hr_holidays: on change holiday type to employee
 tag, set employee to False.

Otherwise, the user who creates the allocation request by employee tag will benefit of the leaves he just entered, twice if he has the employee tag, once if has not the employee tag(and in this last case, he should not have this leave allocation, as he do not have the tag

bzr revid: dle@openerp.com-20131211180025-pg8kf13bt6d1vk9l
---
 addons/hr_holidays/hr_holidays.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 682508e0ca0..a30b874bd8a 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -242,6 +242,10 @@ class hr_holidays(osv.osv):
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
+        elif holiday_type != 'employee':
+            result['value'] = {
+                    'employee_id': False
+                }
         return result
 
     def onchange_employee(self, cr, uid, ids, employee_id):

From 43627cc63a501bca5261e0c394f061ae4e51d32a Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 12 Dec 2013 10:45:18 +0100
Subject: [PATCH 452/547] [FIX] makes sure the web client loads the
 bootstrap.js file instead of using dropdown.js in web_graph (addon web)

bzr revid: ged@openerp.com-20131212094518-jlau88zb0bxjj966
---
 addons/web/__openerp__.py               |  1 +
 addons/web_graph/__openerp__.py         |  1 -
 addons/web_graph/static/lib/dropdown.js | 92 -------------------------
 3 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 addons/web_graph/static/lib/dropdown.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 9ea84a3501f..09347eea24c 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -36,6 +36,7 @@ This module provides the core of the OpenERP Web Client.
         "static/lib/jquery.tipsy/jquery.tipsy.js",
         "static/lib/jquery.textext/jquery.textext.js",
         "static/lib/jquery.timeago/jquery.timeago.js",
+        "static/lib/bootstrap/js/bootstrap.js",
         "static/lib/qweb/qweb2.js",
         "static/lib/underscore/underscore.js",
         "static/lib/underscore.string/lib/underscore.string.js",
diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index c62a1877ee0..b40b9f5c9d9 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -15,7 +15,6 @@ Graph Views for Web Client.
     'version': '3.0',
     'depends': ['web'],
     'js': [
-        'static/lib/dropdown.js',
         'static/lib/flotr2/lib/bean.js',
         'static/lib/flotr2/js/Flotr.js',
         'static/lib/flotr2/js/DefaultOptions.js',
diff --git a/addons/web_graph/static/lib/dropdown.js b/addons/web_graph/static/lib/dropdown.js
deleted file mode 100644
index 54b61c5e9d0..00000000000
--- a/addons/web_graph/static/lib/dropdown.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ============================================================
- * bootstrap-dropdown.js v2.0.2
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function( $ ){
-
-  "use strict"
-
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle="dropdown"]'
-    , Dropdown = function ( element ) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
-
-  Dropdown.prototype = {
-
-    constructor: Dropdown
-
-  , toggle: function ( e ) {
-      var $this = $(this)
-        , selector = $this.attr('data-target')
-        , $parent
-        , isActive
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      $parent = $(selector)
-      $parent.length || ($parent = $this.parent())
-
-      isActive = $parent.hasClass('open')
-
-      clearMenus()
-      !isActive && $parent.toggleClass('open')
-
-      return false
-    }
-
-  }
-
-  function clearMenus() {
-    $(toggle).parent().removeClass('open')
-  }
-
-
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
-
-  $.fn.dropdown = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
-
-  $(function () {
-    $('html').on('click.dropdown.data-api', clearMenus)
-    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-  })
-
-}( window.jQuery );
\ No newline at end of file

From 3d21d89c93da8060b0189170071994a1feb5a211 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Dec 2013 11:14:44 +0100
Subject: [PATCH 453/547] [FIX] gamification: change field name unit -> suffix

bzr revid: mat@openerp.com-20131212101444-v1y643ra8kl4eet0
---
 addons/gamification_sale_crm/sale_crm_goals.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 6336f0e0654..1951d25d4fe 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -18,7 +18,7 @@
             <field name="name">New Leads</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
-            <field name="unit">leads</field>
+            <field name="suffix">leads</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
             <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
@@ -29,7 +29,7 @@
             <field name="description">The average number of days to open the case (lower than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
-            <field name="unit">days</field>
+            <field name="suffix">days</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
@@ -41,7 +41,7 @@
             <field name="description">The average number of days to close the case (lower than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">lower</field>
-            <field name="unit">days</field>
+            <field name="suffix">days</field>
             <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
             <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_open')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_report_opening_date')" />
@@ -53,7 +53,7 @@
             <field name="name">Logged Calls</field>
             <field name="description">Log a certain number of calls to reach this goal</field>
             <field name="computation_mode">count</field>
-            <field name="unit">calls</field>
+            <field name="suffix">calls</field>
             <field name="model_id" eval="ref('crm.model_crm_phonecall')" />
             <field name="field_date_id" eval="ref('crm.field_crm_phonecall_date_closed')" />
             <field name="domain">[('user_id','=',user.id),('state','=','done')]</field>
@@ -63,7 +63,7 @@
             <field name="name">New Opportunities</field>
             <field name="description">Based on the opening date</field>
             <field name="computation_mode">count</field>
-            <field name="unit">opportunities</field>
+            <field name="suffix">opportunities</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_date_open')" />
             <field name="domain">[('user_id','=',user.id),('type','=','opportunity')]</field>
@@ -73,7 +73,7 @@
             <field name="name">New Sales Orders</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
-            <field name="unit">orders</field>
+            <field name="suffix">orders</field>
             <field name="model_id" eval="ref('sale.model_sale_order')" />
             <field name="field_date_id" eval="ref('sale.field_sale_order_date_order')" />
             <field name="domain">[('user_id','=',user.id),('state','not in',('draft', 'sent', 'cancel'))]</field>
@@ -83,7 +83,7 @@
             <field name="name">Paid Sales Orders</field>
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
-            <field name="unit">orders</field>
+            <field name="suffix">orders</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','=','paid'),('user_id','=',user.id),('type','=','out_invoice')]</field>
@@ -105,7 +105,7 @@
             <field name="description">Refund the least customers (lower than)</field>
             <field name="computation_mode">count</field>
             <field name="condition">lower</field>
-            <field name="unit">invoices</field>
+            <field name="suffix">invoices</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_refund')]</field>

From 8a8068856028d64489a3e67c895ccca652d95ddf Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Dec 2013 11:26:24 +0100
Subject: [PATCH 454/547] [FIX] gamification: move icon to description folder

bzr revid: mat@openerp.com-20131212102624-obfsh2nsclhpv4n9
---
 .../static/{src/img => description}/icon.png        | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/gamification/static/{src/img => description}/icon.png (100%)

diff --git a/addons/gamification/static/src/img/icon.png b/addons/gamification/static/description/icon.png
similarity index 100%
rename from addons/gamification/static/src/img/icon.png
rename to addons/gamification/static/description/icon.png

From a3a23bff532b4dda20b27ac82ab91ae790694a2e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Dec 2013 11:31:15 +0100
Subject: [PATCH 455/547] [FIX] hr_gamification: hr officers can see any goals

bzr revid: mat@openerp.com-20131212103115-1i3tn2cez2iee8e3
---
 addons/hr_gamification/__openerp__.py           |  1 +
 .../security/gamification_security.xml          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 addons/hr_gamification/security/gamification_security.xml

diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index d98e7df3f24..7dbf5d76df2 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -32,6 +32,7 @@ Badge received are displayed on the user profile.
 """,
     'data': [
         'security/ir.model.access.csv',
+        'security/gamification_security.xml',
         'gamification_view.xml',
     ],
     'js': ['static/src/js/gamification.js'],
diff --git a/addons/hr_gamification/security/gamification_security.xml b/addons/hr_gamification/security/gamification_security.xml
new file mode 100644
index 00000000000..e0f9a6cf918
--- /dev/null
+++ b/addons/hr_gamification/security/gamification_security.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="goal_officer_visibility" model="ir.rule">
+            <field name="name">HR Officer can see any goal</field>
+            <field name="model_id" ref="gamification.model_gamification_goal"/>
+            <field name="groups" eval="[(4, ref('base.group_hr_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+        </record>
+
+    </data>
+</openerp>

From f02ed9b4cbcd594258e1ea374054aa574fe75930 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Dec 2013 11:50:05 +0100
Subject: [PATCH 456/547] [FIX] gamification_sale_crm: include lead converted
 to opportunity into lead count goal

bzr revid: mat@openerp.com-20131212105005-waw5n2wpe0gzwxqg
---
 addons/gamification_sale_crm/sale_crm_goals.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 1951d25d4fe..a90825e3671 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -21,7 +21,8 @@
             <field name="suffix">leads</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
             <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
-            <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
+            <!-- lead AND opportunity as don't want to be penalised for lead converted to opportunity -->
+            <field name="domain">[('user_id','=',user.id), '|', ('type', '=', 'lead'), ('type', '=', 'opportunity')]</field>
         </record>
 
         <record model="gamification.goal.type" id="type_crm_lead_delay_open">

From 1a9f24c56d09e92c72d431e0fe6242bcf9cc7d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Dec 2013 11:51:40 +0100
Subject: [PATCH 457/547] [FIX] l10n_us, l10n_ma: added missing accounts for
 product categories

bzr revid: tde@openerp.com-20131212105140-tmg6yzhkaxlu8v61
---
 addons/l10n_ma/l10n_ma_tax.xml                  | 2 ++
 addons/l10n_us/account.account.template.csv     | 2 ++
 addons/l10n_us/account_chart_template_after.xml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/addons/l10n_ma/l10n_ma_tax.xml b/addons/l10n_ma/l10n_ma_tax.xml
index 5bc59035861..3040cd4e78e 100644
--- a/addons/l10n_ma/l10n_ma_tax.xml
+++ b/addons/l10n_ma/l10n_ma_tax.xml
@@ -745,6 +745,8 @@
         <field name="property_account_receivable" ref="pcg_3488"/>
         <field name="property_account_payable" ref="pcg_4488"/>
         <field name="currency_id" ref="base.MAD"/>
+        <field name="property_account_income_categ" ref="pcg_7111"/>
+        <field name="property_account_expense_categ" ref="pcg_1486"/>
     </record>
 
   <record model="account.tax.template" id="tva_exo">
diff --git a/addons/l10n_us/account.account.template.csv b/addons/l10n_us/account.account.template.csv
index c7431ce89a7..6e6435fcbea 100644
--- a/addons/l10n_us/account.account.template.csv
+++ b/addons/l10n_us/account.account.template.csv
@@ -119,3 +119,5 @@
 "51100_general_product",51100,"Freight and Shipping Costs","other","l10n_us.user_type_cogs","cost_of_goods_sold","False","l10n_us.account_chart_template_general_product"
 "52500_general_product",52500,"Purchase Discounts","other","l10n_us.user_type_cogs","cost_of_goods_sold","False","l10n_us.account_chart_template_general_product"
 "52900_general_product",52900,"Purchases - Resale Items","other","l10n_us.user_type_cogs","cost_of_goods_sold","False","l10n_us.account_chart_template_general_product"
+"base_miscincome","49000","Miscellaneous Income","other","l10n_us.user_type_income","income","False","l10n_us.account_chart_template_basic"
+"base_miscexpense","69000","Miscellaneous Expense","other","l10n_us.user_type_expense","expense","False","l10n_us.account_chart_template_basic"
\ No newline at end of file
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 4cd1472773d..8db22dd262a 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -9,6 +9,8 @@
             <field name="property_account_receivable" ref="account_receivable"/>
             <field name="property_account_payable" ref="account_payable"/>
             <field name="currency_id" ref="base.USD"/>
+            <field name="property_account_income_categ" ref="base_miscincome"/>
+            <field name="property_account_expense_categ" ref="base_miscexpense"/>
         </record>
         <record id="account_chart_template_advertising" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>

From c797a9071b7ad5af9c06493a11c116229326294e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Dec 2013 12:36:39 +0100
Subject: [PATCH 458/547] [FIX] gamification: make record rule global and not
 for employees only

bzr revid: mat@openerp.com-20131212113639-lg2w2pm1mldbqe7a
---
 addons/gamification/security/gamification_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index d7a9b01bb13..fbbf5952a17 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -15,7 +15,7 @@
         <record id="goal_user_visibility" model="ir.rule">
             <field name="name">User can only see his/her goals or goal from the same plan in board visibility</field>
             <field name="model_id" ref="model_gamification_goal"/>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="global" eval="True"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="False"/>

From c301558bf9845d2c56279ee3636b2a54f1b8d1fa Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Dec 2013 12:55:24 +0100
Subject: [PATCH 459/547] [FIX] gamification: no, actually make record rule for
 every user, will handle portal later

bzr revid: mat@openerp.com-20131212115524-u25hz4xjj9l8gatb
---
 .../security/gamification_security.xml             | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index fbbf5952a17..9baf2131505 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -15,7 +15,7 @@
         <record id="goal_user_visibility" model="ir.rule">
             <field name="name">User can only see his/her goals or goal from the same plan in board visibility</field>
             <field name="model_id" ref="model_gamification_goal"/>
-            <field name="global" eval="True"/>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="False"/>
@@ -27,5 +27,17 @@
                         ('plan_id.user_ids','in',user.id),
                         ('plan_id.visibility_mode','=','board')]</field>
         </record>
+
+        <record id="goal_gamification_manager_visibility" model="ir.rule">
+            <field name="name">Gamification Manager can see any goal</field>
+            <field name="model_id" ref="model_gamification_goal"/>
+            <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+        </record>
+
     </data>
 </openerp>

From 00b012c01b8d4dd65c991e59aea46d25078afab9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 12 Dec 2013 13:06:00 +0100
Subject: [PATCH 460/547] [ADD] tentative tests for application of view
 inheritance stuff

bzr revid: xmo@openerp.com-20131212120600-timum4yzr84kl0mf
---
 openerp/addons/base/tests/test_views.py | 142 +++++++++++++++++++++++-
 1 file changed, 139 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py
index 5d127580bd5..8ad5e5c8b73 100644
--- a/openerp/addons/base/tests/test_views.py
+++ b/openerp/addons/base/tests/test_views.py
@@ -1,6 +1,9 @@
 from functools import partial
 import unittest2
 
+import lxml.etree
+from lxml.builder import E
+
 import openerp.tests.common as common
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
@@ -8,7 +11,7 @@ from openerp.tools import mute_logger
 class test_views(common.TransactionCase):
 
     @mute_logger('openerp.osv.orm', 'openerp.addons.base.ir.ir_ui_view')
-    def test_00_init_check_views(self):
+    def test_whatever(self):
         Views = self.registry('ir.ui.view')
 
         self.assertTrue(Views.pool._init)
@@ -40,7 +43,7 @@ class test_views(common.TransactionCase):
                         """,
             })
 
-    def test_20_remove_unexisting_attribute(self):
+    def test_nonexistent_attribute_removal(self):
         Views = self.registry('ir.ui.view')
         Views.create(self.cr, self.uid, {
             'name': 'Test View',
@@ -65,7 +68,7 @@ class test_views(common.TransactionCase):
         self.cr.execute(query, kw)
         return self.cr.fetchone()[0]
 
-    def test_10_validate_custom_views(self):
+    def test_custom_view_validation(self):
         Views = self.registry('ir.ui.view')
         model = 'ir.actions.act_url'
 
@@ -113,6 +116,139 @@ class test_views(common.TransactionCase):
         with mute_logger('openerp.osv.orm', 'openerp.addons.base.ir.ir_ui_view'):
             self.assertFalse(validate())    # bad inherited view
 
+    def test_view_inheritance(self):
+        Views = self.registry('ir.ui.view')
+
+        v1 = Views.create(self.cr, self.uid, {
+            'name': "bob",
+            'model': 'ir.ui.view',
+            'arch': """
+                <form string="Base title" version="7.0">
+                    <separator string="separator" colspan="4"/>
+                    <footer>
+                        <button name="action_next" type="object" string="Next button"/>
+                        or
+                        <button string="Skip" special="cancel" />
+                    </footer>
+                </form>
+            """
+        })
+        v2 = Views.create(self.cr, self.uid, {
+            'name': "edmund",
+            'model': 'ir.ui.view',
+            'inherit_id': v1,
+            'arch': """
+                <data>
+                    <form position="attributes" version="7.0">
+                        <attribute name="string">Replacement title</attribute>
+                    </form>
+                    <footer position="replace">
+                        <footer>
+                            <button name="action_next" type="object" string="New button"/>
+                        </footer>
+                    </footer>
+                    <separator string="separator" position="replace">
+                        <p>Replacement data</p>
+                    </separator>
+                </data>
+            """
+        })
+        v3 = Views.create(self.cr, self.uid, {
+            'name': 'jake',
+            'model': 'ir.ui.view',
+            'inherit_id': v1,
+            'priority': 17,
+            'arch': """
+                <footer position="attributes">
+                    <attribute name="thing">bob</attribute>
+                </footer>
+            """
+        })
+
+        view = self.registry('ir.ui.view').fields_view_get(
+            self.cr, self.uid, v2, view_type='form', context={
+                # fucking what?
+                'check_view_ids': [v2, v3]
+            })
+        self.assertEqual(view['type'], 'form')
+        self.assertEqual(
+            lxml.etree.tostring(lxml.etree.fromstring(
+                view['arch'],
+                parser=lxml.etree.XMLParser(remove_blank_text=True)
+            )),
+            '<form string="Replacement title" version="7.0">'
+                '<p>Replacement data</p>'
+                '<footer thing="bob">'
+                    '<button name="action_next" type="object" string="New button"/>'
+                '</footer>'
+            '</form>')
+
+    def test_view_inheritance_divergent_models(self):
+        Views = self.registry('ir.ui.view')
+
+        v1 = Views.create(self.cr, self.uid, {
+            'name': "bob",
+            'model': 'ir.ui.view.custom',
+            'arch': """
+                <form string="Base title" version="7.0">
+                    <separator string="separator" colspan="4"/>
+                    <footer>
+                        <button name="action_next" type="object" string="Next button"/>
+                        or
+                        <button string="Skip" special="cancel" />
+                    </footer>
+                </form>
+            """
+        })
+        v2 = Views.create(self.cr, self.uid, {
+            'name': "edmund",
+            'model': 'ir.ui.view',
+            'inherit_id': v1,
+            'arch': """
+                <data>
+                    <form position="attributes" version="7.0">
+                        <attribute name="string">Replacement title</attribute>
+                    </form>
+                    <footer position="replace">
+                        <footer>
+                            <button name="action_next" type="object" string="New button"/>
+                        </footer>
+                    </footer>
+                    <separator string="separator" position="replace">
+                        <p>Replacement data</p>
+                    </separator>
+                </data>
+            """
+        })
+        v3 = Views.create(self.cr, self.uid, {
+            'name': 'jake',
+            'model': 'ir.ui.menu',
+            'inherit_id': v1,
+            'priority': 17,
+            'arch': """
+                <footer position="attributes">
+                    <attribute name="thing">bob</attribute>
+                </footer>
+            """
+        })
+
+        view = self.registry('ir.ui.view').fields_view_get(
+            self.cr, self.uid, v2, view_type='form', context={
+                # fucking what?
+                'check_view_ids': [v2, v3]
+            })
+        self.assertEqual(view['type'], 'form')
+        self.assertEqual(
+            lxml.etree.tostring(lxml.etree.fromstring(
+                view['arch'],
+                parser=lxml.etree.XMLParser(remove_blank_text=True)
+            )),
+            '<form string="Replacement title" version="7.0">'
+                '<p>Replacement data</p>'
+                '<footer>'
+                    '<button name="action_next" type="object" string="New button"/>'
+                '</footer>'
+            '</form>')
 
 if __name__ == '__main__':
     unittest2.main()

From 0fd50c4750a5ca336954c5c6e4ca1fe414bd42aa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Dec 2013 10:35:42 +0100
Subject: [PATCH 461/547] [REM] leftover logging

bzr revid: xmo@openerp.com-20131213093542-sdomq8skpwq5wrgv
---
 addons/web/static/src/js/search.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c3ef682bfcc..45170e08a96 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -535,7 +535,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 resp(_(arguments).chain()
                     .compact()
                     .map(function (completion) {
-                        console.log(completion);
                         if (completion.length && completion[0].facet !== undefined) {
                             completion[0].first = true;
                         }

From 94b4618c130e325800eee33041909af8733dd567 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 16 Dec 2013 05:35:57 +0000
Subject: [PATCH 462/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
---
 addons/account/i18n/fr.po                   |    8 +-
 addons/account/i18n/hr.po                   |   14 +-
 addons/account/i18n/hu.po                   | 1610 +++++++++++++------
 addons/account_accountant/i18n/es_PE.po     |   23 +
 addons/account_analytic_analysis/i18n/fi.po |   44 +-
 addons/account_analytic_analysis/i18n/nl.po |    8 +-
 addons/account_voucher/i18n/es_PE.po        | 1295 +++++++++++++++
 addons/base_setup/i18n/hr.po                |   12 +-
 addons/hr_timesheet/i18n/fi.po              |   39 +-
 addons/hr_timesheet_invoice/i18n/fi.po      |   62 +-
 addons/hr_timesheet_sheet/i18n/fi.po        |  119 +-
 addons/mail/i18n/ro.po                      |    7 +-
 addons/project_issue/i18n/fi.po             |    8 +-
 addons/project_issue_sheet/i18n/fi.po       |   18 +-
 addons/project_timesheet/i18n/fi.po         |   54 +-
 addons/resource/i18n/hr.po                  |   33 +-
 addons/sale/i18n/fi.po                      |    8 +-
 addons/sale_mrp/i18n/th.po                  |   43 +
 addons/sale_stock/i18n/fi.po                |    8 +-
 addons/stock/i18n/de.po                     |    8 +-
 addons/stock/i18n/fi.po                     |    8 +-
 addons/web_linkedin/i18n/hr.po              |   18 +-
 openerp/addons/base/i18n/fi.po              |   73 +-
 23 files changed, 2785 insertions(+), 735 deletions(-)
 create mode 100644 addons/account_accountant/i18n/es_PE.po
 create mode 100644 addons/account_voucher/i18n/es_PE.po
 create mode 100644 addons/sale_mrp/i18n/th.po

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 044e976e828..af85ad650ee 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-08-29 15:17+0000\n"
+"PO-Revision-Date: 2013-12-11 11:02+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:50+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-12 05:58+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4532,7 +4532,7 @@ msgstr "Dernière date de lettrage total"
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr "Decription"
+msgstr "Description"
 
 #. module: account
 #: code:addons/account/installer.py:115
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 13ee8dd350f..481697580fa 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-12-09 09:49+0000\n"
-"Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
+"PO-Revision-Date: 2013-12-11 15:03+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-11 06:27+0000\n"
+"X-Launchpad-Export-Date: 2013-12-12 05:58+0000\n"
 "X-Generator: Launchpad (build 16869)\n"
 
 #. module: account
@@ -5012,7 +5012,7 @@ msgstr "Obrnuti predznak"
 #: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr "Bilanca (konto obveza)"
+msgstr "Bilanca (konta pasive)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -5921,7 +5921,7 @@ msgstr "Bilanca stanja"
 #: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr "Dobit i gubitak (konto prihoda)"
+msgstr "RDG (konta prihoda)"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -7498,7 +7498,7 @@ msgstr "Točno"
 #: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr "Bilanca stanja (konto aktive)"
+msgstr "Bilanca stanja (konta aktive)"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -7574,7 +7574,7 @@ msgstr "Otkaži unose zatvaranja fiskalne godine"
 #: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr "RDG (konto troška)"
+msgstr "RDG (konta troška)"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 2498c323f32..3cb9c6f4ac8 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-11-10 18:34+0000\n"
+"PO-Revision-Date: 2013-12-15 18:58+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:50+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-16 05:35+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -36,6 +36,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Meghatározza a kijelzés sorrendjét a kimutatáson 'Könyvelés \\ "
+"Kimutatáskészítés \\ Általános kimutatás \\ Adók \\ Adó kimutatás'"
 
 #. module: account
 #: view:res.partner:0
@@ -172,14 +174,14 @@ msgid ""
 "which is set after generating opening entries from 'Generate Opening "
 "Entries'."
 msgstr ""
-"Be kell állítania az 'Év végi belépő könyvelési naplót' ehhez a 'Nyitási "
-"tétel létrehozása' menüvel létrehozott üzlez év tételeihez."
+"Be kell állítania az 'Év végi belépő könyvelési naplót' a 'Nyitási bejegyzés "
+"létrehozása' menüvel létrehozott üzleti év bejegyzéseihez."
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr "Eredeti főkönyvi számla"
+msgstr "Forrás főkönyvi számla"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period
@@ -192,6 +194,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson üzleti szakasz hozzáadásához.\n"
+"              </p><p>\n"
+"                Egy könyvelési szakasz leggyakrabban egy negyedév vagy egy "
+"hónap. \n"
+"                Általában összhangban van az adóbevallás periódusával.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -201,12 +211,12 @@ msgstr "Az elmúlt 15 napban készített számlák"
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Oszlop elnevezés"
 
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Könyvelési kódnak használt számlyegyek száma"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -226,6 +236,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Analitikus számla mely alapértelmezésben a számlák adó tételének számlája. "
+"Hagyja üresen, ha alap értelmezésben nem szeretne analitikus számát "
+"használni a számlák adó tételeire."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -265,11 +278,14 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Számla típus információs célt szolgál, országra jellemző törvényekre sajátos "
+"kimutatások létrehozásához, és az induló tételek létrehozásához valamint az "
+"üzleti év lezáró szabályainak beállításához."
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
 msgid "Next credit note number"
-msgstr ""
+msgstr "Következő jóváírási értesítés szám"
 
 #. module: account
 #: help:account.config.settings,module_account_voucher:0
@@ -278,6 +294,9 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Ez magába foglalja az összes alap követelményt a banki, pénztári, vásárlói, "
+"beszerzési, kiadási, visszaküldött, stb nyugta bevitelhez.\n"
+"                Ez a account_voucher (könyvelés_nyugta) modult telepíti.."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -309,6 +328,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson ügyfél visszatérítés létrehozásához. \n"
+"              </p><p>\n"
+"                A visszatérítés egy dokumentum a számla teljes összegének "
+"vagy részének a \n"
+"                jóváírásról.\n"
+"              </p><p>\n"
+"                Kézi ügyfél részére történő jóváírás helyett, megteheti\n"
+"                azt közvetlenül az ide vonatkozó ügyfél számlából.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.installer,charts:0
@@ -317,12 +347,12 @@ msgid ""
 "accounting needs of your company based on your country."
 msgstr ""
 "Lokalizált számlatükröt állít be, hogy amilyen szorosan csak lehet, "
-"illeszkedjen a vállalat szükségletéhez."
+"illeszkedjen a vállalat szükségletéhez az országra vonatkozóan."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "Párosítás visszavonása"
+msgstr "Könyvelési számla párosítás visszavonása"
 
 #. module: account
 #: field:account.config.settings,module_account_budget:0
@@ -332,7 +362,7 @@ msgstr "Költségvetés kezelés"
 #. module: account
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr "Beszerzés könyvelési beállítások"
+msgstr "Beszerzési tulajdonságok"
 
 #. module: account
 #: help:account.financial.report,style_overwrite:0
@@ -341,17 +371,20 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Beállíthatja ennek a rekordnak a megjelenítési formáját. Ha automatikus "
+"formázást hagyja, akkor az a pénzügyi jelentés rangsora alapján lesz "
+"kiszámítva (automatikusan számított mező a 'szint')."
 
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Többféle valuta engedélyezése"
 
 #. module: account
 #: code:addons/account/account_invoice.py:77
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "Meg kell határoznia egy analitikus gyüjtőnapló típust '%s'!"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -366,12 +399,12 @@ msgstr "Június"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "A párosításhoz könyvelési számlákat kell kiválasztania."
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Analitikus számla használatának engedélyezése."
 
 #. module: account
 #: view:account.invoice:0
@@ -406,17 +439,17 @@ msgstr "Érvénytelenítés"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Bejövő jóváíró számla"
+msgstr "Beszerzési visszatérítési számla"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr "Nyitó/záró"
+msgstr "Nyitó/záró állapot"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Tételek rögzítésének pénzneme"
+msgstr "Számlakivonat tételek rögzítésének pénzneme"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -427,7 +460,7 @@ msgstr "Alapértelmezett tartozik főkönyvi számla"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Total Credit"
-msgstr "Követel összesen"
+msgstr "Összes követelés"
 
 #. module: account
 #: help:account.config.settings,module_account_asset:0
@@ -439,11 +472,19 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Ez lehetővé teszi a személy vagy vállalat által birtokolt vagyoneszközök "
+"nyilvántartását.\n"
+"                A vagyoneszközök értékcsökkenését követi nyomon, és "
+"könyvelési számlák közt mozgatja ezeket az értékcsökkenő\n"
+"                tételeket.\n"
+"                Ez a account_asset (számla_eszköz) modult telepíti. Ha nem "
+"jelöli be ezt a kockát, akkor tud számlázni & kifizetni,\n"
+"                de nem tud könyvelni (Napló tételeket, Számlatükröket, ...)"
 
 #. module: account
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Kezdeményezőtől a kedvezményezetthez intézett információ"
 
 #. module: account
 #. openerp-web
@@ -464,6 +505,7 @@ msgstr "Számlatükör sablon"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create refund, reconcile and create a new draft invoice"
 msgstr ""
+"Módosít: visszatérítést, párosítást készít és új számla tervezetet hoz létre"
 
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
@@ -477,6 +519,16 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Ha kiválasztotta a 'Tétel soronkénti kerekítést' : mindegyik adóra, először "
+"számítást és kerekítést végez minden egyes Beszerzési megrendelés "
+"BM/Vásárlói megrendelés VM/számla tétel sorra és ezek a kerekített tételek "
+"lesznek összegezve, így kialakítva a teljes adó értéket. Ha kiválasztotta a "
+"'Teljes körű kerekítést': mindegyik adóra, először adó számítást végez "
+"minden egyes Beszerzési megrendelés BM/Vásárlói megrendelés VM/számla tétel "
+"sorra, melyek összegzésre kerülnek  és végül ez a teljes adó összege lesz "
+"kerekítve. Ha adóval együtt történik az eladás, akkor a 'Tétel soronkénti "
+"kerekítést' válassza, mivel bizonyára azt szeretné, hogy az adóval növelt "
+"tételsor összegei egyezzenek a teljes összeg adóval növel értékével."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -491,12 +543,12 @@ msgstr "Az összeg egy választható más pénznemben kifejezve."
 #. module: account
 #: view:account.journal:0
 msgid "Available Coins"
-msgstr ""
+msgstr "Rendelkezésre álló pénzérmék"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Összehasonlítás bekapcsolása"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -545,6 +597,7 @@ msgstr "Gyűjtő célszámla"
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
 msgstr ""
+"Ennek a tételsornak a sorszámát adja, amikor a számla kijelzésre kerül."
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -572,7 +625,7 @@ msgstr "Számlatükör kiválasztása"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "Jóváíró számla"
+msgstr "Visszatérítési számla"
 
 #. module: account
 #: report:account.overdue:0
@@ -622,13 +675,13 @@ msgstr "Összes"
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Tizedes pontosság a napló bevitt tételeinél"
 
 #. module: account
 #: selection:account.config.settings,period:0
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr "Negyedéves"
+msgstr "3 havonta"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -648,6 +701,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
+"A kiválasztott napló nem rendelkezik tervezet állapotú számla mozgásokkal  "
+"erre az időszakra."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -670,7 +725,7 @@ msgstr "A fő sorszámnak el kell térnie az aktuálistól!"
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "A jelenlegi pénznem nincs megfelelően konfigurálva."
 
 #. module: account
 #: field:account.journal,profit_account_id:0
@@ -706,13 +761,13 @@ msgstr "Számlatípusonkénti értékesítési kimutatás"
 #: code:addons/account/account.py:3201
 #, python-format
 msgid "SAJ"
-msgstr "SAJ"
+msgstr "Számlatípusonkénti értékesítés SZTÉ"
 
 #. module: account
 #: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "Nem lehet mozgást végrehajtani, ha eltér a pénznem ettől .."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -753,7 +808,7 @@ msgstr ""
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "Egy időszakra csak egy mozgatást végezhet  a központi naplón."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -762,6 +817,9 @@ msgid ""
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Állítsa be az analitikus számlát amit alapértelmezetten használ a számlák "
+"adó tételsoraira a visszatérítéshez. Hagyja üresen, ha alapértelmezetten nem "
+"szeretne analitikus számlát használni a számla adó tételsoraira."
 
 #. module: account
 #: view:account.account:0
@@ -774,17 +832,17 @@ msgstr ""
 #: code:addons/account/report/account_partner_ledger.py:272
 #, python-format
 msgid "Receivable Accounts"
-msgstr "Vevő számlák"
+msgstr "Követelés számlák"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr "A cég bankszámláinak beállítása"
+msgstr "A cége bankszámláinak beállítása"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Refund"
-msgstr ""
+msgstr "Visszatérítés létrehozása"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -814,7 +872,7 @@ msgstr "Biztos benne, hogy létre akarja hozni a tételeket?"
 #: code:addons/account/account_invoice.py:1361
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Számla részben fizetve: %s%s of %s%s (%s%s még maradt)."
 
 #. module: account
 #: view:account.invoice:0
@@ -828,6 +886,8 @@ msgid ""
 "Cannot %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only refund this invoice."
 msgstr ""
+"Nem lehet %s számlázni, mert párosítva van, először szüntesse meg a "
+"párosítást. Ezt a számlát csak visszatérítheti."
 
 #. module: account
 #: view:account.account:0
@@ -855,12 +915,12 @@ msgstr "Listák"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "Soronkénti gyűjtőkód tételek"
+msgstr "Soronkénti analitikus gyűjtőkód tételek"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr "Jóváírás módja"
+msgstr "Visszatérítés módja"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
@@ -892,12 +952,12 @@ msgid ""
 "Click on compute button."
 msgstr ""
 "Hiányzó adósor!\n"
-"Kattintson a \"(Frissítés)\"-re az adó újraszámításához."
+"Kattintson az \"(Újraszámol)\"-ra az adó újraszámításához."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "Előjegyzés sor"
+msgstr "Számla előjegyzés tételsor"
 
 #. module: account
 #: help:account.invoice,reference:0
@@ -907,13 +967,13 @@ msgstr "A számla partner hivatkozása."
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr "Szállítói számlák és jóváírások"
+msgstr "Szállítói számlák és visszatérítések"
 
 #. module: account
 #: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "A bevitt tétel már párosítva."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -925,7 +985,7 @@ msgstr "Párosítás visszavonása"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "Gyűjtőnapló"
+msgstr "Gyűjtőnapló számla"
 
 #. module: account
 #: view:account.invoice:0
@@ -941,6 +1001,8 @@ msgid ""
 "Print Report with the currency column if the currency differs from the "
 "company currency."
 msgstr ""
+"Kimutatás nyomtatása pénznem oszloppal, ha a pénznem eltér a vállalat "
+"alapértelmezett pénznemétől."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -997,6 +1059,9 @@ msgid ""
 "                                                  opening/closing fiscal "
 "year process."
 msgstr ""
+"Nem tudja a jelentés tételének párosítását megszüntetni, ha az automatikusan "
+"lett létrehozva a költségvetési üzleti év                                    "
+"                      nyitási/zárási műveleteikor."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -1012,7 +1077,7 @@ msgstr "Számítás"
 #. module: account
 #: field:account.journal.cashbox.line,pieces:0
 msgid "Values"
-msgstr "Címlet"
+msgstr "Értékek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -1024,7 +1089,7 @@ msgstr "Adókivonat"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr "Negyedéves időszakok létrehozása"
+msgstr "Három havi időszakok létrehozása"
 
 #. module: account
 #: report:account.overdue:0
@@ -1057,14 +1122,14 @@ msgstr "Bruttó érték"
 #. module: account
 #: help:account.invoice,supplier_invoice_number:0
 msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "A beszállító által közölt számla hivatkozás."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
-msgstr "Konszolidáció"
+msgstr "Egyeztetettet mutat"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_liability
@@ -1077,12 +1142,12 @@ msgstr "Kötelezettség"
 #: code:addons/account/account_invoice.py:899
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Képezzen sorrendet a naplón ehhez a számlához."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "Kiterjesztett szűrők…"
+msgstr "Kiterjesztett szűrők"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
@@ -1092,7 +1157,7 @@ msgstr "Központi napló"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "Kimenő jóváíró számla"
+msgstr "Kimenő visszatérítés számla"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1102,7 +1167,7 @@ msgstr "Bankkivonat"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Tételsor"
+msgstr "Tételsor mozgatás"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1112,12 +1177,12 @@ msgid ""
 "basic amount(without tax)."
 msgstr ""
 "Ha az adószámla egy adógyűjtő, akkor ez a mező az adó összegét tartalmazza, "
-"ha adóalapgyűjtő, akkor az adóalap összegét."
+"ha adóalapgyűjtő, akkor az adóalap összegét(adó nélkül)."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr "Beszerzés"
+msgstr "Beszerzések"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -1144,7 +1209,7 @@ msgstr "Kód"
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Jellemzők"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -1162,7 +1227,7 @@ msgstr "Nincs gyűjtőnapló!"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr "Folyószámla kivonat"
+msgstr "Partner folyószámla kivonat"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -1180,6 +1245,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson könyvelési számla fiók hozzáadásához.\n"
+"              </p><p>\n"
+"                Ha többféle pénznem végez műveleteket, akkor veszíthet vagy "
+"nyerhet\n"
+"                bizonyos összegeket az árfolyamváltozás miatt. Ez a menü "
+"egy\n"
+"                előrejelzést ad  a nyereségről vagy veszteségről  az aznap\n"
+"                végrehajtott folyamatokról. Csak olyan számlákon, ahol van\n"
+"                másodlagos pénznem.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1197,11 +1274,13 @@ msgid ""
 "Check this box if you don't want any tax related to this tax code to appear "
 "on invoices"
 msgstr ""
+"Jelölje be ezt a négyzetet, ha nem akarja ehhez az adógyűjtőhöz kapcsolatos "
+"bármely adót feltüntetni ezen a számlán."
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr "Hét"
+msgstr "Az év hete"
 
 #. module: account
 #: field:account.report.general.ledger,landscape:0
@@ -1219,18 +1298,20 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
-"A számlatípus több információt tartalmaz a főkönyvi számláról és a "
-"sajátosságairól."
+"Ezek a típusok az országa szerint vannak meghatározva. A számlatípus több "
+"információt tartalmaz a főkönyvi számláról és a sajátosságairól."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr ""
+msgstr "Visszatérítés "
 
 #. module: account
 #: help:account.config.settings,company_footer:0
 msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
+"Bank számlák, melyek mindegyik nyomtatott dokumentum lábjegyzetében "
+"szerepelni fognak"
 
 #. module: account
 #: view:account.tax:0
@@ -1247,12 +1328,12 @@ msgstr "Vitatott"
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr "Pénztár"
+msgstr "Pénztár rögzítők"
 
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
-msgstr ""
+msgstr "Visszatérítési napló"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1271,6 +1352,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új készpénz napló rögzítéshez.\n"
+"              </p><p>\n"
+"                A pénztár rögzítők lehetővé teszik a beérkezett készpénzek "
+"készpénz naplóban\n"
+"                való rögzítését.. Ez a tulajdonság elérhetővé teszi a "
+"készpénzek napi szintű\n"
+"                nyomon követését. Rögzítheti a kazettában lévő "
+"aprópénzeket,\n"
+"                és a kivét illetve betét után is feltöltheti a "
+"pénzmozgásokat.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1288,7 +1382,7 @@ msgstr "Időszak kezdete"
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr ""
+msgstr "Visszatérítés"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1301,6 +1395,8 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Teljes összeg (a másodlagos pénznemben) erre a számlára a másodlagos "
+"pénznemben történt tranzakciókra."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1327,12 +1423,12 @@ msgstr "Számlák érvénytelenítése"
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "A kód meg lesz jelenítve a kimutatásokon."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "A beszerzéseknél felhasznált adók"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1346,7 +1442,7 @@ msgstr "Adókód"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr "Csökkenéseknél használt árfolyam"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1362,12 +1458,12 @@ msgstr "Helyzet"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "A tételsor bizonylatszáma."
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr "Tranzakció száma"
+msgstr "# Tranzakció száma"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1375,7 +1471,7 @@ msgstr "Tranzakció száma"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Megjegyzés"
+msgstr "Belépési megnevezés"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1387,12 +1483,12 @@ msgstr "Bizonylat, amely előállította ezt a számlát."
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
-msgstr "Egyéb"
+msgstr "Egyebek"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Feliratkozási vázlat"
 
 #. module: account
 #: view:account.account:0
@@ -1444,7 +1540,7 @@ msgstr "Szint"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Csak a tervezet számlának tudja megváltoztatni a pénznemét."
 
 #. module: account
 #: report:account.invoice:0
@@ -1470,7 +1566,7 @@ msgstr "Válassza ki a kezdő és a záró időszakot"
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
-msgstr "Eredménykimutatás"
+msgstr "Eredménykimutatás (Nyereség/Veszteség)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1539,6 +1635,9 @@ msgid ""
 "And after getting confirmation from the bank it will be in 'Confirmed' "
 "status."
 msgstr ""
+"Ha új bizonylat lett létrehozva akkor annak állapota 'Tervezet' lesz.\n"
+"Miután a banktól megkaptuk a visszaigazolást, az állapot 'Visszaigazolt' "
+"lesz."
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -1559,12 +1658,12 @@ msgstr ""
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Bankkivonat"
+msgstr "Bankszámlakivonat"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "Vevő számla"
+msgstr "Vevői,  követelés számla"
 
 #. module: account
 #: code:addons/account/account.py:612
@@ -1591,6 +1690,8 @@ msgid ""
 "There is no default debit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Nincs alapértelmezett tartozás számla meghatározva \n"
+"a könyvelési naplón \"%s\"."
 
 #. module: account
 #: view:account.tax:0
@@ -1600,7 +1701,7 @@ msgstr "Adók keresése"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr "Gyűjtőkód karton"
+msgstr "Analitikus költség könyvitel számla"
 
 #. module: account
 #: view:account.model:0
@@ -1610,7 +1711,7 @@ msgstr "Tételek létrehozása"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "Tételek száma"
+msgstr "# tételekből"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1625,35 +1726,37 @@ msgid ""
 "There is nothing to reconcile. All invoices and payments\n"
 "                    have been reconciled, your partner balance is clean."
 msgstr ""
+"Nincs mit párosítani. Minden számla és fizetés\n"
+"                    párosítva lett, az üzleti partner egyenlege tiszta."
 
 #. module: account
 #: field:account.chart.template,code_digits:0
 #: field:account.config.settings,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "Számjegyek száma"
+msgstr "# számlyegyek száma"
 
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Azonnali könyvelés"
+msgstr "'Tervezet' átugrása azonnali könyveléshez"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
-msgstr ""
+msgstr "Nincs végrehajtva."
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Credit Note"
-msgstr "Jóváírás"
+msgstr "Jóváírás, visszatérítés jegyzék"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr "Számlázás & Kifizetések"
+msgstr "eSzámlázás & Kifizetések"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1663,7 +1766,7 @@ msgstr "Gyűjtőkód karton az alábbi időszakra"
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr "Tételek száma "
+msgstr "# Tételek számából "
 
 #. module: account
 #: help:account.fiscal.position,active:0
@@ -1683,7 +1786,7 @@ msgstr "Vezérlőpult nézet ideiglenes táblázata"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Bejövő jóváíró számlák"
+msgstr "Beszállítói, bejövő jóváíró számlák"
 
 #. module: account
 #: report:account.invoice:0
@@ -1702,7 +1805,7 @@ msgstr "Adógyűjtő kód"
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
-msgstr ""
+msgstr "Bankszámlaszámok a lápjegyzet előnézethez"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1743,7 +1846,7 @@ msgstr "Csoportok"
 #. module: account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Nettó érték"
+msgstr "Nem adózott, nettó érték"
 
 #. module: account
 #: view:account.journal:0
@@ -1758,19 +1861,19 @@ msgstr "Bankkivonatok keresése"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Feladatlan napló tételek"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "Szállító főkönyvi számla"
+msgstr ""
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Adó főkönyvi számla (jóváíró szlák)"
+msgstr "Adó főkönyvi számla (jóváíró visszetérítések szlák)"
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -1781,12 +1884,12 @@ msgstr "ir.sequence"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Kivonatsorok"
+msgstr "Kivonat sorok"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr "Dátum/Kód"
+msgstr "Dátum/kód"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1817,6 +1920,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új számla típus létrehozásához.\n"
+"              </p><p>\n"
+"                Egy számla típus azt határozza meg, hogy azt hogyan "
+"használják\n"
+"                a naplókban. A számla típus alkalmazás módszer határozza meg "
+"az\n"
+"                éves elszámolás számítási módszerét. Az egyenleg kimutatások "
+"\n"
+"                és a nyereség és veszteség kimutatás használja a "
+"kategóriákat\n"
+"                (nyereség/veszteség vagy egyenleg kimuttás).\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: report:account.invoice:0
@@ -1839,7 +1956,7 @@ msgstr "egyenleg"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr "Kiszámlázandó költségek"
+msgstr "Kiszámlázandó analitikus költségek"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1849,7 +1966,7 @@ msgstr "Üzleti év sorszám"
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Analitikus számla"
 
 #. module: account
 #: report:account.overdue:0
@@ -1868,6 +1985,16 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Ha kiválasztotta a 'Tétel soronkénti kerekítést' : mindegyik adóra, először "
+"számítást és kerekítést végez minden egyes Beszerzési megrendelés "
+"BM/Vásárlói megrendelés VM/számla tétel sorra és ezek a kerekített tételek "
+"lesznek összegezve, így kialakítva a teljes adó értéket. Ha kiválasztotta a "
+"'Teljes körű kerekítést': mindegyik adóra, először adó számítást végez "
+"minden egyes Beszerzési megrendelés BM/Vásárlói megrendelés VM/számla tétel "
+"sorra, melyek összegzésre kerülnek  és végül ez a teljes adó összege lesz "
+"kerekítve. Ha adóval együtt történik az eladás, akkor a 'Tétel soronkénti "
+"kerekítést' válassza, mivel bizonyára azt szeretné, hogy az adóval növelt "
+"tételsor összegei egyezzenek a teljes összeg adóval növel értékével."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1899,12 +2026,14 @@ msgid ""
 "The journal must have centralized counterpart without the Skipping draft "
 "state option checked."
 msgstr ""
+"A naplónak a vázlat állapot átugrás lehetőség beállítása nélküli központi "
+"ellenszámlával kell rendelkeznie."
 
 #. module: account
 #: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Some entries are already reconciled."
-msgstr ""
+msgstr "Egyes tételek már párosítva lettek."
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1922,11 +2051,13 @@ msgid ""
 "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
 msgstr ""
+"Beállítási csomagot válasszon az automatikus adó és számlatükör\n"
+"                        beállításokhoz."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Függőben lévő számlák"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -1940,7 +2071,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
-"Ha az aktív mező nincs bejelölve, nem használható a könyvelési időszak."
+"Ha az aktív mező hamisra van állítva, lehetősége van a napló időszak "
+"eltüntetésére annak törlése nélkül."
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -1950,12 +2082,12 @@ msgstr "Rendezés"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr "Vevőkövetelések és szállítói tartozások"
+msgstr "Vevőkövetelések (Bevételek) és szállítói tartozások (kiadások)"
 
 #. module: account
 #: field:account.config.settings,module_account_payment:0
 msgid "Manage payment orders"
-msgstr ""
+msgstr "Átutalási megbízások kezelése"
 
 #. module: account
 #: view:account.period:0
@@ -1976,12 +2108,12 @@ msgstr "Általános naplókimutatás"
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "Minden partner"
+msgstr "Összes partner"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "Gyűjtőkód lista"
+msgstr "Analitikus számla gyűjtőkód lista"
 
 #. module: account
 #: report:account.overdue:0
@@ -1998,7 +2130,7 @@ msgstr "Vevő hiv.:"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Adóbevallásnál használja ezt a kódot."
 
 #. module: account
 #: help:account.period,special:0
@@ -2013,12 +2145,12 @@ msgstr "Tervezet állapotú kivonat"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Számla  jóváhagyva"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Fizesse a beszállítóit csekkel"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -2041,6 +2173,12 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Ez a menü az adó bevallást nyomtatja a számlák és kifizetések alapján. Egy "
+"vagy több időintervallumot válasszon egy üzleti évből. Az adó bevalláshoz az "
+"információkat az OpenERP automatikusan létrehozza a számlákból (vagy "
+"kifizetésekből, egyes országokban). Ezek az adatok valós időben frissülnek. "
+"Ez nagyon hasznos, mivel lehetővé teszi az adók lekérdezését egy havi vagy "
+"negyedéves időszak elejénél és végénél."
 
 #. module: account
 #: code:addons/account/account.py:409
@@ -2096,7 +2234,7 @@ msgstr ""
 #: code:addons/account/wizard/pos_box.py:35
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hiba!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -2111,6 +2249,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy új beszállítói számla felviteléhez.\n"
+"              </p><p>\n"
+"                Figyelemmel kísérheti a beszállítótól érkezett számlákat\n"
+"               attól függően, hogy mit vásárolt vagy mi érkezett be. \n"
+"               OpenERP létre tud hozni számla vázlatokat automatikusan\n"
+"                a beszerzési megrendelésből vagy vásárlási nyuktákból.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -2127,7 +2274,7 @@ msgstr "Számlák elemzése"
 #. module: account
 #: model:ir.model,name:account.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email összeállító varázsló"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -2141,6 +2288,8 @@ msgid ""
 "This journal already contains items for this period, therefore you cannot "
 "modify its company field."
 msgstr ""
+"Ez a napló már tartalmaz tételt erre a időszakaszra, ezért nem tudja "
+"módosítani a vállalat mezőt."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
@@ -2150,7 +2299,7 @@ msgstr "Soronkénti tételek"
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Alapján"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -2169,11 +2318,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy banki kivonat iktatásához.\n"
+"              </p><p>\n"
+"                Egy banki kivonat a pénzügyi tranzakciók összegzése\n"
+"                egy a banki számlán megadott időintervallumra. Ezt\n"
+"                időszakosan küldi a bank.\n"
+"              </p><p>\n"
+"                OpenERP allows you to reconcile a statement line directly "
+"with\n"
+"                the related sale or puchase invoices.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "A Vállalkozás alapértelmezett pénzneme"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2198,13 +2359,13 @@ msgstr "Pénzeszközök elemzése"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Értékesítés/Beszerzés napló"
 
 #. module: account
 #: view:account.analytic.account:0
 #: field:account.invoice.tax,account_analytic_id:0
 msgid "Analytic account"
-msgstr "Gyűjtőkód"
+msgstr "Analitikus könyvelési számla"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:406
@@ -2222,18 +2383,18 @@ msgstr "Érvényes"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Követők"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr "Naplók nyomtatása"
+msgstr "Főkönyvi naplók nyomtatása"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Termék kategória"
+msgstr "Termékkategória"
 
 #. module: account
 #: code:addons/account/account.py:656
@@ -2242,6 +2403,8 @@ msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
 msgstr ""
+"Nem változtathatja meg a főkönyvi számla típusát erre '%s' típusra, mivel "
+"napló tételeket tartalmaz!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2258,7 +2421,7 @@ msgstr "Üzleti év lezárása"
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Napló :"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2276,12 +2439,12 @@ msgstr "Adó meghatározása"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "Könyvelés kialakítása"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Referencia mértékegység"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2297,7 +2460,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Szép munka!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
@@ -2316,7 +2479,7 @@ msgstr ""
 #: code:addons/account/report/account_partner_ledger.py:274
 #, python-format
 msgid "Payable Accounts"
-msgstr "Szállító számlák"
+msgstr "Kötelezettség számlák"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -2325,6 +2488,9 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"A napló tétel kiválasztott könyvelési tételei másik pénznem használatát "
+"kényszerítik. El kell távolítania a másodlagos pénznemet a tétel számláról "
+"vagy válasszon több-pénznemes nézetet a naplón."
 
 #. module: account
 #: view:account.invoice:0
@@ -2337,17 +2503,19 @@ msgstr "Nettó érték"
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható az adó."
+msgstr ""
+"Ha az aktív mező nincs bejelölve, eltüntetheti az adó értéket annak törlése "
+"nélkül."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Értékesítési naplóval kapcsolatban álló analitikai napló tételek."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Italic szövegméret (kisebb)"
 
 #. module: account
 #: help:account.journal,cash_control:0
@@ -2355,6 +2523,7 @@ msgid ""
 "If you want the journal should be control at opening/closing, check this "
 "option"
 msgstr ""
+"Ha a napló vezérlést a nyitásnál/zárásnál szeretné, jelölje ezt a lehetőséget"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2378,7 +2547,7 @@ msgstr "Részleges tételsorok"
 #: view:account.fiscalyear:0
 #: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr "Üzletiév"
+msgstr "Üzleti év"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -2405,7 +2574,7 @@ msgstr "Párosítandó számlák"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr "File-ból kivonat importálása a rendszerbe"
+msgstr "Fájlból banki kivonat importálása a rendszerbe"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -2424,7 +2593,7 @@ msgstr "Január"
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr "Tárgyév"
+msgstr "Ez az Üzleti év"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -2435,18 +2604,18 @@ msgstr "Adókivonatok"
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr "30 nap"
+msgstr "30 nap nettó"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Nincs hozááférési joge ehez a %s naplóhoz !"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
 msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Ellenőrizze a végösszeget ezeken a beszállítói számlákon"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2454,7 +2623,7 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr "Pro forma"
+msgstr "Pro-forma"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2480,7 +2649,7 @@ msgstr "Számlatükör sablon keresése"
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Vevő kód"
 
 #. module: account
 #: view:account.account.type:0
@@ -2509,7 +2678,7 @@ msgstr "Ár tartalmazza az adót"
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr "Futó"
+msgstr "Folyamatban lévő"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2522,6 +2691,8 @@ msgstr "Árbevétel főkönyvi számla"
 #: help:account.config.settings,default_sale_tax:0
 msgid "This sale tax will be assigned by default on new products."
 msgstr ""
+"Ez az értékesítési adó lesz alapértelmezetten hozzárendelve az új "
+"termékekhez."
 
 #. module: account
 #: report:account.general.ledger_landscape:0
@@ -2533,12 +2704,12 @@ msgstr "Tételek sorbarendezésének alapja"
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr "Új pénznem"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr "Termékmennyiség "
+msgstr "# Termékmennyiség "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
@@ -2602,7 +2773,7 @@ msgstr "Üzleti év"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Hagyja üresen, ha minden nyitott évre akarja listázni"
+msgstr "Hagyja üresen, ha minden nyitott üzleti évre akarja listázni"
 
 #. module: account
 #: code:addons/account/account.py:653
@@ -2611,11 +2782,13 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
 "contains journal items!"
 msgstr ""
+"Nem változtathatja meg a 'Lezárt' állapotú főkönyvi számlát más típusra, "
+"mivel napló tételeket tartalmaz!"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Főkönyvi számla tétel"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -2631,6 +2804,11 @@ msgid ""
 "amount greater than the total invoiced amount. In order to avoid rounding "
 "issues, the latest line of your payment term must be of type 'balance'."
 msgstr ""
+"Nem hozható létre számla.\n"
+"Az ide vonatkozó fizetési feltétel lehetséges hogy félrekonfigurált, mivel a "
+"számított mennyiség nagyobb mint a számlázott végösszeg. Kerekítésből "
+"származó hibák elkerülésére, a fizetési feltétel utolsó tételének 'egyenleg' "
+"típusnak kell lennie."
 
 #. module: account
 #: view:account.move:0
@@ -2650,6 +2828,8 @@ msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"Banki kivonat törléséhez, először vonja vissza, hogy törölni tudja az ide "
+"vonatkozó napló tételeket."
 
 #. module: account
 #: field:account.invoice.report,payment_term:0
@@ -2672,6 +2852,7 @@ msgstr "ÁFA pozíciók"
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
 msgstr ""
+"Nem tud napló tételeket létrehozni egy lezárt könyvelési számlán %s %s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2687,17 +2868,17 @@ msgstr "Szűrők"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "A számla tervezet állapota"
+msgstr "Egy számla tervezet állapota"
 
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Főkönyvi számla tulajdonságai"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Visszatérítés vázlat számla készítése"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2707,7 +2888,7 @@ msgstr "Partner párosítás"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Pénzügyi számla"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2719,7 +2900,7 @@ msgstr "Adógyűjtő kód"
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% előrefizetés 30 napon belül"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2773,7 +2954,7 @@ msgstr "Megújítandó számlák"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Modelltételek"
+msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:3202
@@ -2784,17 +2965,17 @@ msgstr "EXJ"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "Beszerzési adók"
+msgstr "Beszerzések adói"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr "Bankadatok"
+msgstr "Bank adatok"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cancel CashBox"
-msgstr ""
+msgstr "Készpénz kazetta elvetése"
 
 #. module: account
 #: help:account.invoice,payment_term:0
@@ -2828,12 +3009,12 @@ msgstr "Kivonatok"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Megnevezés"
+msgstr "Mozgás megnevezése"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Könyvelési tételsor mozgás párosítása (leírás)"
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_tax
@@ -2844,7 +3025,7 @@ msgstr ""
 #: view:account.tax:0
 #: model:ir.model,name:account.model_account_tax
 msgid "Tax"
-msgstr "ÁFA"
+msgstr "Adó"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2856,13 +3037,13 @@ msgstr "ÁFA"
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr "Gyűjtőkód"
+msgstr "Analitikus könyvelés"
 
 #. module: account
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Alapértelmezett adó beszerzésekhez"
 
 #. module: account
 #: view:account.account:0
@@ -2894,13 +3075,13 @@ msgstr "Beállítási hiba!"
 #: code:addons/account/account_bank_statement.py:434
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "%s kivonat rögzítve, napló tétel létre lett hozva."
 
 #. module: account
 #: field:account.invoice.report,price_average:0
 #: field:account.invoice.report,user_currency_price_average:0
 msgid "Average Price"
-msgstr "Átlagár"
+msgstr "Mérlegelt átlagár"
 
 #. module: account
 #: report:account.overdue:0
@@ -2911,7 +3092,7 @@ msgstr "Dátum:"
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr "Megjegyzés"
+msgstr "Címke"
 
 #. module: account
 #: view:res.partner.bank:0
@@ -2928,12 +3109,12 @@ msgstr "Különleges számítás"
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "Bank egyeztetés"
+msgstr "Bank párosítás"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr "Eng. (%)"
+msgstr "Áreng. (%)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -2942,22 +3123,24 @@ msgstr "Eng. (%)"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr "Hiv"
+msgstr "Hiv."
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Purchase Tax"
-msgstr ""
+msgstr "Beszerzési adó"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr "Adóalapgyűjtő vagy adógyűjtő lehet."
+msgstr "Ez a főkönyvi számla adóalapgyűjtő vagy adógyűjtő számla lehet."
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+"Nem megfelelő követelés vagy tartozás érték a modellben, pozitívnak kell "
+"lennie!"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -3034,7 +3217,7 @@ msgstr "Dátumok"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Szülő számlatükör sablon"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3047,7 +3230,7 @@ msgstr "Fölérendelt adószámla"
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "Korosított folyószámla kivonat"
+msgstr "Korosított partner folyószámla számlaegyenleg"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -3058,12 +3241,12 @@ msgstr "Könyvelési tételek"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Főkönyvi számla és időszak ugyanahhoz a vállalathoz tartozzon."
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr "Engedmény (%)"
+msgstr "Árengedmény (%)"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -3089,7 +3272,7 @@ msgstr "Leírandó összeg"
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3098,12 +3281,15 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"A kiválasztott számla(k) nem erősíthetők meg mivel nem 'Vázlat' vagy 'Pro-"
+"Forma' állapotúak."
 
 #. module: account
 #: code:addons/account/account.py:1071
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
+"Olyan időszakot kell választania ami ugyanahhoz a vállalathoz tartozik."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3116,7 +3302,7 @@ msgstr "Főkönyvi számlánkénti értékesítés"
 #: code:addons/account/account.py:1449
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Nem törölhet egy feladott napló bejegyzést \"%s\"."
 
 #. module: account
 #: help:account.tax,account_collected_id:0
@@ -3124,11 +3310,13 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "invoices. Leave empty to use the expense account."
 msgstr ""
+"Főkönyvi számla beállítása a számlák adó tételeinek alapértelmezett "
+"használatához. Hagyja üresen a költség kiadási számla használatához."
 
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Értékesítési napló"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -3136,7 +3324,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "A(z) '%s' naplóhoz meg kell határoznia egy gyűjtőnaplót!"
+msgstr "A(z) '%s' naplóhoz meg kell határoznia egy analitikai gyűjtő naplót!"
 
 #. module: account
 #: code:addons/account/account.py:781
@@ -3145,6 +3333,8 @@ msgid ""
 "This journal already contains items, therefore you cannot modify its company "
 "field."
 msgstr ""
+"Ez a napló már tartalmaz tételeket, ezért nem változtathatja meg a vállalati "
+"mezőt."
 
 #. module: account
 #: code:addons/account/account.py:409
@@ -3153,6 +3343,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance."
 msgstr ""
+"Egy központosítással leellenőrzött nyitó napló szükséges a kezdő egyenleg "
+"beállításához."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3163,13 +3355,13 @@ msgstr "Adógyűjtők"
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Nem megvalósított nyereségek és veszteségek"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr "Vevők"
+msgstr "Vásárlók"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -3190,7 +3382,7 @@ msgstr "Augusztus"
 #. module: account
 #: field:accounting.report,debit_credit:0
 msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Tartozás/követelés oszlop kijelzése"
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -3220,12 +3412,12 @@ msgstr ""
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Nem párosított tranzakciók"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Csak egy sablon lista elérhető"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3238,7 +3430,7 @@ msgstr "Beszerzés főkönyvi számla"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Összegzés"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3254,7 +3446,7 @@ msgstr "A kivonat egyeztetésnél használja a rendszer, máshol ne alkalmazza."
 #. module: account
 #: field:account.config.settings,date_stop:0
 msgid "End date"
-msgstr ""
+msgstr "Befejezés dátuma"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -3285,7 +3477,7 @@ msgstr "Pénzügyi számvitel"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr "Eredménykimutatás"
+msgstr "Eredménykimutatás (Nyereség és Veszteség)"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3299,7 +3491,7 @@ msgstr "Eredménykimutatás"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "ÁFA pozíció"
+msgstr "Költségvetési pozíció"
 
 #. module: account
 #: code:addons/account/account_invoice.py:823
@@ -3328,13 +3520,13 @@ msgstr "Alárendelt számlák"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr "Főkönyvi kivonat"
+msgstr "Próbamérleg"
 
 #. module: account
 #: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
-msgstr ""
+msgstr "Nem tudja a kezdő egyenleget alkalmazni (negatív érték)."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -3342,7 +3534,7 @@ msgstr ""
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr "Kimenő számla"
+msgstr "Kimenő, vevői számla"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -3353,7 +3545,7 @@ msgstr "Üzleti év kiválasztása"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Dátum tartomány"
 
 #. module: account
 #: view:account.period:0
@@ -3369,7 +3561,7 @@ msgstr "Számla pénzneme"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Főkönyvi számlák kimutatásai"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3384,7 +3576,7 @@ msgstr "Adósablon lista"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Értékesítési/Beszerzési naplók"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3395,14 +3587,18 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"Kiválasztja, hogy a rendszer milyen árfolyamon számolja a devizás tételek "
-"csökkenéseit. A növekedéseknél mindig a napi árfolyamot használja a rendszer."
+"Kiválasztja, hogy a kimenő tranzakciókhoz milyen árfolyamon számolja a "
+"devizás tételek csökkenéseit. A legtöbb országban a törvényes mód az "
+"'Átlagolás', de ezt nagyon kevés program rendszer tudja kezelni. Ha másik "
+"program rendszerből importálja akkor inkább a dátummal megadott árfolyamot "
+"használja. A bejövő tranzakcióknál, növekedéseknél mindig a napi árfolyamot "
+"használja a rendszer."
 
 #. module: account
 #: code:addons/account/account.py:2678
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Nincs szülő kódja a főkönyvi számla sablonhoz."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3413,7 +3609,7 @@ msgstr "Számjegyek száma a főkönyvi számla számában"
 #. module: account
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
-msgstr "Szállítói fizetási feltétel"
+msgstr "Beszállítói fizetési feltétel"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3430,6 +3626,8 @@ msgstr "Mindig"
 msgid ""
 "Full accounting features: journals, legal statements, chart of accounts, etc."
 msgstr ""
+"Összes könyvelési tulajdonság: naplók, törvényes kivonatok, számlatükrök, "
+"stb."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3446,7 +3644,7 @@ msgstr "Leírás főkönyvi számlája"
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr "Modell"
+msgstr "Model, minta"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
@@ -3459,7 +3657,7 @@ msgstr "Az adóbevallásban szereplő adóalap."
 #: selection:account.entries.report,type:0
 #: selection:account.financial.report,type:0
 msgid "View"
-msgstr "Gyűjtő"
+msgstr "Nézet"
 
 #. module: account
 #: code:addons/account/account.py:3460
@@ -3471,37 +3669,37 @@ msgstr "BNK"
 #. module: account
 #: field:account.move.line,analytic_lines:0
 msgid "Analytic lines"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikai gyűjtőkód tételek"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proforma számlák"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr "Elektronikus file"
+msgstr "Elektronikus fájl"
 
 #. module: account
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
-msgstr ""
+msgstr "Párosítás hivatkozása"
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "A vállalkozásnak van egy számlatükre"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "Adógyűjtő sablon"
+msgstr "Adó kód sablon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr "Folyószámla karton"
+msgstr "Partner folyószámla karton"
 
 #. module: account
 #: model:email.template,body_html:account.email_template_edi_invoice
@@ -3587,11 +3785,93 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>Egy új számlája van: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Fizethet közvetlenül Paypal rendszern:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>További felmerülő kérdésekkel kapcsolatban keressen meg "
+"bennünket.</p>\n"
+"    <p>Köszönjük, hogy a ${object.company_id.name or 'bennünke'}-t "
+"választotta!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Főkönyvi számla időszak"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3619,12 +3899,12 @@ msgstr "Számlatükör sablonok"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Tranzakciók"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "Párosítás visszavonása"
+msgstr "Visszavont párosítású számlák Párosítása"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3639,18 +3919,20 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
-"Állítsa be a módszert, amellyel az ezen típusú főkönyvi számlák nyitó "
-"tételei létrehozásra kerülnek.\n"
+"Állítsa be a módszert, amellyel az ezen típusú főkönyvi számlák év végi "
+"napló tételei létrehozásra kerülnek.\n"
 "\n"
-" Semmi esetében nem lesznek nyitó tételek.\n"
-" Egyenlegnél az előző évi záró egyenleg lesz a nyitó tétel.\n"
-" Tételes esetében az előző év minden tétele átkerül tárgyévre.\n"
-" Rendezetlennél csak a párosítatlan tételek kerülnek át."
+" 'Semmi' esetében nem lesznek nyitó tételek.\n"
+" 'Egyenleg'-nél az előző évi záró egyenleg lesz a nyitó tétel általában a "
+"készpénznél, házipénztárnál.\n"
+" 'Tételes' esetében az előző év minden tétele átkerül tárgyévre, még a "
+"rendezettek is.\n"
+" 'Rendezetlen' csak a párosítatlan tételek kerülnek át."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "-"
+msgstr "Hadja üressen a költség számla használatához"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -3718,7 +4000,7 @@ msgstr "Pénzügy-Számvitel modul beállítása"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 msgid "Account Tax Declaration"
-msgstr ""
+msgstr "Adó bevalási főkönyvi számla"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -3738,6 +4020,8 @@ msgid ""
 "centralized counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Központosított naplón nem tud számlát létrehozni. Hagyja üresen a beállítás "
+"menüben az ide vonatkozó naplóhoz tartozó központi ellenszámla négyzetet."
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3756,7 +4040,7 @@ msgstr "Nem adott meg partnert!"
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr "Időszak zárása"
+msgstr "Egy időszak lezárása"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3770,11 +4054,13 @@ msgid ""
 "You cannot create journal items with a secondary currency without recording "
 "both 'currency' and 'amount currency' field."
 msgstr ""
+"Nem tud másodlagos pénznemmel ellátott napló tételt létrehozni a 'pénznem' "
+"és 'pénznem mennyiség' mező bevitele nélkül."
 
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Részletek kijelzése"
 
 #. module: account
 #: report:account.overdue:0
@@ -3786,7 +4072,8 @@ msgstr "ÁFA:"
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr "Másodlagos pénznemben kifejezett összeg."
+msgstr ""
+"A vállalat pénznemétől eltérő másodlagos pénznemben kifejezett összeg."
 
 #. module: account
 #: help:account.config.settings,paypal_account:0
@@ -3796,6 +4083,11 @@ msgid ""
 "quotations with a button \"Pay with  Paypal\" in automated emails or through "
 "the OpenERP portal."
 msgstr ""
+"Paypal számla (email) online fizetések befogadásához (hitel kártya, stb.) Ha "
+"beállított egy paypal számlát, akkor az ügyfélnek lehetősége lesz "
+"kiegyenlítenie a számlákat vagy árajánlatban szerepló tételeket  az e-"
+"maileken lévő  \"Paypal-al történő fizetés\" gombbal vagy a portálon "
+"keresztül."
 
 #. module: account
 #: code:addons/account/account_move_line.py:536
@@ -3806,6 +4098,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Journals/Journals."
 msgstr ""
+"Nem található egyetlen %s típusú könyvelési napló ehhez a vállalathoz.\n"
+"\n"
+"Létrehozhat egyet a menüből: \n"
+"Beállítások/Naplók/Naplók."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3829,7 +4125,7 @@ msgstr "Adókivonat"
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Napló keresése"
+msgstr "Főkönyvi napló keresése"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3840,7 +4136,7 @@ msgstr "Függő számlák"
 #: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr "Év"
+msgstr "év"
 
 #. module: account
 #: field:account.config.settings,date_start:0
@@ -3856,6 +4152,12 @@ msgid ""
 "by\n"
 "                                    your supplier/customer."
 msgstr ""
+"Lehetősége lesz szerkeszteni és érvényesíteni ezt a\n"
+"                                    jóváírási értesítést közvetlenül vagy "
+"hagyja vázlatként,\n"
+"                                    amíg a dokumentumot a "
+"vásárlónak/beszállítótól\n"
+"                                    nem bocsájtja ki."
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3863,8 +4165,8 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
-"Minden kiválasztott könyvelési tétel jóváhagyásra és könyvelésre kerül. "
-"Ezután nem lesz módosítható a kontírozásuk."
+"Minden kiválasztott könyvelési tétel jóváhagyásra és könyvelési feladásra "
+"kerül. Ezután nem lesz módosítható a kontírozásuk."
 
 #. module: account
 #: code:addons/account/account_move_line.py:98
@@ -3873,6 +4175,8 @@ msgid ""
 "You have not supplied enough arguments to compute the initial balance, "
 "please select a period and a journal in the context."
 msgstr ""
+"Nem adott meg elég bizonyítékot a kezdő egyenleg kiszámításához, kérem "
+"válasszon időszakot és egy naplót a környezetből."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3882,7 +4186,7 @@ msgstr "Átutalások"
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Ennek a vállalkozásnak saját számlatükre van."
 
 #. module: account
 #: view:account.chart:0
@@ -3898,7 +4202,7 @@ msgstr "Készpénz kifizetése"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr "ÁFA összege"
+msgstr "Adó összege"
 
 #. module: account
 #: view:account.move:0
@@ -3923,6 +4227,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy vásárlói számla készítéséhez.\n"
+"              </p><p>\n"
+"                elektronikus számlázás lehetővé teszi a vásárlók "
+"fizetéseinek \n"
+"                gyors és könnyű beszedését. A vásárlói e-mailen kapják \n"
+"                számláikat, amiket online és/vagy a rendszerükbe importálva\n"
+"                egyenlíthetik ki.\n"
+"              </p><p>\n"
+"                A vásárlókkal folytatott kommunikáció automatikusan\n"
+"                láthatóvá válik a számla alján.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3945,7 +4262,7 @@ msgstr "Beállítások"
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Időszak hossz (napok)"
 
 #. module: account
 #: code:addons/account/account.py:1363
@@ -3954,22 +4271,24 @@ msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Nem módosíthatja ennek a naplónak a már könyvelésre feladott bejegyzését.\n"
+"Először be kell állítania a naplót bejegyzések visszavonására."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Értékesítés/Beszerzés napló nyomtatás"
 
 #. module: account
 #: view:account.installer:0
 msgid "Continue"
-msgstr ""
+msgstr "Folytatás"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr "Termék katerógia"
+msgstr "Termék katerógiája"
 
 #. module: account
 #: code:addons/account/account.py:930
@@ -3992,6 +4311,8 @@ msgstr "Főkönyvi számla létrehozása"
 #, python-format
 msgid "The entries to reconcile should belong to the same company."
 msgstr ""
+"A párosításhoz szóló tételek ugyanahhoz a vállalkozáshoz kell hogy "
+"tartozzanak."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -4001,7 +4322,7 @@ msgstr "Adógyűjtő összege"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Megszüntetett párosítású napló tételek"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -4012,6 +4333,7 @@ msgstr "Tételes"
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
 msgstr ""
+"Ez a beszerzési adó lesz alapértelmezetten hozzárendelve az új termékekhez."
 
 #. module: account
 #: report:account.account.balance:0
@@ -4038,7 +4360,7 @@ msgstr "(Ha nem választ időszakot, minden nyitott időszakot figyelembe vesz)"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4096,7 +4418,7 @@ msgstr "Dátum"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Könyvelésre küld"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -4124,12 +4446,12 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr "Adó"
+msgstr "Adó számla"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr "Üzleti tervek"
+msgstr "Költségvetési pénzügyi tervek"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -4148,13 +4470,13 @@ msgstr "Üzleti tervek"
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 msgid "No Filters"
-msgstr "Nincs szűrő"
+msgstr "Nincsenek szűrők"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:res.groups,name:account.group_proforma_invoices
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Pro-forma számlák"
 
 #. module: account
 #: view:res.partner:0
@@ -4174,7 +4496,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Az össes beszállítói számlák ellenőrzése"
 
 #. module: account
 #: view:account.tax:0
@@ -4188,6 +4510,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"Ha havi időszakok lettek létrehozva. Az állapot 'Vázlat'. A hónap végi "
+"állapot 'Elvégezve' lesz."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4209,18 +4533,18 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr "Gyűjtőkód tételek keresése"
+msgstr "Analitikai gyűjtőkód tételek keresése"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "Szállító számla"
+msgstr "Fizetendő, beszállító számla"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "A nyitó tételek létrehozásához tartozó időszakok nem találhatóak."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4231,7 +4555,9 @@ msgstr "Átutalási megbízás"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "Jelölje be, ha a számla tételei párosíthatóak."
+msgstr ""
+"Jelölje be, ha azt szeretné, hogy a felhasználó ennek a számlának a tételeit "
+"párosítsa."
 
 #. module: account
 #: report:account.invoice:0
@@ -4242,7 +4568,7 @@ msgstr "Egységár"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikai gyűjtőkód tételek"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
@@ -4262,7 +4588,7 @@ msgstr "Adógyűjtő szorzótényezője"
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Adók teljes csomagja"
 
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
@@ -4285,12 +4611,12 @@ msgstr "Megnevezés"
 #: code:addons/account/installer.py:115
 #, python-format
 msgid "No unconfigured company !"
-msgstr ""
+msgstr "Nincs kiépítetlen vállalkozás !"
 
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Várható számlatükör"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4302,28 +4628,30 @@ msgstr "Teljesítés kelte"
 #, python-format
 msgid "The journal must have default credit and debit account."
 msgstr ""
+"A naplónak rendelkeznie kell alapértelmezett követelés és tartozás "
+"számlákkal."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Állítsa be a banki számlaszámait"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Parner azonosító"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Üzenetek és kommunikáció történet"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr "Gyűjtőkód tételek naplója"
+msgstr "Analitikai gyűjtőkód tételek naplója"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -4353,13 +4681,15 @@ msgid ""
 "Check this box if you don't want any tax related to this tax Code to appear "
 "on invoices."
 msgstr ""
+"Jelölje be ezt a négyzetet, ha nem akarja ehhez az adógyűjtőkódhoz tartozó  "
+"bármely adó megjelenítését."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1058
 #: code:addons/account/account_move_line.py:1143
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Nem használhat egyetlan inaktív számlát sem."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4378,19 +4708,19 @@ msgstr "Könyvelés"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "A jelenlegi évre vonatkozó időszakok napló bejegyzései"
 
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "Konszolidált számlák"
+msgstr "Konszolidált alszámlák"
 
 #. module: account
 #: code:addons/account/account_invoice.py:573
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Nincs elegendő adat!"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4398,6 +4728,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"A veszteség vagy nyereség értékének változása az árfolyam változás miatt, ha "
+"több pénznemben történik a tranzakció."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4435,7 +4767,7 @@ msgstr "Ismétlődő tételek"
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr "Megjelenítendő partnerek"
+msgstr "Parnerek megjelenítése"
 
 #. module: account
 #: view:account.invoice:0
@@ -4450,7 +4782,7 @@ msgstr "Eszközök"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Könyvelés és pénzügy"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4467,7 +4799,7 @@ msgstr "Átlagárfolyam"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Főkönyvi számlák kijelzése"
 
 #. module: account
 #: view:account.state.open:0
@@ -4478,7 +4810,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Számla adó tartalmának analitikus könyvelése"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4508,7 +4840,7 @@ msgstr "30 nap, hó vége"
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr "Gyűjtőkód kivonat"
+msgstr "Analitikus gyűjtőkód számlaegyenleg"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -4516,6 +4848,8 @@ msgid ""
 "This payment term will be used instead of the default one for sale orders "
 "and customer invoices"
 msgstr ""
+"Ezt a fizetési feltételt használja az alapértelmezett helyett a vásárlói "
+"megrendeléseken és az értékesítési számlákon."
 
 #. module: account
 #: view:account.config.settings:0
@@ -4523,23 +4857,26 @@ msgid ""
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
 "year."
 msgstr ""
+"Ha \"%(év)ek\" használ előtagként, akkor azt kiváltja az aktuális év."
 
 #. module: account
 #: help:account.account,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható a főkönyvi számla."
+msgstr ""
+"Ha az aktív mező hamisra állított, akkor eltüntetheti a főkönyvi számlát "
+"annak törlése nélkül."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Könyvelésre feladott napló tételek"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
-msgstr ""
+msgstr "Nincs nyomon követés"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4549,7 +4886,7 @@ msgstr "Adósablonok keresése"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr "Könyveletlen tételek"
+msgstr "Könyveletlen (Vázlat) tételek"
 
 #. module: account
 #: help:account.config.settings,decimal_precision:0
@@ -4558,12 +4895,15 @@ msgid ""
 "9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
 "0.0231 EUR."
 msgstr ""
+"Példaként, a kétjegyű (2) decimális pontosság lehetővé teszi az ilyen napló "
+"tételeket: 9.99 EUR, ugyanakkor a négyjegyű (4) decimális pontosság lehetővé "
+"teszi az ilyen napló tételeket: 0.0231 EUR."
 
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr "Gyorsmenü"
+msgstr "Gyorsbillentyű parancs"
 
 #. module: account
 #: view:account.account:0
@@ -4596,6 +4936,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Kattintson új bankszámlaszám beállításához. \n"
+"          </p><p>\n"
+"            Állítsa be a vállalkozása bank számláit és válassza ki azokat\n"
+"            melyeknek meg kell jelennie a lábjegyzetben.\n"
+"          </p><p>\n"
+"            Ha használja a könyvelési modult részt, naplók és főkönyvi\n"
+"            számlák automatikusan lesznek létrehozva az itt megadott \n"
+"            adatok alapján.\n"
+"          </p>\n"
+"        "
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4607,6 +4958,7 @@ msgstr "A kiválasztott számlák érvénytelenítése"
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
 msgstr ""
+"Egy analitikai gyűjtőkód naplót kell hozzárendelni ezen a '%s' naplón!"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4614,8 +4966,9 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
-"A költségek a gyűjtőkódokból származnak. Ezek állítják elő a tervezet "
-"állapotú bejövő számlákat."
+"Analitikus költségek (időkimutatásokból, egyes beszerzett termékből, ..) "
+"származnak. Ezek állítják elő a tervezet állapotú bejövő beszállítói  "
+"számlákat."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4628,6 +4981,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Hiba!\n"
+"Nem hozhat létre visszatérő adógyűjtőkódokat."
 
 #. module: account
 #: constraint:account.period:0
@@ -4635,6 +4990,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Hiba!\n"
+"Az időszak(ok) időtartama nem értelmezhető."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4652,11 +5009,12 @@ msgstr "Hónap"
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
+"Napló tételt tartalmazó főkönyvi számla kódját nem tudja megváltoztatni."
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Beszállítói számlák sorrendje"
 
 #. module: account
 #: code:addons/account/account_invoice.py:610
@@ -4666,18 +5024,20 @@ msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
 "Configuration\\Accounting menu."
 msgstr ""
+"Nem talál egy számlatükröt, létre kell hoznia egyet a Beállítások\\"
+"Beállítás\\Könyvelés menüből."
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Termék mértékegysége"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypal számla"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4687,7 +5047,7 @@ msgstr "Számlatípus"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
-msgstr ""
+msgstr "Bank és csekkek"
 
 #. module: account
 #: field:account.account.template,note:0
@@ -4704,7 +5064,7 @@ msgstr ""
 #: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Számlaegyenleg lap (Felelősség számla)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4727,12 +5087,13 @@ msgstr "Adóalapgyűjtő kód"
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
-msgstr ""
+msgstr "Meg kell határozni egy leírás/átváltási árfolyam különbség számlát."
 
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Paypal felhasználónév (általában email) az online összegek fogadásához."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4754,7 +5115,7 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "Minden könyvelt tétel"
+msgstr "Minden könyvelésre feladott tétel"
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4769,18 +5130,18 @@ msgstr "Jelölje be, ha a 0 egyenlegű számlákat is meg akarja jeleníteni!"
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Nyitó egyenlegek párosítása"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "Záró/nyitó tétel"
+msgstr "Üzleti év záró tétel"
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Számlaegyenlegesítve"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4794,6 +5155,8 @@ msgid ""
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
 msgstr ""
+"Nincs számlatükörrel nem rendelkező vállalat.. Ezért a varázsló nem fog "
+"elindulni."
 
 #. module: account
 #: view:account.move:0
@@ -4804,7 +5167,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Főkönyvi szála lehetőségeinek beállítása"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4819,7 +5182,7 @@ msgstr "Átutalási hivatkozás"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Fó cím 1 (kövér, aláhúzott)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4840,7 +5203,7 @@ msgstr "Számlastatisztika"
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Árfolyam"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4867,7 +5230,7 @@ msgstr "Záró egyenleg"
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Lehet látható?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -4883,27 +5246,27 @@ msgstr "Jóváíró számlák"
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Párosítani kívánt napló tételek"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr ""
+msgstr "Sablonok adókhoz"
 
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "Az időszakok neveinek vállalkozásonként egyéninek kell lenniük!"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Pénznem a vállalat országának megfelelően."
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Adó kiszámítás"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4918,6 +5281,9 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Állítsa az értékét hamisra, ha nem akarja a sablont aktívan a számlatükör "
+"varázsló sablonjai között használni, akkor hasznos, ha az al-sablonok "
+"betöltése után szeretne ebből a sablonból számlatükröt létrehozni."
 
 #. module: account
 #: view:account.use.model:0
@@ -4936,6 +5302,9 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Hiba!\n"
+"Nem hozhat létre más vállalkozásnál szülő számlával rendelkező főkönyvi "
+"számlát."
 
 #. module: account
 #: code:addons/account/account_invoice.py:658
@@ -4946,6 +5315,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Journals\\Journals."
 msgstr ""
+"Nem talál ilyen %s típusú főkönyvi számlát ehhez a vállalkozáshoz.\n"
+"\n"
+"Létre tud hozni egyet a menüből: \n"
+"Beállítások\\Naplók\\Naplók."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4961,7 +5334,7 @@ msgstr "ECNJ"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Gyűjtőkód karton"
+msgstr "Gyűjtőszámla karton az analitikus költség naplóhoz"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4971,7 +5344,7 @@ msgstr "Ismétlődő modellek"
 #. module: account
 #: view:account.tax:0
 msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Alsóbbrendű/Alárendelt adók"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -4991,12 +5364,12 @@ msgstr "Követel összegek alapértelmezett főkönyvi számlája"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr "Bizonylat száma"
+msgstr "Bizonylat száma (Mozgás)"
 
 #. module: account
 #: view:cash.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Írja le miért vesz ki pénzt a pénz rögzítőből:"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5014,12 +5387,12 @@ msgstr ""
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Lehetővé teszi a számlák pro-forma, díjbekérő állapotba tételét."
 
 #. module: account
 #: view:account.journal:0
 msgid "Unit Of Currency Definition"
-msgstr ""
+msgstr "A pénznem egységének meghatározása"
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -5028,12 +5401,14 @@ msgid ""
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Ez hozzáadja a pénznem oszlopot a beszámolóban, ha a vállalkozás pénznemétől "
+"eltérő a pénznem."
 
 #. module: account
 #: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Beszerzési adó %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -5067,7 +5442,7 @@ msgstr "Érvénytelenített számla"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Számláim"
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5077,7 +5452,7 @@ msgstr "Új"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Értékesítési adó"
 
 #. module: account
 #: view:account.move:0
@@ -5093,7 +5468,7 @@ msgstr "Adógyűjtő kód (jóváíró számlák)"
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice "
-msgstr "Számla "
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5107,12 +5482,15 @@ msgid ""
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
+"Ha létre lett hozva a napló időtartam. Az állapota 'Vázlat' lesz. Ha a "
+"kimutatás ki lett nyomtatva akkor annak állapota 'Kinyomtatva' lesz. Ha "
+"minden tranzakció el lett végezve akkor 'Elvégzve' állapotú lesz."
 
 #. module: account
 #: code:addons/account/account.py:3205
 #, python-format
 msgid "MISC"
-msgstr ""
+msgstr "Különb."
 
 #. module: account
 #: view:res.partner:0
@@ -5140,7 +5518,7 @@ msgstr "Számlák"
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Jelölje be a négyzetet, ha a vállalat egy jogi személy."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5186,7 +5564,7 @@ msgstr "Csekk"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "vagy"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5196,7 +5574,7 @@ msgstr "Számlázott"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Könyvelésre feladott napló tételek"
 
 #. module: account
 #: view:account.use.model:0
@@ -5210,6 +5588,9 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Bank számla szám melyre a számla ki lesz egyenlítve. Kimenő vásárlói számla "
+"vagy beszerzési jóváírás esetén a vállalkozás bankszámlája, egyéb esetben az "
+"üzleti partner bank számla száma."
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -5236,12 +5617,12 @@ msgstr "Rendezett"
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr "ÁFA összesítő"
+msgstr "Adó összesítő"
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "A bank egyeztetéshez használt bankkivonat."
+msgstr "A bank egyeztetéshez használt bankkivonat"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -5252,17 +5633,17 @@ msgstr "A számlatervezetek jóváhagyásra kerülnek. "
 #: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Nyitó időszak"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Fellülvizsgálandó napló tételek"
 
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Globális kerekítés"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5287,6 +5668,8 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The encoded total does not match the computed total."
 msgstr ""
+"Kérem a számlában lévő árak ellenőrzését !\n"
+"A beírt teljes összeg nem egyezik a kiszámított összeggel."
 
 #. module: account
 #: field:account.account,active:0
@@ -5316,12 +5699,12 @@ msgstr "Időszak vége"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr "Számlák átutalása"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Egyéni számlaszámnak kell lennie mindegyik válallathoz!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -5344,16 +5727,19 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Erről a nézetről, van egy kimutatás a pénzeszközeire vonatkozólag. Ez "
+"összegzi időszakonként a likviditási számlán bejegyzett tételek  "
+"számlaegyenlegét."
 
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Pénzügyi irányító"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr "Számlasorok összevonása"
+msgstr "Számlatételek összevonása"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -5363,13 +5749,13 @@ msgstr "Zárás"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Tételek"
+msgstr "Mozgások"
 
 #. module: account
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Pénzkazetta tételek"
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
@@ -5387,6 +5773,8 @@ msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
 "but not accounting (Journal Items, Chart of  Accounts, ...)"
 msgstr ""
+"Ha nem jelöli be ezt a négyzetet, akkor lehetősége lesz számlázni & "
+"kifizetni, de nem tud könyvelni (Napló bejegyzéseket, számlatükröt, ...)"
 
 #. module: account
 #: view:account.period:0
@@ -5396,7 +5784,7 @@ msgstr "Lezárandó"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Az időszak kezdeti dátuma"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5406,7 +5794,7 @@ msgstr "Sablonok"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "Adótípus"
+msgstr ""
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5419,12 +5807,13 @@ msgstr "Alárendelt adószámlák"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "Jelölje be, ha az ár tartalmazza az ÁFÁ-t."
+msgstr ""
+"Jelölje be, ha a termékeken és a számlákon az ár tartalmazza az adót."
 
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr "Gyűjtőkód kivonat -"
+msgstr "Analitikus gyűjtőkód számlaegyenleg -"
 
 #. module: account
 #: report:account.account.balance:0
@@ -5462,12 +5851,14 @@ msgstr "Figyelembe vett tételek"
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
+"Ha a mozgás hozzá van rendelve egy számlához, akkor az nem törölhető. "
+"(Számla: %s - Mozgás azonosító ID:%s)"
 
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_opening:0
 msgid "Opening Unit Numbers"
-msgstr "Nyitó darabszám"
+msgstr "Nyitó egységnyi darabszám"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5506,6 +5897,10 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Ez a boolean művelet segítséget nyújt annak kiválasztásában, hogy javasol  "
+"az értékesítési és beszerzési értékek kódolásában vagy az adó listából "
+"válassza ki azokat. Ez utóbbit választása feltételezi, hogy a sablonban "
+"teljes körűen meghatározott az adó."
 
 #. module: account
 #: view:account.financial.report:0
@@ -5530,7 +5925,7 @@ msgstr "Év"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Ez jelzi, hogy a számlát már elküldték."
 
 #. module: account
 #: field:account.tax.template,description:0
@@ -5545,16 +5940,19 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Nem hozható létre automatikus sorrend ehhez a darabhoz.\n"
+"Rakjon sorrendet a napló meghatározásánál az automatikus számozáshoz vagy "
+"hozzon létre kézi sorrendet ehhez a darabhoz."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Pro Forma számla "
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr "Hónap"
+msgstr "hónap"
 
 #. module: account
 #: view:account.move.line:0
@@ -5573,19 +5971,19 @@ msgstr "Adószámla"
 #: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr "Mérleg"
+msgstr "Egyenleg kimutatatás"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Nyereség & Veszteség (Jövedelem bevételi számla)"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Ellenőrizze a dátumot az időszakban"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5615,6 +6013,7 @@ msgstr "Számítási kód (ha a típus = Python kód)"
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
 msgstr ""
+"Nem található a vállalatra vonatkozó számlatükör, Létre kell hoznia egyet."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5669,6 +6068,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"A chettelés összegzést megállítja (üzenetek száma,...). Ez az összegzés "
+"direkt HTML formátumú ahhoz hogy beilleszthető legyen a kanban nézetekbe."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5689,14 +6090,14 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"\"A(z) '%s' modellsor által előállított tételsor esedékességének dátuma a "
+"A(z) '%s' modellsor által előállított tételsor esedékességének dátuma a "
 "partner fizetési feltételétől függ!\n"
 "Kérem, adja meg a partnert!\""
 
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr "Összegzésnél használt előjel"
+msgstr ""
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5706,12 +6107,12 @@ msgstr "(Számla/partner) név"
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr "Haladás"
+msgstr "Fejlődés"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Készpénz pénztár és bankok"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5721,13 +6122,13 @@ msgstr "account.installer"
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Számítsa újra az adókat és összegzéseket"
 
 #. module: account
 #: code:addons/account/account.py:1116
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
-msgstr ""
+msgstr "Nem módosíthatja/törölheti ennek az időszaknak a napló bejegyzéseit."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5737,7 +6138,7 @@ msgstr "Adóalap tartalmazza az adót"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr "Szállítói számlaszám"
+msgstr "Beszállítói számlaszám"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5745,9 +6146,9 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
-"Napok száma, amely hozzáadódik a mai dátumhoz. Ezután számolja a rendszer a "
-"hónap napját. Pl. ha a dátum 01.15., a napok száma 22 és a hónap napja -1, "
-"akkor a fizetési határidő 02.28. lesz."
+"Napok száma, amely hozzáadódik a mai dátumhoz. Ez alapján számolja a "
+"rendszer a hónap napját. Pl. ha a dátum 01.15., a napok száma 22 és a hónap "
+"napja -1, akkor a fizetési határidő 02.28. lesz."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5758,7 +6159,7 @@ msgstr "Összeg kiszámítása"
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
-msgstr ""
+msgstr "A %s napló, %s lezárt időszak tételeit nem tudja növelni/módosítani."
 
 #. module: account
 #: view:account.journal:0
@@ -5769,7 +6170,7 @@ msgstr "Tétel ellenőrzések"
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr "(Hagyja üresen, hogy az aktuális állapotot nyissa meg)"
+msgstr "(Hagyja üresen, az aktuális állapotot megynyitásához)"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
@@ -5783,7 +6184,7 @@ msgstr "Időszak kezdete"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Eszközök nézete"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -5816,24 +6217,27 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be treated."
 msgstr ""
+"Válassza ki itt ehhez a fizetési tételhez vonatkozó értékelés típust. "
+"Figyeljen oda, hogy az utolsó tételnek 'Egyenleg' típusnak kell lennie "
+"ahhoz, hogy a teljes összegen el legyen végezve."
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "Kezdeti számlaegyenlegeket beleértve"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Tax Codes"
-msgstr "Adógyűjtők"
+msgstr ""
 
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Kimenő jóváíró számla"
+msgstr "Kimenő, vásárlói jóváíró számla"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5851,23 +6255,23 @@ msgstr "Kimutatás az elmúlt 15 napban készített számlákról"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "Záró/nyitó napló"
+msgstr "Üzeit évet záró napló tételek"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Visszetérítés vázlat "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Töltse ki ezt az űrlapot, ha pénzt tett a pénztár rögzítőbe:"
 
 #. module: account
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Fizetendő összeg"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5877,7 +6281,7 @@ msgid ""
 "as reconciled."
 msgstr ""
 "A hátralévő partnerek száma, akiket ellenőrizni kell, hogy van-e párosítandó "
-"tételük."
+"tételük. Ez az aktuális partnert már párosítottként tekinti."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5920,19 +6324,19 @@ msgstr "Kifizetés dátuma"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,opening_details_ids:0
 msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "Pénzkazetta nyitó tételek"
 
 #. module: account
 #: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Gyűjtőkódok"
+msgstr "Analitikus gyűjtőkódok"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Ügyfél számlák és visszatérítések"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5945,7 +6349,7 @@ msgstr "Devizaösszeg"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Tételenkénti kerekítés"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5981,11 +6385,26 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson napló bejegyzés készítéséhez.\n"
+"              </p><p>\n"
+"                Egy napló bejegyzés több napló tételt tartalmazhat, melyek "
+"lehetnek\n"
+"                tartozás vagy követelés ügylet.\n"
+"              </p><p>\n"
+"                Automatikusan létrehoz napló tételeket minden \n"
+"                könyvelési dokumentumhoz: számla, visszatérítés, beszállítók "
+"kifizetése, banki kivonatok,\n"
+"                stb. így, napló tételeket kézzel általában/csak egyéb "
+"művelet esetén\n"
+"                képezzen.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Normál szöveg"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -5998,6 +6417,8 @@ msgid ""
 "This payment term will be used instead of the default one for purchase "
 "orders and supplier invoices"
 msgstr ""
+"Ezt a fizetési feltétel használja az alapértelmezett helyett a beszerzési "
+"megrendelésekhez és vásárlói számlákhoz"
 
 #. module: account
 #: code:addons/account/account_invoice.py:474
@@ -6013,24 +6434,26 @@ msgstr ""
 msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
-msgstr "Maximálisan párosítható tételek száma"
+msgstr ""
+"Részenkénti kombinációs párosítások száma  egy mint az automatikus párosítás "
+"max. tételszámhoz használt számlaegyenleg pont megtalálásához."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Nullánál hoszabb időszakot kell használnia."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "ÁFA pozíció sablon"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Visszetérítés vázlat"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6057,7 +6480,7 @@ msgstr "Pénzkazetta nyitása"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Automatikus formázás"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6068,6 +6491,7 @@ msgstr "Párosítás különbözet leírásával"
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
 msgstr ""
+"Típus nézetben nem tud nepló tételeket létrehozni. Váltson másik nézetbe."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6080,17 +6504,19 @@ msgstr "Fix összeg"
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
+"Nem tudja megváltoztatni az adó, el kell távolítania és létre kell hoznia "
+"tételeket."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr "Automatikus párosítás"
+msgstr "Számla automatikus párosítása"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "Könyvelési tételsor"
+msgstr "Könyvelési napló tételsor"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -6106,7 +6532,7 @@ msgstr "Az adóösszeg kiszámítási módszere."
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Esedékesség dátumának kiszámítása"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -6119,18 +6545,18 @@ msgstr "Létrehozás dátuma"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr "Gyűjtőnaplók"
+msgstr "Analitikus gyűjtőnaplók"
 
 #. module: account
 #: field:account.account,child_id:0
 msgid "Child Accounts"
-msgstr "Alárendelt számlák"
+msgstr ""
 
 #. module: account
 #: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Mozgatás neve (Azonosító id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6142,18 +6568,18 @@ msgstr "Különbözet leírása"
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "bevitt tételek"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "Összes szállítói tartozás"
+msgstr ""
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
 #: model:account.financial.report,name:account.account_financial_report_income0
 msgid "Income"
-msgstr ""
+msgstr "Bevétel"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -6201,7 +6627,7 @@ msgstr "Szabad hivatkozás"
 #: code:addons/account/report/account_partner_ledger.py:276
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr "Vevő és szállító számlák"
+msgstr "Vásárlói és beszállítói számlák"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
@@ -6211,24 +6637,24 @@ msgstr "ÁFA pozíció leképezés"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Vállalat kiválasztás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr "Nyitott állapot"
+msgstr "Nyitott állapotú számla"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr "Max menny:"
+msgstr "Max menny.:"
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund Invoice"
-msgstr "Jóváíró számla"
+msgstr "Jóváíró visszatérítés számla"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -6237,9 +6663,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
-"Ez a menüpont elemzést nyújt a főkönyvi számlákon könyvelt tételekről. A "
-"kereső eszköz használatával különböző kritériumokat határozhat meg a "
-"lekérdezéshez."
+"Ez a menüpont elemzést nyújt a különböző főkönyvi számlákon könyvelt "
+"tételekről. A kereső eszköz használatával különböző kritériumokat határozhat "
+"meg a lekérdezéshez, melyek tájékoztatják a tartozásairól és követeléseiről."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -6257,7 +6683,7 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr "Időszak"
+msgstr "Időszak kényszerítése"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -6276,12 +6702,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy főkönyvi számla hozzáadásához.\n"
+"              </p><p>\n"
+"                Egy számla a főkönyvi karton része amire a vállalkozása\n"
+"                be tud jegyezni bármilyen tartozás és követelés "
+"tranzakciót.\n"
+"                Vállalatok két fő részletben mutatják be az éves "
+"könyvelésüket: \n"
+"                a számla egyenlegen és a bevételi kimutatáson (nyereség és "
+"veszteség\n"
+"                számla). A vállalkozás éves elszámolásához a törvény szerint "
+"be kell\n"
+"                mutatni számos informácót.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr "Sorok száma"
+msgstr "# sorok száma"
 
 #. module: account
 #: view:account.invoice:0
@@ -6311,7 +6752,7 @@ msgstr "Szűrés"
 #: code:addons/account/account.py:2334
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "Rossz kifejezés \"%(...)s\" van a modelljében !"
 
 #. module: account
 #: view:account.tax.template:0
@@ -6322,11 +6763,12 @@ msgstr "Számítási kód (ha az ár tartalmazza az adót)"
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
 msgstr ""
+"Számlaegyenleg a kezdeti egyenleg és a tranzakciós tételek alapján számítva"
 
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Veszteség számla"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -6349,6 +6791,11 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' status."
 msgstr ""
+"Összes kézzel létrehozott napló tétel 'Könyveletlen' állapotú, de "
+"választhatja lehetőségként ennek az állapotnak az átugrását az ide vonatkozó "
+"naplón. Ebben az esetben, úgy viselkedik mint a rendszer által automatikusan "
+"létrehozott napló tétel a dokumentum érvényesítésekor (számlák, bank "
+"kivonatok...) mint 'Könyvelt' állapotú tétel."
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -6362,11 +6809,13 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"."
 msgstr ""
+"Nem érvényesítheti ezt a napló tételt mert a \"%s\" számlája nem tartozik a "
+"\"%s\" szálatükörhöz."
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Kimutatás"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -6395,12 +6844,12 @@ msgstr "Semmi"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Kimenő jóváíró számlák"
+msgstr "Kimenő, vásárlói jóváíró számlák"
 
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Idegen számlaegyenleg"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -6420,7 +6869,7 @@ msgstr "A naplóhoz kapcsolt vállalat"
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Több pénznemes környezetet tesz elérhetővé"
 
 #. module: account
 #: view:account.subscription:0
@@ -6437,7 +6886,7 @@ msgstr "ÁFA pozíció megjegyzés :"
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr "Gyűjtőkód tételek elemzése"
+msgstr "Analitikus gyűjtőkód tételek elemzése"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -6450,11 +6899,13 @@ msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Ez a napló automatikusa létre lesz hozva ehhez a bankszámlához, egy tétel "
+"rögzítésekor"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "Gyűjtőkód tétel"
+msgstr "Analitikus gyűjtőkód bevitel"
 
 #. module: account
 #: view:res.company:0
@@ -6478,8 +6929,8 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
-"Amint a párosítás elkészül, a számla állapota rendezettre változik a "
-"rendszerben."
+"Amint a párosítás elkészül, a számla állapota 'Rendezettre' (u.m. fizetve) "
+"változik a rendszerben."
 
 #. module: account
 #: view:account.chart.template:0
@@ -6491,12 +6942,12 @@ msgstr "Gyökér főkönyvi számla"
 #: view:account.analytic.line:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Gyűjtőkód tétel"
+msgstr "Analitikus gyűjtőkód tételsor"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modellek"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1124
@@ -6505,11 +6956,13 @@ msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
 "unreconcile related payment entries first."
 msgstr ""
+"Nem vonhat vissza részben kiegyenlített számlát. Először párosítatlanná kell "
+"tennie az ide vonatkozó fizetéseket."
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "Értékesítést terhelő adók"
+msgstr "Vásárlói értékesítést terhelő adók"
 
 #. module: account
 #: help:account.model,name:0
@@ -6519,7 +6972,7 @@ msgstr "Ismétlődő könyvelési tételek kezelésére szolgáló modell"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Értékesítési adó(%)"
 
 #. module: account
 #: view:account.tax.code:0
@@ -6539,6 +6992,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Kattintson a beszállítótól visszakapott jóváíró visszatérítés "
+"bejegyzéséhez.\n"
+"              </p><p>\n"
+"                Beszállítói visszatérítés kézi bevitele helyett, "
+"létrehozhatja a \n"
+"                visszatérítéseket és közvetlenül párosíthatja az ide "
+"vonatkozó beszerzési\n"
+"                beszállítói számlálkkal.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax,type:0
@@ -6561,6 +7025,10 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Ez a boolean művelet segítséget nyújt annak kiválasztásában, hogy javasol  "
+"az értékesítési és beszerzési értékek kódolásában vagy az általános m2o "
+"mezőt választja. Ez utóbbit választása feltételezi, hogy a sablonban teljes "
+"körűen meghatározott az adó."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6575,17 +7043,17 @@ msgstr "Vállalatok"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Kiegyenlítetlen és kiegyenlített stzámlák"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Alszintek mutatása"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Bank & Készpénz pénztár"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6655,7 +7123,7 @@ msgstr "Tételek részleges párosítása"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Cancel"
-msgstr "Mégse"
+msgstr "Mégsem"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6663,18 +7131,19 @@ msgstr "Mégse"
 #: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr "Vevő"
+msgstr "Kintlévőség"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Lezárt számlákon nem hozhat létre napló tételeket."
 
 #. module: account
 #: code:addons/account/account_invoice.py:633
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
+"A számlatulajdonos vállalkozása és a számla tétel vállalkozása nem egyezik."
 
 #. module: account
 #: view:account.invoice:0
@@ -6695,7 +7164,7 @@ msgstr "Pénznem, ha nem egyezik a vállalat pénznemével."
 #: code:addons/account/installer.py:69
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Egyéni"
 
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
@@ -6706,18 +7175,18 @@ msgstr "Pénzkazetta"
 #: model:account.account.type,name:account.account_type_cash_equity
 #: model:account.account.type,name:account.conf_account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "Saját tőke"
 
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Belső mozgások számlája"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:32
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
-msgstr ""
+msgstr "Kérem ellenőrizze, hogy a 'Napló' beállítását a banki kivonaton"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -6727,7 +7196,7 @@ msgstr "Százalék"
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Kerekítés globálisan"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6743,17 +7212,17 @@ msgstr "Max. tételszám"
 #: code:addons/account/account.py:3465
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Nem tud létrehozni egy nem használt napló kódót."
 
 #. module: account
 #: view:account.invoice:0
 msgid "force period"
-msgstr ""
+msgstr "időszak kényszerítése"
 
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr "Gyűjtő számla gyűjtőkód tételei"
+msgstr "Analitikus gyűjtő számla gyűjtőkód tételei"
 
 #. module: account
 #: field:account.invoice,internal_number:0
@@ -6764,7 +7233,7 @@ msgstr "Számla belső sorszáma"
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Különbség"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6784,7 +7253,7 @@ msgstr "Párosítás: A következő partnerre lép"
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr "Fordított gyűjtőkód kivonat"
+msgstr "Fordított analitikus gyűjtőkód számlaegyenleg"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
@@ -6800,6 +7269,13 @@ msgid ""
 "due date, make sure that the payment term is not set on the invoice. If you "
 "keep the payment term and the due date empty, it means direct payment."
 msgstr ""
+"Ha fizetési feltételeket használ, a fizetési határidő számítása "
+"automatikusan lesz kiszámítva a könyvelési tételek létrehozásakor. A "
+"fizetési feltételhez több határidő számítás is lehet, például 50% azonnal és "
+"50% egy hónapra, de ha kényszeríteni szeretne egy lejárati dátumot, akkor "
+"győződjön meg róla, hogy nincs beállítva fizetési határidő a számlára. Ha a "
+"fizetési határidő és a lejárati dátumot üresen hagyja az azonnali fizetést "
+"jelent."
 
 #. module: account
 #: code:addons/account/account.py:414
@@ -6808,6 +7284,8 @@ msgid ""
 "There is no opening/closing period defined, please create one to set the "
 "initial balance."
 msgstr ""
+"Nincs nyitó/záró időszakasz meghatározva, kérem hozzon létre egyet a kezdeti "
+"számlaegyenleg beállításához."
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6835,12 +7313,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Felhasználói hiba!"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Eldobás"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6853,12 +7331,12 @@ msgstr "Likviditási"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikus gyűjtőkód tételek"
 
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Van alapértelmezett vállakozás"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6867,14 +7345,14 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
-"Ez a varázsló előállítja az üzleti év nyitó tételeit. Többször is lehet "
-"futtatni ugyanarra az évre: a régi egyenlegeket egyszerűen felülírja az "
-"újakkal."
+"Ez a varázsló előállítja az üzleti évet záró napló tételeket a kiválasztott "
+"üzleti évre vonatkozólag. Többször is lehet futtatni ugyanarra az üzleti "
+"évre: a régi nyitó egyenlegeket egyszerűen felülírja az újakkal."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr "Bank és pénztár"
+msgstr "Bank és készpénz pénztár"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6885,12 +7363,13 @@ msgid ""
 "the system."
 msgstr ""
 "Ez a kimutatás elemzést nyújt az üzleti szempontok alapján létrehozott "
-"gyűjtőkódokon könyvelt tételekről. Használja a kereső eszközt az elemzéshez."
+"analitikai könyvelt tételekről. Használja a kereső eszközt a rendszer által "
+"létrehozott analitikus tételek elemzéséhez."
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "A napló nevének egyedinek kell lennie!"
+msgstr "A napló nevének egyedinek kell lennie mindegyik vállalatra!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6904,6 +7383,8 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"Nem változtathatja meg a már naplót tartalmazó főkönyvi számla tulajdonos "
+"vállalkozását."
 
 #. module: account
 #: report:account.invoice:0
@@ -6913,7 +7394,7 @@ msgstr ""
 #: selection:report.invoice.created,type:0
 #, python-format
 msgid "Supplier Refund"
-msgstr "Bejövő jóváíró számla"
+msgstr "Bejövő beszállítói jóváíró számla"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -6946,7 +7427,7 @@ msgstr "Központosítás"
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr "Csoportosítás"
+msgstr "Csoportosítás ezzel..."
 
 #. module: account
 #: code:addons/account/account.py:1024
@@ -6955,6 +7436,8 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Nem lett meghatározva időszak erre a dátumra: %s.\n"
+"Kérem hozzon létre egyet."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -6969,13 +7452,13 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
-"Ha bejelölt, akkor a rendszer megpróbálja összevonni a kontírozási sorokat a "
-"számla könyvelésének generálásakor."
+"Ha bejelölt, akkor a rendszer megpróbálja összevonni a kontírozási számla "
+"tételeket a számla könyvelésének generálásakor."
 
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "Van alapértelmezett vállalat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6992,7 +7475,7 @@ msgstr "account.sequence.fiscalyear"
 #: model:ir.model,name:account.model_account_analytic_journal
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Analytic Journal"
-msgstr "Gyűjtőnapló"
+msgstr "Analitikus gyűjtőnapló"
 
 #. module: account
 #: view:account.entries.report:0
@@ -7005,6 +7488,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"A fizetési feltétel sorának a százalékos értéke 0 és 1 közötti legyen, "
+"Példa: 0.02 érték jelentése: 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -7025,7 +7510,7 @@ msgstr "Beszerzés főkönyvi számla"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Adó nemének egyedinek kell lennie vállalkozásonként!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7038,6 +7523,9 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disabled"
 msgstr ""
+"Ha kiveszi a tranzakciókat a párosításból, akkor azokat a műveleteket is "
+"ellenőriznie kell, melyek ezekkel össze voltak kötve, mivel azok nem lesznek "
+"kiiktatva"
 
 #. module: account
 #: view:account.account.template:0
@@ -7052,7 +7540,7 @@ msgstr "Megjegyzések"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr "Gyűjtőkód tétel statisztika"
+msgstr "Analitikus gyűjtőkód tétel statisztika"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
@@ -7064,7 +7552,7 @@ msgstr "Tételek: "
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Az ide vonatkozó napló pénzneme."
 
 #. module: account
 #: constraint:account.move.line:0
@@ -7072,6 +7560,8 @@ msgid ""
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
 msgstr ""
+"Nem adhatja meg a már vállalkozásként használt pénznemet mint másodlagos "
+"pénznem."
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -7083,7 +7573,7 @@ msgstr "Igaz"
 #: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Számlaegyenleg kivonat (Eszköz számla)"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -7098,7 +7588,7 @@ msgstr "Tartozik összesen"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Következő párosítandó partner tételek"
 
 #. module: account
 #: report:account.invoice:0
@@ -7128,7 +7618,7 @@ msgstr "Python kód"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "A jelenlegi időszakban lévő időszakokkal rendelkező napló tételek"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -7159,7 +7649,7 @@ msgstr "Üzleti adóügyi év záró tételeinek eltörlése"
 #: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Nyereség & Veszteség (Költség, kiadási számla)"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
@@ -7170,7 +7660,7 @@ msgstr "Összesített forgalom"
 #: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Napló bejegyzéssel rendelkező számlát nem tud eltávolítani."
 
 #. module: account
 #: code:addons/account/account.py:1024
@@ -7182,12 +7672,12 @@ msgstr "Hiba!"
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Pénzügyi beszámoló stílus"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr ""
+msgstr "Számla egyenleg jelölést megtartani"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -7214,13 +7704,13 @@ msgstr "Kézi"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Elvetés: visszatérítés létrehozás és párosítás"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Induló dátumot kell beállítania."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7250,6 +7740,9 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Ha kiválasztott a dátum vagy időszak szerinti szűrést, akkor ez a mező "
+"lehetővé teszi egy oszlop hozzáadását a tartozás/követelés/egyenleg "
+"összegeinek kijelzéséhez a szűrő feltételeinek megfelelően."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7264,12 +7757,12 @@ msgstr "Könyvelési tételek"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "A számlán nem található időszak."
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr "Egy oldalon csak egy partner jelenik meg a kimutatásban"
+msgstr "Egy oldalon csak egy partner jelejen meg a kimutatásban"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7304,12 +7797,13 @@ msgstr "Igen"
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "Minden tétel"
+msgstr "Minden bejegyzés"
 
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
 msgstr ""
+"Csak ugyanahoz a partnerhez tartozó napló tételeket tudja párosítani."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7327,7 +7821,7 @@ msgstr "Nyitó egyenleg"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "Párosítás"
+msgstr "Számla párosítás"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -7355,14 +7849,14 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
-"Jelölje be, ha bizonytalan a tétel kontírozásában. Ennek hatására "
-"ellenőrizendőként jelölődik meg."
+"Jelölje be, ha bizonytalan a napló tétel kontírozásában. Ennek hatására "
+"könyvelő szekértő által 'ellenőrizendő'-ként jelölődik meg."
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Adók teljes csomagja"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -7370,11 +7864,13 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state."
 msgstr ""
+"Válassza ki azokat a bejegyzés tételeket, melyeknek nincs vázlat állapotú "
+"számla mozgás bejegyzése."
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr "Beállítások"
+msgstr "Tulajdonságok"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
@@ -7399,6 +7895,8 @@ msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Beállítási hiba!\n"
+"A kiválasztott pénznemet meg kell osztani az alapértelmezett számlával is."
 
 #. module: account
 #: code:addons/account/account.py:2304
@@ -7420,22 +7918,22 @@ msgstr ""
 "%(month)s: hónap meghatározása \n"
 "%(date)s: aktuális dátum\n"
 "\n"
-"pl. %(date)s-i modell"
+"pl. %(date)s-i modellem"
 
 #. module: account
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal Url - elérési út"
 
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Ügyfelek fizetéseinek beállítása"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr "Bizonylat, amely előállította ezt a számlát."
+msgstr "Bizonylat, amely előállította ezt a számla kimutatást."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -7455,7 +7953,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
+msgstr "Értékesítésekkor használt adók"
 
 #. module: account
 #: view:account.period:0
@@ -7466,12 +7964,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Kimenő számlák"
+msgstr "Vásárlói, kimenő számlák"
 
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Egyéb"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7484,7 +7982,7 @@ msgstr "Értékesítés"
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr "Kész"
+msgstr "Elvégezve"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -7494,13 +7992,15 @@ msgid ""
 "Make sure you have configured payment terms properly.\n"
 "The latest payment term line should be of the \"Balance\" type."
 msgstr ""
+"Nem hagyhat jóvá egy számlaegyenleg nélküli bejegyzést.\n"
+"Győződjön meg a fizetési feltétel pontos megadásáról.\n"
+"Az utolsó fizetés feltételének \"Egyenleg\" típusúnak kell lennie."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
 msgstr ""
-"A kézzel berögzített tételekből álló kivonat lesz a tervezet állapotú "
-"kivonat."
+"A kézzel berögzített tételekből álló kivonat, tervezet állapotú kivonat lesz."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7524,13 +8024,14 @@ msgstr ""
 #: field:account.invoice.line,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr "Forrásbizonylat"
+msgstr "Forrás dokumentum"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Nem lett kiadási számla meghatározva ehhez a termékhez: \"%s\" (id:%d)."
 
 #. module: account
 #: view:account.account.template:0
@@ -7544,16 +8045,19 @@ msgid ""
 "You cannot define children to an account with internal type different of "
 "\"View\"."
 msgstr ""
+"Beállítási hiba!\n"
+"Nem határozhat meg al-számákat egy \"Nézet\"-től eltérő belső típusú "
+"számlához."
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "Könyvelési kimutatás"
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Főkönyvi számla pénzneme"
 
 #. module: account
 #: report:account.invoice:0
@@ -7568,7 +8072,7 @@ msgstr "Százalék típusú adókra a %-ot 0-1 közötti számként adja meg."
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Pénzügyi kimutatások sorrendje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7579,13 +8083,13 @@ msgstr "Havi forgalom"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikus gyűjtőkód tételek"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr "Sorok"
+msgstr "Tételsorok"
 
 #. module: account
 #: view:account.tax.template:0
@@ -7605,12 +8109,12 @@ msgstr "Biztos benne, hogy meg akarja nyitni ezt a számlát?"
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Kiadási költség számla nyitó tételei"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr "Vevői hivatkozás"
+msgstr "Vásárlói hivatkozás"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -7626,7 +8130,7 @@ msgstr "Ár"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,closing_details_ids:0
 msgid "Closing Cashbox Lines"
-msgstr ""
+msgstr "Pénzkazetta tételeinek lezárása"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7644,12 +8148,12 @@ msgstr "Tartozik összegek alapértelmezett főkönyvi számlája"
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Könyvelésre feladott bejegyzések"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "A százalékhoz adjon meg egy 0-1 közti arányszám értéket."
 
 #. module: account
 #: view:account.invoice:0
@@ -7659,12 +8163,12 @@ msgstr "Könyvelési időszak"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Számla kibocsátási éve szerinti csoportosítás"
 
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Beszerzési adó (%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7674,12 +8178,12 @@ msgstr "A vevő összes tartozása a vállalat felé."
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Kiegyenlítetlen napló tételek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
 msgid "Chart Templates"
-msgstr ""
+msgstr "Számlatükör sabonok"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -7715,22 +8219,22 @@ msgstr "Zárás dátuma"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Bankkivonat sor"
+msgstr "Bankkivonat tételsor"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "Alapértelmezett előzetesen felszámított ÁFA"
+msgstr "Alapértelmezett előzetesen felszámított beszerzési adó"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Bevételi számla nyitó tételei"
 
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Pro-forma számlák engedélyezése"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7766,12 +8270,12 @@ msgstr "Tételek létrehozása"
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "A vállalkozás fő pénzneme."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -7789,18 +8293,18 @@ msgstr "Figyelem"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Kapcsolatok/Analitikus könyvelések"
 
 #. module: account
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Napló"
+msgstr "Számla napló"
 
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Adó számítás kerekítési mód"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7817,6 +8321,11 @@ msgid ""
 "                                    with the invoice. You will not be able "
 "to modify the credit note."
 msgstr ""
+"Ezt a lehetőséget használja olyan számla visszavonásához, melyet még nem \n"
+"                                    kellett volna kiadnia. Egy jóváírás lesz "
+"létrehozva, érvényesítve és párosítva\n"
+"                                    a számlával. Nem lesz lehetősége a "
+"jóváíró módosítására."
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7851,18 +8360,20 @@ msgid ""
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Nem lett alapértelmezett követelés számla meghatározva a \n"
+"következő naplón \"%s\"."
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Számlasor"
+msgstr "Számla tételsor"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Vásárlói és Beszállítói visszatérítések"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7889,11 +8400,28 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Kattintson új analitikus könyvelés létrehozásához.\n"
+"              </p><p>\n"
+"                A rendes számlatükör felépítése meghatározott az ország\n"
+"                törvényi követelményeinek megfelelően. Az analitikus\n"
+"                számlatükör felépítése az üzletmenetének igényeit kell\n"
+"                tükröznie a költség/hozam kimutatásokban kifejezve.\n"
+"              </p><p>\n"
+"                Ezek általában szerkezetileg a szerződésekből, projektekből, "
+"\n"
+"                termékekből, vagy szakaszaiból álltak. A legtöbb OpenERP "
+"művelet\n"
+"                (számlák, időkimutatások, költségek, stb.) hoznak létre "
+"analitikus tartalmakat,\n"
+"                tételeket az ide vonatkozó számlán.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Gyökér/Nézet"
 
 #. module: account
 #: code:addons/account/account.py:3206
@@ -7905,14 +8433,14 @@ msgstr ""
 #: report:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr "Pro forma"
+msgstr "PRO-FORMA"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr "Nem egyező"
+msgstr "Kiegyenlítetlen"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7923,7 +8451,7 @@ msgstr "Normál"
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "E-mail sablonok"
 
 #. module: account
 #: view:account.move.line:0
@@ -7951,29 +8479,29 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
-"Vevő és szállító tételeknél használt mező. Meg lehet adni a tételsor "
+"Vásárló és beszállító tételeknél használt mező. Meg lehet adni a tételsor "
 "fizetési határidejét."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Több pénznem"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Esedékesség kelte"
 
 #. module: account
 #: code:addons/account/account.py:3193
 #, python-format
 msgid "Sales Journal"
-msgstr "Kimenő számla napló"
+msgstr "Kimenő, vásárlói számla napló"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr "Adó"
+msgstr "Számla adó"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1185
@@ -7985,7 +8513,7 @@ msgstr "Nem adott meg darabszámot!"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Számla kimutatások rangsor"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7996,11 +8524,16 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Ez a lehetőség mező lehetővé teszi egy számla sablon hozzáillesztését egy "
+"jellegzetes számlatükör sablonhoz, mely különbözhet az eredeti gyökér "
+"szülőtől, amihez tartozik. Ez lehetővé teszi olyan számlatükör "
+"meghatározását mely másikat kibővít és kiegészíti egy pár új számlával (Nem "
+"kell többször a mindegyikre jellemző teljes felépítést újra meghatároznia)."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Nem párosított napló bejegyzések"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -8008,6 +8541,8 @@ msgid ""
 "This date will be used as the invoice date for credit note and period will "
 "be chosen accordingly!"
 msgstr ""
+"Ez a dátum lesz használva mint számla dátum a jóváíráshoz és az időszak is "
+"eszerint lesz választva!"
 
 #. module: account
 #: view:product.template:0
@@ -8021,6 +8556,8 @@ msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
 "accounts."
 msgstr ""
+"Be kell állítana egy kódot a kiválasztott számlatükrökön meghatározott "
+"bankszámlához."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -8043,7 +8580,7 @@ msgstr "Záró dátum"
 #: code:addons/account/account.py:1541
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Pénznem igazítás"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -8061,6 +8598,8 @@ msgstr "Kiválasztott számlák érvénytelenítése"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Ez a mező törvényes jelentések készítésére való: nyereség és veszteség, "
+"egyenleg közlő."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8088,17 +8627,17 @@ msgstr "Számlatükör sablonok"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
-msgstr ""
+msgstr "A sorrend mezőt használja az alsóbb rendűtől a felsőbb rendűig."
 
 #. module: account
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
-msgstr ""
+msgstr "A pénznemben visszamaradt összeg"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Jóváírás jegyzet sorrend"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8117,12 +8656,12 @@ msgstr "Tételek könyvelése"
 #: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Customer"
-msgstr "Vevő"
+msgstr "Vásárló"
 
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Jelentés neve"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -8133,7 +8672,7 @@ msgstr ""
 #: code:addons/account/account.py:3092
 #, python-format
 msgid "Cash"
-msgstr "Pénztár"
+msgstr "Készpénz pénztár"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -8147,6 +8686,8 @@ msgid ""
 "Refund base on this type. You can not Modify and Cancel if the invoice is "
 "already reconciled"
 msgstr ""
+"Visszatérítés ennek a típusnak az alapján. Nem tudja megváltoztatni és "
+"visszavonni a már párosított számlát"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8187,7 +8728,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -8282,7 +8823,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "Pénzkazetta sor"
+msgstr "Pénzkazetta tétel sor"
 
 #. module: account
 #: field:account.installer,charts:0
@@ -8446,7 +8987,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 msgid "Analytic Entries"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikus gyűjtőkód tételek"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8717,7 +9258,7 @@ msgstr "Záró egyenleg"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Központi ellenszámla"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8841,6 +9382,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy napló létrehozásához.\n"
+"              </p><p>\n"
+"                Egy napló az összes főkönyvi számlákkal kapcsolatos \n"
+"                pénzmozgások rögzítésére szolgál a\n"
+"                mindennapos üzletben.\n"
+"              </p><p>\n"
+"                Egy tipikus vállalkozásban mindegyik fizetési típushoz "
+"hozzárendel\n"
+"                egy naplót (készpénzes, banki számlák, csekkek), egy "
+"beszállítói napló, egy vásárlói napló\n"
+"                és egy a különféle információkra.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -9032,7 +9587,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr "Gyűjtőkód lista"
+msgstr "Analitikus könyvelések számlatükre"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -9050,6 +9605,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új ismétlődő tétel létrehozásához.\n"
+"              </p><p>\n"
+"                Egy ismétlődő tétel keletkezik, ismétlődési alapon egy "
+"megadott \n"
+"                dátumtól, pl. egy szerződés aláírására hivatkozva a vásárló "
+"ügyféllel\n"
+"                vagy egy beszállítóval. Ilyen tételeket automatikusan tud "
+"kitenni\n"
+"                a rendszer által.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.journal:0
@@ -9066,7 +9633,7 @@ msgstr "A vállalat összes tartozása a szállítóval szemben."
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr "Költségek"
+msgstr "Analitikus költségek"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -9131,6 +9698,7 @@ msgstr ""
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
+"A főkönyvi számla mozgatás (%s) ehhez a központosításhoz visszaigazolt."
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9202,7 +9770,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr "Időszak"
+msgstr "Időszak kényszerítése"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
@@ -9375,7 +9943,7 @@ msgstr "Üzleti év és időszakok zárása"
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr ""
+msgstr "Bejövő jóváíró számla napló"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9388,7 +9956,7 @@ msgstr "Termék információ"
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr "Gyűjtőnaplók"
+msgstr "Anaitikus gyűjtőnaplók"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
@@ -9437,8 +10005,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
-"A költségek a gyűjtőkódokból származnak. Ezek állítják elő a "
-"számlatervezeteket."
+"Analitikus költségek (időkimutatások, egyes megvásárolt termékek, ...) az "
+"analitikus könyvelésből származnak. Ezek számla vázlatokat hoznak létre."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9526,7 +10094,7 @@ msgstr "A partnerre hivatkozó vállalatok"
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr "Jóváírás igénylése"
+msgstr "Jóváírás, visszatérítés igénylése"
 
 #. module: account
 #: view:account.move.line:0
@@ -9663,7 +10231,7 @@ msgstr "A könyvelési tételek a párosítás első bemenetei."
 #: code:addons/account/account_cash_statement.py:301
 #, python-format
 msgid "There is no %s Account on the journal %s."
-msgstr ""
+msgstr "Nincs %s főkönyvi számla ehhez a naplóhoz %s."
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -9738,6 +10306,9 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "refunds. Leave empty to use the expense account."
 msgstr ""
+"Számla beállítása ami alapértelmezetten a számlák adó tételeinek "
+"visszatérítésére szolgál. Hagyja üresen, ha a költség számlát szeretné "
+"használni."
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -9840,7 +10411,7 @@ msgstr "Előjegyzés"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr "Gyűjtőkód kivonat"
+msgstr "Analitikus gyűjtőkód számlaegyenleg"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9890,7 +10461,7 @@ msgstr ""
 #: code:addons/account/account.py:1502
 #, python-format
 msgid " Centralisation"
-msgstr ""
+msgstr " Központosítás"
 
 #. module: account
 #: help:account.journal,type:0
@@ -9901,6 +10472,12 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Válassza az 'Értékesítés'-t a a vásárlói számlák naplóihoz. Válassza a "
+"'Beszerzés'-t a beszállítói számlák naplóihoz. Válassza a 'Készpénz'-t vagy "
+"a 'Bank'-ot olyan naplókhoz melyek a vásárlói vagy beszerzési fizetéseket "
+"rögzítik. Válassza az 'Általános'-t az egyéb műveletek naplózásához. "
+"Válassza 'Nyitó/Záró' helyzetet olyan tételekhez amit új üzleti év "
+"generálásához használ."
 
 #. module: account
 #: view:account.subscription:0
@@ -10032,7 +10609,7 @@ msgstr "Gyűjtőkód karton (csak mennyiségi)"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "Gyűjtőkódokból"
+msgstr "Analitikus gyűjtőkódokból"
 
 #. module: account
 #: view:account.installer:0
@@ -10097,6 +10674,13 @@ msgid ""
 "analytic account.\n"
 "                This installs the module account_budget."
 msgstr ""
+"Ez lehetővé teszi a könyvelő számára az analitikus és átlátható "
+"költségvetést.\n"
+"                Ha már a mester költségvetés és a költségvetés meg lett "
+"határozva,\n"
+"                a projekt irányító  beállíthatja a tervezett költségeket "
+"mindegyik analitikus könyvelési számlára.\n"
+"                Ez a account_budget (számla_költség) modult telepíti.."
 
 #. module: account
 #: field:account.bank.statement.line,name:0
@@ -10453,7 +11037,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Visszatérítés analitikai adógyűjtő számla"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -10723,7 +11307,7 @@ msgstr "Tartomány"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Beszerzési naplóval összefüggő analitikai napló tételei"
 
 #. module: account
 #: help:account.account,type:0
@@ -10821,7 +11405,7 @@ msgstr "Típusonkénti főkönyvi számlák"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr "Gyűjtőkód lista"
+msgstr "Analitikai gyűjtőkód lista"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -10919,7 +11503,7 @@ msgstr "Számla keresése"
 #: code:addons/account/account_invoice.py:1159
 #, python-format
 msgid "Refund"
-msgstr "Jóváíró számla"
+msgstr "Visszatérítés"
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
@@ -11041,7 +11625,9 @@ msgstr "Üzleti évek"
 msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható a gyűjtőnapló."
+msgstr ""
+"Ha az aktív mező hamis, akkor eltüntetheti az analitikus naplót annak "
+"törlése nélkül."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -11168,3 +11754,39 @@ msgstr ""
 #, python-format
 #~ msgid "Nothing to reconcile"
 #~ msgstr "Nincs párosítandó tétel"
+
+#~ msgid ""
+#~ "The amount expressed in the secondary currency must be positif when journal "
+#~ "item are debit and negatif when journal item are credit."
+#~ msgstr ""
+#~ "A másodlagos pénznemben kifejezett mennyiségnek pozitívnak kell lennie, ha a "
+#~ "napló tétel tartozás és negatív, ha a napló tétel követelés."
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete an invoice which is not cancelled. You should refund it "
+#~ "instead."
+#~ msgstr ""
+#~ "Nem tud olyan számlát törölni ami nincs visszavonva. Inkább térítse vissza."
+
+#~ msgid "Cancel Fiscal Year Opening Entries"
+#~ msgstr "Üzleti év nyitó tételeinek eldobása"
+
+#, python-format
+#~ msgid "Last Reconciliation:"
+#~ msgstr "Utolsó párosítás:"
+
+#~ msgid ""
+#~ "Date on which the partner accounting entries were fully reconciled last "
+#~ "time. It differs from the date of the last reconciliation made for this "
+#~ "partner, as here we depict the fact that nothing more was to be reconciled "
+#~ "at this date. This can be achieved in 2 ways: either the last debit/credit "
+#~ "entry was reconciled, either the user pressed the button \"Fully "
+#~ "Reconciled\" in the manual reconciliation process"
+#~ msgstr ""
+#~ "A partner főkönyvi számla tételeinek legutóbbi összesítő párosításának "
+#~ "dátuma. Ha eltér ennek a partnernek a legutóbbi párosítási dátumától, azzal "
+#~ "itt leírjuk azt a tényt, hogy most nincs mit párosítani. Ez kétféleképpen "
+#~ "teljesülhet: vagy az utolsó tartozás/követelés lett párosítva, vagy a "
+#~ "felhasználó megnyomta a \"Összesítő párosítás\" gombot a kézi párosítás "
+#~ "műveletek elindításához"
diff --git a/addons/account_accountant/i18n/es_PE.po b/addons/account_accountant/i18n/es_PE.po
new file mode 100644
index 00000000000..9d70d0c8c3c
--- /dev/null
+++ b/addons/account_accountant/i18n/es_PE.po
@@ -0,0 +1,23 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-12-11 21:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-12 05:58+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: account_accountant
+#: model:ir.actions.client,name:account_accountant.action_client_account_menu
+msgid "Open Accounting Menu"
+msgstr ""
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index c1d2cf6e124..e94f4dcfd4e 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-14 08:39+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:45+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -26,7 +26,7 @@ msgstr ""
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:547
 #, python-format
 msgid "Timesheets to Invoice of %s"
-msgstr ""
+msgstr "Laskutettavat tuntikortit: %s"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -115,7 +115,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "Tällä sopimuksella laskutettujen tuntikorttirivien määrä"
 
 #. module: account_analytic_analysis
 #: model:email.template,subject:account_analytic_analysis.account_analytic_cron_email_template
@@ -136,7 +136,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "Laskettu käyttäen kaavaa: Laskutettu määrä / Kokonaisaika"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
@@ -187,7 +187,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
-msgstr ""
+msgstr "Laskettu käyttäen kaavaa: Maksimiaika - Laskutettu kokonaisaika"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -207,7 +207,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "Laskutettu aika"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_to_invoice:0
@@ -232,7 +232,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Laskettu käyttäen kaavaa: Kokonaisaika - Kokonaistyöaika"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -263,7 +263,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Kokonaistyöaika"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -276,6 +276,8 @@ msgid ""
 "{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), "
 "('invoice_on_timesheets', '=', True)]}"
 msgstr ""
+"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), "
+"('invoice_on_timesheets', '=', True)]}"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -323,7 +325,7 @@ msgstr "Kuukausi"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Laskutettava aika ja materiaali"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -413,7 +415,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Tuntikortit"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -527,7 +529,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "Tulo per todellinen aika"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -549,6 +551,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Klikkaa luodakasesi uuden sopimuksen.\n"
+"                </p><p>\n"
+"                    Käytä sopimuksia seurataksesi tehtäviä, asioita, "
+"työkortteja tai laskuttaaksesi \n"
+"                    tehdyt työt, kulut ja/tai myyntitilaukset. OpenERP "
+"hallitsee automaattisesti\n"
+"                    sopimuksen uusinnasta hälytykset oikealle myyjälle.\n"
+"                </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
@@ -612,7 +624,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr ""
+msgstr "Laskuttamaton aika"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -741,7 +753,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
 msgid "On Timesheets"
-msgstr ""
+msgstr "Työkorteilla"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index fc60d0c6239..ade0f4e39a8 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-09-23 17:16+0000\n"
+"PO-Revision-Date: 2013-12-12 11:20+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-13 06:42+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -782,7 +782,7 @@ msgstr "Te vernieuwen contracten"
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
 msgstr ""
-" Totaal van alles wat gefactureerd zou kunnen worden op dit contrcat."
+" Totaal van alles wat gefactureerd zou kunnen worden op dit contract."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
diff --git a/addons/account_voucher/i18n/es_PE.po b/addons/account_voucher/i18n/es_PE.po
new file mode 100644
index 00000000000..ce69043d204
--- /dev/null
+++ b/addons/account_voucher/i18n/es_PE.po
@@ -0,0 +1,1295 @@
+# Spanish (Peru) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-12-11 22:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-12 05:58+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: account_voucher
+#: field:account.bank.statement.line,voucher_id:0
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:417
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Customer Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,writeoff_amount:0
+msgid ""
+"Computed as the difference between the amount stated in the voucher and the "
+"sum of allocation on the voucher lines."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "(Update)"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
+msgid "Bill Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
+msgid "Import Entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Entry"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay Bill"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure you want to cancel this receipt?"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Allocation"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,currency_help_label:0
+msgid ""
+"This sentence helps you to know how to specify the payment rate by giving "
+"you the direct effect it has"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Statistics"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1641
+#, python-format
+msgid ""
+"You can not change the journal as you already reconciled some statement "
+"lines!"
+msgstr ""
+
+#. module: account_voucher
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status changed"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a purchase receipt. \n"
+"              </p><p>\n"
+"                When the purchase receipt is confirmed, you can record the\n"
+"                supplier payment related to this purchase receipt.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Search Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Counterpart Account"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,account_id:0
+#: field:account.voucher.line,account_id:0
+#: field:sale.receipt.report,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,line_dr_ids:0
+msgid "Debits"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,reconcile:0
+msgid "Full Reconcile"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,date_due:0
+#: field:account.voucher.line,date_due:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,narration:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,move_line_id:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:558
+#: code:addons/account_voucher/account_voucher.py:1073
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Options"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "e.g. 003/10"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Other Information"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:sale.receipt.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1249
+#, python-format
+msgid ""
+"You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a sale receipt.\n"
+"              </p><p>\n"
+"                When the sale receipt is confirmed, you can record the "
+"customer\n"
+"                payment related to this sales receipt.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:971
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Counterpart Comment"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Information"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "(update)"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "e.g. Invoice SAJ/0042"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1208
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1110
+#, python-format
+msgid ""
+"You should configure the 'Gain Exchange Rate Account' in the accounting "
+"settings, to manage automatically the booking of accounting entries related "
+"to differences between exchange rates."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Cancel Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:231
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1641
+#, python-format
+msgid "Unable to change journal !"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Pro-forma Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:318
+#, python-format
+msgid ""
+"At the operation date, the exchange rate was\n"
+"%s = %s"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you make and the "
+"remaining balances you need to pay your suppliers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Memo"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/invoice.py:34
+#, python-format
+msgid "Pay Invoice"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to unreconcile and cancel this record ?"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,is_multi_currency:0
+msgid "Multi Currency Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,state:0
+msgid ""
+" * The 'Draft' status is used when a user is encoding a new and unconfirmed "
+"Voucher.                         \n"
+"* The 'Pro-forma' when voucher is in Pro-forma status,voucher does not have "
+"an voucher number.                         \n"
+"* The 'Posted' status is used when user create voucher,a voucher number is "
+"generated and voucher entries are created in account                         "
+"\n"
+"* The 'Cancelled' status is used when user cancel voucher."
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Difference Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure you want to unreconcile this record?"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1249
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Validated Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new payment. \n"
+"              </p><p>\n"
+"                Enter the customer and the payment method and then, either\n"
+"                create manually a payment record or OpenERP will propose to "
+"you\n"
+"                automatically the reconciliation of this payment with the "
+"open\n"
+"                invoices or sales receipts.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: field:account.config.settings,expense_currency_exchange_account_id:0
+#: field:res.company,expense_currency_exchange_account_id:0
+msgid "Loss Exchange Rate Account"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Paid Amount"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Difference"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,audit:0
+msgid "To Review"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1120
+#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1286
+#, python-format
+msgid "change"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1106
+#, python-format
+msgid ""
+"You should configure the 'Loss Exchange Rate Account' in the accounting "
+"settings, to manage automatically the booking of accounting entries related "
+"to differences between exchange rates."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,is_multi_currency:0
+msgid ""
+"Fields with internal purpose only that depicts if the voucher is a multi "
+"currency one or not"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.invoice:0
+msgid "Register Payment"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.statement.from.invoice.lines,line_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,currency_id:0
+#: field:account.voucher.line,currency_id:0
+#: model:ir.model,name:account_voucher.model_res_currency
+#: field:sale.receipt.report,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Payable and Receivables"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Payment"
+msgstr ""
+
+#. module: account_voucher
+#: field:sale.receipt.report,state:0
+msgid "Voucher Status"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,company_id:0
+#: field:account.voucher.line,company_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,paid:0
+msgid "The Voucher has been totally paid."
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Reconcile Payment Balance"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Cancel Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1067
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Draft Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Purchase Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,state:0
+#: view:sale.receipt.report:0
+msgid "Status"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+msgid "or"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,audit:0
+msgid ""
+"Check this box if you are unsure of that journal entry and if you want to "
+"note it as 'to be reviewed' by an accounting expert."
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1068
+#, python-format
+msgid "Please activate the sequence of selected journal !"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,payment_rate_currency_id:0
+msgid "Payment Rate Currency"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,paid:0
+msgid "Paid"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,analytic_id:0
+msgid "Write-Off Analytic Account"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,date:0
+#: field:account.voucher.line,date_original:0
+#: field:sale.receipt.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,paid_amount_in_company_currency:0
+msgid "Paid Amount in Company Currency"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.bank.statement.line,amount_reconciled:0
+msgid "Amount reconciled"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Directly"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,type:0
+msgid "Dr/Cr"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,pre_line:0
+msgid "Previous Payments ?"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1208
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
+msgid "Journal Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1074
+#, python-format
+msgid "Please define a sequence on the journal."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipts Analysis"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Group by Invoice Date"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Post"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Invoices and outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,currency_help_label:0
+msgid "Helping Sentence"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Date"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "onchange_amount(amount)"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Information"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher.line,voucher_id:0
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
+msgid "Open Invoicing Menu"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,move_ids:0
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:558
+#, python-format
+msgid "Please define default credit/debit accounts on the journal \"%s\"."
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.invoice:0
+#: view:account.voucher:0
+msgid "Pay"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Currency Options"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,payment_option:0
+msgid ""
+"This field helps you to choose what you want to do with the eventual "
+"difference between the paid amount and the sum of allocated amounts. You can "
+"either choose to keep open this difference on the partner's account, or "
+"reconcile it with the payment(s)"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview of the amount "
+"invoiced\n"
+"            to your customer as well as payment delays. The tool search can\n"
+"            also be used to personalise your Invoices reports and so, match\n"
+"            this analysis to your needs.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Posted Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,payment_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Purchase Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,payment_rate:0
+msgid ""
+"The specific rate that will be used, in this voucher, between the selected "
+"currency (in 'Payment Rate Currency' field)  and the voucher currency."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
+#: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Customer"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
+msgid "Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.config.settings,income_currency_exchange_account_id:0
+#: field:res.company,income_currency_exchange_account_id:0
+msgid "Gain Exchange Rate Account"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,tax_id:0
+msgid "Only for tax excluded from price"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
+msgid "Entries by Statement from Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_voucher
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line."
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:971
+#, python-format
+msgid "Cannot delete voucher(s) which are already opened or paid."
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
+msgid "Status Change"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1106
+#: code:addons/account_voucher/account_voucher.py:1110
+#, python-format
+msgid "Insufficient Configuration!"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,active:0
+msgid ""
+"By default, reconciliation vouchers made on draft bank statements are set as "
+"inactive, which allow to hide the customer/supplier payment while the bank "
+"statement isn't confirmed."
+msgstr ""
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index e2f0a930715..342bbab75d2 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-02-06 08:35+0000\n"
-"Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
+"PO-Revision-Date: 2013-12-12 09:27+0000\n"
+"Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-13 06:42+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -123,7 +123,7 @@ msgstr "Više organizacija (tvrtki)"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
-msgstr ""
+msgstr "Na e-mail klijentu"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -133,7 +133,7 @@ msgstr "--db-filter=VASA_BAZA"
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Automatski učitaj kontakte sa LinkedIn-a"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index 9acf2952844..d4750568d90 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-14 08:50+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:13+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -53,7 +53,7 @@ msgstr "Ke"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr "(Jätä tyhjäksi kellonaikaa varten)"
+msgstr "(Jätä tyhjäksi = aika on nykyhetken kellonaika)"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -88,13 +88,13 @@ msgstr "Lopeta työskentely"
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
 msgid "Employee Timesheet"
-msgstr "Työntekijän tuntilista"
+msgstr "Työntekijän tuntikortti"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_reports
 msgid "Timesheet"
-msgstr "Tuntilista"
+msgstr "Tuntikortti"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
@@ -126,7 +126,7 @@ msgstr "Pe"
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Tuntikortin toimenpiteet"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -136,7 +136,7 @@ msgstr "Pienin analyyttinen määrä"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr "Työntekijän kuukauden työaikakortti"
+msgstr "Työntekijän kuukauden tuntikortti"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -157,7 +157,7 @@ msgstr "Projekti / Analyyttinen tili"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr "Tulosta työntekijän työaikakortti"
+msgstr "Tulosta työntekijän tuntikortti"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
@@ -252,11 +252,12 @@ msgstr "Tulosta"
 #: help:account.analytic.account,use_timesheets:0
 msgid "Check this field if this project manages timesheets"
 msgstr ""
+"Valitse tämä valintalaatikko, jos tällä projektilla hallitaan tuntikortteja"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr "Työntekijän kuukauden tuntilista"
+msgstr "Kuukausipalkkaisten tuntikortit"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -350,12 +351,12 @@ msgstr ""
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 msgid "Timesheet by Employee"
-msgstr ""
+msgstr "Tuntikortit työntekijöittäin"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr "Työntekijän tuntilista"
+msgstr "Työntekijän tuntikortti"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
@@ -378,13 +379,13 @@ msgstr "Kirjaudu sisään / Kirjaudu ulos"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr "(Jätä tyhjäksi kellonaikaa varten)"
+msgstr "(Jätä tyhjäki = aika on nykyhetken kellonaika)"
 
 #. module: hr_timesheet
 #: field:account.analytic.account,use_timesheets:0
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "Tuntilistat"
+msgstr "Tuntikortit"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
@@ -484,7 +485,7 @@ msgstr "Kirjaudu sisään/ulos projekteittain"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr "Tulosta työntekijän tuntikortti & tulosta minun tunitkortti"
+msgstr "Tulosta työntekijän tuntikortti ja tulosta oma tuntikorttini"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
@@ -516,7 +517,7 @@ msgstr "Peruuta"
 #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "Työntekijän tuntilista"
+msgstr "Työntekijän tuntikortti"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -547,7 +548,7 @@ msgstr "Nykyinen päivämäärä"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Aikataulurivi"
+msgstr "Tuntikortin rivi"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -577,7 +578,7 @@ msgstr "Kokonaisaika"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(palvelimen paikallinen aika)"
+msgstr "(palvelimen paikallisaika)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index e170f81853f..0616e1c0cb9 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/i18n/fi.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-14 09:05+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr ""
+msgstr "Käyttäjän tuntikortti"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr "Tuntilistat päivien mukaan"
+msgstr "Tuntikortit päivittäin"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -115,7 +115,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
 msgid "Display time in the history of works"
-msgstr "Näytä aika töiden historiassa"
+msgstr "Näytä aika työhistoriassa"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -155,7 +155,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,time:0
 msgid "Time spent"
-msgstr ""
+msgstr "Käytetty aika"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
@@ -176,7 +176,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Invoice on Timesheets Options"
-msgstr ""
+msgstr "Työkorttin valintoihin perustuva lasku"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,amount:0
@@ -196,7 +196,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
-msgstr "Luo lasku tuntilistasta"
+msgstr "Luo lasku tuntikortista"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -226,7 +226,7 @@ msgstr "Luo laskuja"
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr ""
+msgstr "Päivittinen tuntikortti tileittäin"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
@@ -315,7 +315,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
 msgid "Timesheet by User"
-msgstr "Tuntilistat käyttäjän mukaan"
+msgstr "Käyttäjän tuntikortit"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
@@ -330,7 +330,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
 msgid "Timesheet Profit"
-msgstr "Tuntilistan tuotto"
+msgstr "Tuntikortin tulos"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,product:0
@@ -386,7 +386,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
 msgid "Timesheet by Invoice"
-msgstr "Tuntilistat laskun mukaan"
+msgstr "Tuntikortit laskuittain"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
@@ -407,7 +407,7 @@ msgstr "Kyllä (100 %)"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by users"
-msgstr ""
+msgstr "Tuntikortit käyttäjittäin"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:58
@@ -448,7 +448,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
-msgstr ""
+msgstr "Kohdistamattomat tuntikortit käyttäjille"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
@@ -471,7 +471,7 @@ msgstr "Käyttäjän laskutustiheys"
 #: view:report_timesheet.account:0
 #: view:report_timesheet.account.date:0
 msgid "Timesheet by account"
-msgstr "Tilinmukainen tuntilista"
+msgstr "Tuntiikortit tileittäin"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -525,12 +525,12 @@ msgstr "Näytä työn yksityiskohdat laskurivillä."
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr ""
+msgstr "Tuntiikortit tileittäin"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
 msgid "Timesheet by Account"
-msgstr "Tilinmukainen tuntilista"
+msgstr "Tuntiikortit tileittäin"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
@@ -604,12 +604,12 @@ msgstr "Päivämäärä"
 #: field:report_timesheet.invoice,quantity:0
 #: field:report_timesheet.user,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "Aika"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
 msgid "Create invoice from timesheet final"
-msgstr ""
+msgstr "Luo lasku lopullisesta tuntikortista"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,balance:0
@@ -630,7 +630,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
 msgid "Print Timesheet Profit"
-msgstr "Tulosta tuntilistan tuotto"
+msgstr "Tulosta tuntilistan tulos"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -658,7 +658,7 @@ msgstr "Suurin laskutuksen hinta"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Timesheet Invoicing Ratio"
-msgstr ""
+msgstr "Tuntikortin laskutusaste"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -689,7 +689,7 @@ msgstr ""
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Tuntikortin rivi"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -722,7 +722,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr ""
+msgstr "Tuntikortit tileittäin"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,date:0
@@ -737,7 +737,7 @@ msgstr "Näytä uudelleen laskutettavan kohteen kustannukset"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr ""
+msgstr "Laskutettavat tuntikortit"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:186
@@ -749,7 +749,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
 msgid "Daily Timesheet by Account"
-msgstr ""
+msgstr "Päivittäiset tuntikortit tileittäin"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,product:0
@@ -791,7 +791,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Käytetty aika"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_max:0
@@ -806,7 +806,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr ""
+msgstr "Tuntikortti laskuittain"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -835,7 +835,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr ""
+msgstr "Päivän tuntikortti tileittäin"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,sale_price:0
@@ -845,7 +845,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr ""
+msgstr "Tuntikortit päivittäin"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index 9604294f2bb..b608dc56d75 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-14 09:36+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -34,7 +34,7 @@ msgstr "Palvelu"
 #: field:hr.timesheet.report,quantity:0
 #: field:timesheet.report,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "Aika"
 
 #. module: hr_timesheet_sheet
 #: help:hr.config.settings,timesheet_max_difference:0
@@ -67,7 +67,7 @@ msgstr "Osasto"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr "Tehtävän tuntilista"
+msgstr "Tehtävän tuntikortti"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73
@@ -113,7 +113,7 @@ msgstr "Yritys"
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "Tuntilista"
+msgstr "Tuntikortti"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -123,7 +123,7 @@ msgstr "Aseta luonnokseksi"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Timesheet Period"
-msgstr ""
+msgstr "Tuntikortin jakso"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0
@@ -139,14 +139,14 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr "Perustuu tuntilistaan"
+msgstr "Perustuu tuntikorttiin"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:327
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
-msgstr ""
+msgstr "Et voi muuttaa vahvistetulla tuntikortilla olevaa tietoa."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -157,7 +157,7 @@ msgstr "Ryhmittele viikonpäivän mukaan"
 #. module: hr_timesheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 msgid "My Current Timesheet"
-msgstr "Oma tuntilista"
+msgstr "Omat tuntikorttini"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -189,7 +189,7 @@ msgstr "Hylkää"
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Tuntikortin toimenpiteet"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -204,6 +204,7 @@ msgstr ""
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
 msgstr ""
+"Et voi antaa läsnäolopäivää valitun tuntikortin päivämäärien ulkopuolelta."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205
@@ -237,6 +238,10 @@ msgid ""
 "* The 'Done' status is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * \"Ehdotus\" -tilaa käytetään, kun käyttäjä kirjaa uudet,vahviastamattomat "
+"tunnit tuntikortille.\n"
+"* \"Vahvistettu\" -tila syntyy käyttäjän vahvistaessa tuntikorttinsa.\n"
+"* \"Valmis\" -tilassa käyttäjän tuntikortin on hyväksynyt hänen esimiehensä."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
@@ -257,7 +262,7 @@ msgstr ""
 #: field:hr.config.settings,timesheet_max_difference:0
 msgid ""
 "Allow a difference of time between timesheets and attendances of (in hours)"
-msgstr ""
+msgstr "Sallii aikaeron tuntikorttien ja läsnäolotuntien välillä."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99
@@ -270,7 +275,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
 msgid "Timesheet Sheet Analysis"
-msgstr "Tuntilistan analyysi"
+msgstr "Tuntikorttien taulukkoanalyysi"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
@@ -295,11 +300,13 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user."
 msgstr ""
+"Luodaksesi tälle käyttäjälle tuntikortin, sinun pitää antaa se tehtäväksi "
+"ao. käyttäjälle."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr "Työntekijän tuntilistan syötöt"
+msgstr "Työntekijän tuntikortin syöttö"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213
@@ -340,7 +347,7 @@ msgstr "Päiväys alkaen"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: view:res.company:0
 msgid "Timesheets"
-msgstr "Tuntilistat"
+msgstr "Tuntikortit"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -364,7 +371,7 @@ msgstr "Hyväksy"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Tuntilistan rivit"
+msgstr "Tuntikortin rivit"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_follower_ids:0
@@ -401,7 +408,7 @@ msgstr "Kokonaisaika"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 msgid "Timesheets to Validate"
-msgstr ""
+msgstr "Tuntikortit vahvistettavaksi"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -418,7 +425,7 @@ msgstr "Rymittele päivämäärän kuukauden mukaan"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr "Projektipäällikkö vahvistaa tuntilistat."
+msgstr "Projektipäällikkö vahvistaa tuntikortit."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -429,7 +436,7 @@ msgstr "Heinäkuu"
 #. module: hr_timesheet_sheet
 #: field:hr.config.settings,timesheet_range:0
 msgid "Validate timesheets every"
-msgstr ""
+msgstr "Vahvista tuntikortit joka"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73
@@ -465,7 +472,7 @@ msgstr "Määrä"
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Tuntilistasaldo"
+msgstr "Tuntikortti yhteensä"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -481,12 +488,12 @@ msgstr "Kirjaudu sisään"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr "Tuntilista yhteensä"
+msgstr "Tuntikortti yhteensä"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
@@ -495,6 +502,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'."
 msgstr ""
+"Luodaksesi tuntikortin tälle työntekijälle, hönet pitää kytkeä ensign "
+"tuotteeseen kuten \"Konsultti\"."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -511,7 +520,7 @@ msgstr "Joulukuu"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr "Avaa nykyisen tuntilistasi"
+msgstr "Avaa nykyisen tuntikorttisi"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.config.settings,timesheet_range:0
@@ -572,7 +581,7 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
-"Tuntilistan rivi määrittelee työntekijän tiettyyn palveluun käyttämän ajan"
+"Tuntikortin rivi tarkoittaa työntekijän tiettyyn palveluun käyttämää aikaa"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
@@ -595,17 +604,17 @@ msgstr "Luonnos"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr "Tuntilistan sallittu ero (tuntia)"
+msgstr "Tuntikortin sallittu ero (tuntia)"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr "Lasku luodaan tuntilistan perusteella"
+msgstr "Lasku luodaan tuntikortin perusteella"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr "Tuntilistan luonnos"
+msgstr "Tuntikorttiehdotus"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -661,7 +670,7 @@ msgstr "Viikko"
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by Period"
-msgstr "Tuntilistat jaksoittain"
+msgstr "Tuntikortit jaksoittain"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_is_follower:0
@@ -680,7 +689,7 @@ msgstr "Käyttäjä"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Account"
-msgstr "Tilinmukainen tuntilista"
+msgstr "Tuntiikortti tileittäin"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0
@@ -699,7 +708,7 @@ msgstr "Marraskuu"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr "Laajennetut Suotimet..."
+msgstr "Laajennetut suodattimet..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
@@ -724,6 +733,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs."
 msgstr ""
+"Tuntikorttia ei voi vahvistaa, ellei se sisällä yhtä paljon työntekijän "
+"sisään ja ulos kirjautumisia."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -751,12 +762,12 @@ msgstr "yhteenveto"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries."
-msgstr ""
+msgstr "Et voi poistaa tuntikorttia, jolla on läsnäolokirjauksia."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr "Tarkastamattomat tuntilistat"
+msgstr "Vahvistamattomat tuntikotit"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
@@ -765,6 +776,9 @@ msgid ""
 "You cannot have 2 timesheets that overlap!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Sinulla ei voi olla kahta päällekkäistä tuntikorttia!\n"
+"Käytä valikon valintaa \"Minun tuntikorttini\" välttääksesi tämän "
+"päällekkäisyyden."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -783,7 +797,7 @@ msgstr "Yleinen tili"
 #: help:hr.config.settings,timesheet_range:0
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr "Jakso johon tuntilistat vahvistetaan."
+msgstr "Jakso johon tuntikortit vahvistetaan."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -794,7 +808,7 @@ msgstr "Hae tiliä"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:429
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet"
-msgstr ""
+msgstr "Et voi muuttaa vahvistetun tuntikortin kirjauksia"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -802,8 +816,8 @@ msgid ""
 "Allowed difference in hours between the sign in/out and the timesheet "
 "computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
-"Sallittu erotus tunteina kirjautumisten (sisään/ulos) ja tuntilistan "
-"laskennan välillä tuntilistaa kohden. Aseta 0 jos et halua kontrollia."
+"Sallittu laskentaero tunteina kirjautumisten (sisään/ulos) ja yhden "
+"tuntikortin. Aseta arvoksi 0 (nolla) jos et halua kontrollia."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -828,13 +842,16 @@ msgid ""
 "You cannot have 2 timesheets that overlap!\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Sinulla ei voi olla kahta päällekkäistä tuntikorttia!\n"
+"Käytä valikon valintaa \"Minun nykyinen tuntikorttini\" välttääksesi tämän "
+"päällekkäisyyden."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 msgid "My Timesheet"
-msgstr "Oma tuntilista"
+msgstr "Minun tuntikorttini"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -865,13 +882,13 @@ msgstr "Laskuta työtä"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Tuntilistat tilien mukaan"
+msgstr "Tuntikortit tileittäin"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:50
 #, python-format
 msgid "Open Timesheet"
-msgstr "Avaa tuntilista"
+msgstr "Avaa tuntikortti"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -901,17 +918,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr "Tuntilistan analyysi"
+msgstr "Tuntilkorttianalyysi"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr "Hae tuntilistaa"
+msgstr "Hae tuntikorttia"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr "Vahvistetut tuntilistat"
+msgstr "Vahvistetut tuntikortit"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -921,13 +938,13 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Tuntilistan rivi"
+msgstr "Tuntikortin rivi"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed."
-msgstr ""
+msgstr "Et voi poistaa jo vahvistettua tuntikorttia."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -953,7 +970,7 @@ msgstr "Kuvaus"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr "Työntekijä vahvistaa määräajoin oman tuntilistansa"
+msgstr "Työntekijä vahvistaa määräajoin omat tuntikorttinsa."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -974,7 +991,7 @@ msgstr "Kirjaudu ulos"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr "Siirtää tehtävänsyötön tuntilistan riville"
+msgstr "Siirtää tehtäväkirjauksen tuntikortin riville"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -998,7 +1015,7 @@ msgstr "Erotus"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
 #, python-format
 msgid "You cannot duplicate a timesheet."
-msgstr ""
+msgstr "Et voi tuplata tuntikorttia."
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -1032,7 +1049,7 @@ msgstr "Työntekijät"
 #. module: hr_timesheet_sheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
+msgstr "Et voi muuttaa vahvistetun tai valmiin tuntikortin kirjauksia!"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -1113,7 +1130,7 @@ msgstr "Päivämäärä"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr "HR tuntilista"
+msgstr "HR-tuntikortti"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -1151,4 +1168,4 @@ msgstr "Loki"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Day"
-msgstr "Tuntilista päivämäärän mukaan"
+msgstr "Tuntikortti päivittäin"
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index c742937f6b0..92b483559c0 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-07 06:08+0000\n"
+"PO-Revision-Date: 2013-12-12 20:11+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-08 05:46+0000\n"
+"X-Launchpad-Export-Date: 2013-12-13 06:42+0000\n"
 "X-Generator: Launchpad (build 16869)\n"
 
 #. module: mail
@@ -954,8 +954,7 @@ msgid ""
 "            "
 msgstr ""
 "<p>\n"
-"                    <b>Bună Treabă!</b> Căsuța dumneavoastră poștală este "
-"goală.\n"
+"                    <b>E bine!</b> Căsuța dumneavoastră poștală este goală.\n"
 "                </p><p>\n"
 "                    Căsuța dumneavoastră poștală conține mesaje sau email-"
 "uri personale care v-au fost trimise dumneavoastră,\n"
diff --git a/addons/project_issue/i18n/fi.po b/addons/project_issue/i18n/fi.po
index 98ad7513c75..eee623c19da 100644
--- a/addons/project_issue/i18n/fi.po
+++ b/addons/project_issue/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-03 07:08+0000\n"
+"PO-Revision-Date: 2013-12-14 10:14+0000\n"
 "Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-04 05:56+0000\n"
-"X-Generator: Launchpad (build 16861)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -761,7 +761,7 @@ msgstr ""
 #. module: project_issue
 #: help:project.issue,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr "Laskettu: käytetty aika / kokonaisaika"
+msgstr "Laskettu kaavalla: käytetty aika / kokonaisaika"
 
 #. module: project_issue
 #: field:project.project,issue_count:0
diff --git a/addons/project_issue_sheet/i18n/fi.po b/addons/project_issue_sheet/i18n/fi.po
index 1a907c115c3..840bb53056f 100644
--- a/addons/project_issue_sheet/i18n/fi.po
+++ b/addons/project_issue_sheet/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-14 10:18+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
@@ -31,17 +31,17 @@ msgstr "Analyyttinen rivi"
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_project_issue
 msgid "Project Issue"
-msgstr "Projekti tapahtuma"
+msgstr "Projektin huolenaihe"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Tuntilistan rivi"
+msgstr "Tuntikortin rivi"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "on_change_project(project_id)"
-msgstr ""
+msgstr "on_change_project(project_id)"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
@@ -64,9 +64,9 @@ msgstr "Luontipäivä"
 #: view:project.issue:0
 #: field:project.issue,timesheet_ids:0
 msgid "Timesheets"
-msgstr "Tuntilistat"
+msgstr "Tuntikortit"
 
 #. module: project_issue_sheet
 #: field:hr.analytic.timesheet,issue_id:0
 msgid "Issue"
-msgstr "Tapaus"
+msgstr "Huolenaihe"
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index 66bf5d13163..9e3b9e71367 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-14 10:41+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -44,11 +44,13 @@ msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
 msgstr ""
+"Et voi poistaa projektille annettua kumppania, mutta voit poistaa merkinnän "
+"aktiivinen -laatikosta."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr "Projektin tehtävät työt"
+msgstr "Projektille tehtävät työt"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:294
@@ -56,11 +58,12 @@ msgstr "Projektin tehtävät työt"
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
 msgstr ""
+"Et voi valita abalyyttistä tiliä, joka on tilassa suljettu tai peruutettu."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr "Ryhmittele"
+msgstr "Ryhmittely..."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -72,7 +75,7 @@ msgstr "Lokakuu"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "Tuntikortit"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -94,7 +97,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Analyyttinen tili/projekti"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -133,7 +136,7 @@ msgstr "Tehtävän laskutus"
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr "Tehtävän tyot"
+msgstr "Tehtävän työt"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -147,11 +150,13 @@ msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Määrittele ao. työntekijälle päiväkirja.\n"
+"Täytä työntekijälomakkeen välilehti: tuntikortti."
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr "Kirjaudu Sisään/Ulos projektista"
+msgstr "Kirjaudu sisään/ulos projektista"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -166,7 +171,7 @@ msgstr "Uusittavat sopimukset"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "Tunnit"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -198,7 +203,7 @@ msgstr "Heinäkuu"
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr "Tee tuntilistasi valmiiksi."
+msgstr "Tee tuntiikorttisi valmiiksi."
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
@@ -225,17 +230,17 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr "Tuntilistan tehtävä"
+msgstr "Tuntikortin tehtävä"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr "Tehtävän syöttö"
+msgstr "Tehtävän kirjaus"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr "Tehtävän yhteenvedosta tulee tuntilistan rivi"
+msgstr "Tehtävän yhteenvedosta tulee tuntikortin rivi"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -270,7 +275,7 @@ msgstr "Huhtikuu"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
@@ -282,6 +287,7 @@ msgstr "Syötä tehtävään käyttämäsi tuntimäärä"
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
 msgstr ""
+"Määrittele käyttäjälle \"%s\" työntekijätiedot. Oltava vähintään yksi."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -297,7 +303,7 @@ msgstr "Virheellinen analyyttinen tili !"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr "Tuntilista/tehtävä tuntiraportti kuukausittain"
+msgstr "Tuntikortti ja tehtävän tunnit -raportti kuukausittain"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:84
@@ -316,7 +322,7 @@ msgstr "Laskutus"
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sales order lines"
-msgstr ""
+msgstr "Liipaise laskut myyntitilausten riveiltä."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:100
@@ -334,6 +340,8 @@ msgid ""
 "<p>Timesheets on this project may be invoiced to %s, according to the terms "
 "defined in the contract.</p>"
 msgstr ""
+"<p>Tämän projection tuntikortit voi laskuttaa sopimuksen ehtojen mukaisesti "
+"asiakkaalta \"%s\".</p>"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
@@ -344,7 +352,7 @@ msgstr "Tehtävälle tehty työ"
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks"
-msgstr ""
+msgstr "Laskuta tehtävät"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
@@ -372,7 +380,7 @@ msgstr "Kun tehtävä on valmis, tee sille lasku."
 #: code:addons/project_timesheet/project_timesheet.py:266
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Virheellinen toiminto!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -387,11 +395,13 @@ msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project "
 "'%s'.</p>"
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">Kirjaa tuntikorttisi projectile "
+"\"%s\".</p>"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr "Tuntilistan tunnit"
+msgstr "Tuntikortin tunnit"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -402,4 +412,4 @@ msgstr "Vuosi"
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr "Täytä tuntilista"
+msgstr "Täytä tuntikortti"
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index 2def90f74a0..c3d4759c606 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-12 10:14+0000\n"
+"Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:32+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-13 06:43+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -61,6 +61,11 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Definirajte radna vremena i rasporede koji mogu biti "
+"zakazani sa članovima projekta\n"
+"              </p>\n"
+"            "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -109,7 +114,7 @@ msgstr ""
 #: code:addons/resource/resource.py:373
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopija)"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -144,7 +149,7 @@ msgstr "petak"
 #. module: resource
 #: view:resource.calendar.attendance:0
 msgid "Hours"
-msgstr ""
+msgstr "Sati"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -165,12 +170,12 @@ msgstr "Datum"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Search Working Period Leaves"
-msgstr ""
+msgstr "Pretraži odsustva unutar radnog razdoblja"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -216,13 +221,13 @@ msgstr "Radno vrijeme"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Start and End time of working."
-msgstr ""
+msgstr "Početno i završno vrijeme rada"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Working Period"
-msgstr ""
+msgstr "Razdoblje rada"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -255,7 +260,7 @@ msgstr "Kalendar resursa"
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Radi od"
 
 #. module: resource
 #: help:resource.resource,user_id:0
@@ -270,7 +275,7 @@ msgstr ""
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Starting Date of Leave"
-msgstr ""
+msgstr "Početni datum odsustva"
 
 #. module: resource
 #: field:resource.resource,code:0
@@ -338,7 +343,7 @@ msgstr "(odmor)"
 #: code:addons/resource/resource.py:455
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Greška u konfiguraciji!"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
@@ -348,7 +353,7 @@ msgstr "Čovjek"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 17b16b764b7..1aaa68fc0bd 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-02 21:54+0000\n"
+"PO-Revision-Date: 2013-12-14 10:42+0000\n"
 "Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-03 06:16+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -2087,7 +2087,7 @@ msgstr "Myyntitilaus käsittelyssä"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr "Valmistele laskut tuntilomakkeen pohjalta"
+msgstr "Valmistele laskut tuntikorttien pohjalta"
 
 #. module: sale
 #: help:sale.order,origin:0
diff --git a/addons/sale_mrp/i18n/th.po b/addons/sale_mrp/i18n/th.po
new file mode 100644
index 00000000000..8e9ba281645
--- /dev/null
+++ b/addons/sale_mrp/i18n/th.po
@@ -0,0 +1,43 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-12 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-13 06:43+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
diff --git a/addons/sale_stock/i18n/fi.po b/addons/sale_stock/i18n/fi.po
index 1df34329223..25793a8ef1d 100644
--- a/addons/sale_stock/i18n/fi.po
+++ b/addons/sale_stock/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-12-02 10:52+0000\n"
+"PO-Revision-Date: 2013-12-14 10:46+0000\n"
 "Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-03 06:16+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -138,7 +138,7 @@ msgstr "Virheellinen toiminto!"
 #. module: sale_stock
 #: field:sale.config.settings,module_project_timesheet:0
 msgid "Project Timesheet"
-msgstr "Projektin tuntilomake"
+msgstr "Projektin tuntikortti"
 
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index a84418c6e3c..543449e8946 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-03 08:39+0000\n"
+"PO-Revision-Date: 2013-12-12 07:51+0000\n"
 "Last-Translator: Andreas Brueckl <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:35+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-13 06:43+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -5063,7 +5063,7 @@ msgstr "Lieferung"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import the current inventory"
-msgstr "Importieren Sie die aktuelle Währung."
+msgstr "Importieren Sie das aktuelle Lager"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index fef68542019..cea13356740 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-03 07:14+0000\n"
+"PO-Revision-Date: 2013-12-14 10:44+0000\n"
 "Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-04 05:56+0000\n"
-"X-Generator: Launchpad (build 16861)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:46+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr "Varastosiirto, jaa rivit"
+msgstr "Varastosiirto: jaa rivit"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
diff --git a/addons/web_linkedin/i18n/hr.po b/addons/web_linkedin/i18n/hr.po
index 4693e2b3da0..dbe6d26477d 100644
--- a/addons/web_linkedin/i18n/hr.po
+++ b/addons/web_linkedin/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"PO-Revision-Date: 2013-12-12 09:17+0000\n"
+"Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:38+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-13 06:43+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: web_linkedin
 #. openerp-web
@@ -61,6 +61,8 @@ msgid ""
 "To use the LinkedIn module with this database, an API Key is required. "
 "Please follow this procedure:"
 msgstr ""
+"Potreban Vam je API ključ za korištenje LinkedIn modula sa ovom bazom. "
+"Slijedite ovu proceduru:"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
@@ -113,12 +115,12 @@ msgstr "Organizacije"
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "JavaScript API Domain:"
-msgstr ""
+msgstr "JavaScript API Domena:"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "Go to this URL:"
-msgstr ""
+msgstr "Idite na ovaj URL:"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
@@ -142,9 +144,9 @@ msgstr "Kopiraj"
 #: code:addons/web_linkedin/static/src/xml/linkedin.xml:33
 #, python-format
 msgid "LinkedIn access was not enabled on this server."
-msgstr ""
+msgstr "LinkedIn pristup nije omogućen na ovom serveru."
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "Add a new application and fill the form:"
-msgstr ""
+msgstr "Dodaj novu aplikaciju i ispuni formular:"
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 2305ce0e2ec..b75b0dae9cd 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2013-12-03 06:41+0000\n"
+"PO-Revision-Date: 2013-12-14 10:13+0000\n"
 "Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-04 05:56+0000\n"
-"X-Generator: Launchpad (build 16861)\n"
+"X-Launchpad-Export-Date: 2013-12-15 05:45+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -215,13 +215,12 @@ msgid ""
 "reports."
 msgstr ""
 "\n"
-"Luo laskut perustuen kuluihin, aikaan ja tuntikirjauksiin.\n"
+"Luo laskut perustuen kuluihin ja tuntikortteihin.\n"
 "========================================================\n"
 "\n"
-"Moduuli laskujen luomiseen henkilökulujen pohjalta (tuntilomakkeen "
-"merkinnät, kulut,...)\n"
+"Moduuli laskujen luomiseen kulujen pohjalta (henkilöstöhallinto, kulut,...)\n"
 "\n"
-"Voit määritellä hinnastoja kustannuspaikoille ja luoda näillä "
+"Voit määritellä hinnastoja analyyttisessä kirjanpidossa ja luoda näillä "
 "ennusteraportteja tuloista."
 
 #. module: base
@@ -676,7 +675,7 @@ msgstr "Espanjalainen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr "Laskuta tuntilistojen mukaan"
+msgstr "Laskuta tuntikorttien mukaan"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -4352,7 +4351,7 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue_sheet
 msgid "Timesheet on Issues"
-msgstr "Tuntilomake asioille"
+msgstr "Tuntikortti asioille"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -6712,7 +6711,7 @@ msgid ""
 "request, timesheets, ...), if he is linked to an employee in the system."
 msgstr ""
 "käyttäjä voi hallita hänen omia henkilöstöhallintotietojaan "
-"(poissaolopyyntöjä, tuntilmoakkeitaan,...), mikäli hänet on kytketty "
+"(poissaolopyyntöjä, tuntikorttejaan,...), mikäli hänet on kytketty "
 "järjestelmään työntekijänä."
 
 #. module: base
@@ -7018,7 +7017,7 @@ msgstr "OHADA - Kirjanpito"
 #. module: base
 #: help:res.bank,bic:0
 msgid "Sometimes called BIC or Swift."
-msgstr "Kutsutaan myös BIC tai SWIFT koodiksi."
+msgstr "Kutsutaan myös BIC tai SWIFT -koodiksi."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
@@ -7028,7 +7027,7 @@ msgstr "Intia - Kirjanpito"
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
-msgstr "Aika formaatti"
+msgstr "Ajan esitysmuoto"
 
 #. module: base
 #: field:res.company,rml_header3:0
@@ -7335,7 +7334,7 @@ msgstr "Siirtymät"
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
 msgid "Timesheets"
-msgstr "Tuntilistat"
+msgstr "Tuntikortit"
 
 #. module: base
 #: help:ir.values,company_id:0
@@ -7414,6 +7413,20 @@ msgid ""
 "up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Tämä moduuli asentaa tuntikorttijärjestelmän.\n"
+"==========================================\n"
+"\n"
+"Jokainen työntekjiä voi kirjata ajankäyttönsä ja seurata tätä "
+"projekteittain.\n"
+"Projekti on analyyttinen till ja projekti synnyttää kustannuksia "
+"analyyttiselle tilille.\n"
+"\n"
+"Sisältää seurantaan paljon erilaisia aika- ja työntekijäraportteja.\n"
+"\n"
+"Moduuli on täysin integroitu ksutannuslaskentamoduulin kanssa. Sallii \n"
+"hallinnan määrittämisen asiaryhmittäin.\n"
+"    "
 
 #. module: base
 #: field:res.bank,state:0
@@ -7820,7 +7833,7 @@ msgstr "MDX"
 #. module: base
 #: view:ir.cron:0
 msgid "Scheduled Action"
-msgstr "Jaksottimen toiminto"
+msgstr "Ajoitettu toimenpide"
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -8658,9 +8671,9 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
-"Tämä on liitteen nimi johon tulostus tallennetaan. Jätä tyhjäksi jos "
-"tulostettuja raportteija ei haluta tallentaa. Voit käyttää python-lauseketta "
-"jossa on objekti- tai aikamuuttuja."
+"Tämä on liitteen tiedostonimi, johon tuloste tallennetaan. Jätä tyhjäksi jos "
+"tulostettuja raportteja ei haluta tallentaa. Voit käyttää python-lauseketta, "
+"jossa on objekti- tai aikamuuttujia."
 
 #. module: base
 #: sql_constraint:ir.model.data:0
@@ -8740,7 +8753,7 @@ msgstr "Filippiinit"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_timesheet_sheet
 msgid "Timesheets, Attendances, Activities"
-msgstr "Tuntilomakkeet, Poissaolot, Tehtävät"
+msgstr "Tuntikortit, läsnäolot, toiminnot"
 
 #. module: base
 #: model:res.country,name:base.ma
@@ -9547,7 +9560,7 @@ msgstr "8. %I:%M:%S %p = 06:25:20 PM"
 #. module: base
 #: view:ir.filters:0
 msgid "Filters shared with all users"
-msgstr "Suodattimet jaettu kaikkien käyttäjien kanssa"
+msgstr "Suodattimet jotka on jaettu kaikkien käyttäjien kanssa"
 
 #. module: base
 #: view:ir.translation:0
@@ -9862,7 +9875,7 @@ msgstr "Mallia %s ei ole olemassa!"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_jit
 msgid "Just In Time Scheduling"
-msgstr "Just in time ajoitus (JIT)"
+msgstr "JOT-ajoitus (JIT)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -10088,6 +10101,15 @@ msgid ""
 "handle an issue.\n"
 "                "
 msgstr ""
+"\n"
+"Tämä moduuli lisää tuen tuntikortteille projektin asioiden ja  virheiden "
+"hallintaan.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Työkohtaisia lokeja voi ylläpitää käytetyn työajan näyttämiseen "
+"käyttäjittäin.\n"
+"                "
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -12082,7 +12104,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "Legends for Date and Time Formats"
-msgstr "Selitykset päivämäärän ja kellonajan muotoilusta"
+msgstr "Merkinnät päivämäärän ja kellonajan muotoiluun"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -12284,8 +12306,7 @@ msgstr "Käyttäjän viite"
 #: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
-msgstr ""
-"\"%s\" ei näyttäisi olevan sallittu päivä/aika kentälle \"%%(field)s\""
+msgstr "\"%s\" ei ole sallittu päivä/aika kentälle \"%%(field)s\""
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
@@ -13116,7 +13137,7 @@ msgstr "Suodata dokumenttejani"
 #. module: base
 #: model:ir.module.module,summary:base.module_project_gtd
 msgid "Personal Tasks, Contexts, Timeboxes"
-msgstr "Henkilökohtaiset tehtävät, Asiakokonaisuudet, Aikalaatikot"
+msgstr "Henkilökohtaiset tehtävät, asiakokonaisuudet, aikarajat"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cr
@@ -13899,8 +13920,8 @@ msgstr ""
 "---------------\n"
 "* Työntekijät ja hierarkiat: Voit määritellä työntekijät käyttäjinä ja "
 "näyttää hierarkiat\n"
-"* Henkilöstöosastot\n"
-"* Henkilöstötyöt\n"
+"* Henkilöstöhallinnon osastot\n"
+"* Henkilöstöhallinnon tehtävät\n"
 "    "
 
 #. module: base

From af22a1c5b7b144965e8d14dce134563a3cf4e577 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 16 Dec 2013 12:12:18 +0100
Subject: [PATCH 463/547] [FIX] account_analytic_analysis: is_overdue_quantity
 was not updated when quantity max was changed

is_overdue_quantity is a stored function field which was updated only when analytic lines where updated. Or, when the quantity_max field is updated, this field should be recomputed and restored. This is now the case

bzr revid: dle@openerp.com-20131216111218-zcz8qwa7zn3iwvye
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 89e39c71660..e6847c60151 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -397,6 +397,7 @@ class account_analytic_account(osv.osv):
         'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity',
                                                 store={
                                                     'account.analytic.line' : (_get_analytic_account, None, 20),
+                                                    'account.analytic.account': (lambda self, cr, uid, ids, c=None: ids, ['quantity_max'], 10),
                                                 }),
         'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount',
             help="Total customer invoiced amount for this account.",

From 6fab66d6f71b3ec08c9d5b1764fc03feaa1a6be9 Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@openerp.com>
Date: Mon, 16 Dec 2013 13:39:54 +0100
Subject: [PATCH 464/547] [FIX] document: duplicate directory detection should
 work even when a record rule prevent user from seeing duplicates

bzr revid: xal@openerp.com-20131216123954-px10qz9g3qxng6c6
---
 addons/document/document.py             |  5 +++--
 addons/document/test/document_test2.yml | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index d77dce5288a..bf37018afa8 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -34,6 +34,7 @@ import openerp
 from openerp import netsvc
 from openerp import pooler
 from openerp import tools
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.osv.orm import except_orm
 from openerp.tools.misc import ustr
@@ -323,7 +324,7 @@ class document_directory(osv.osv):
         ressource_parent_type_id=vals.get('ressource_parent_type_id',False)
         ressource_id=vals.get('ressource_id',0)
         if op=='write':
-            for directory in self.browse(cr, uid, ids):
+            for directory in self.browse(cr, SUPERUSER_ID, ids):
                 if not name:
                     name=directory.name
                 if not parent_id:
@@ -337,7 +338,7 @@ class document_directory(osv.osv):
                 if len(res):
                     return False
         if op=='create':
-            res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)])
+            res = self.search(cr, SUPERUSER_ID, [('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)])
             if len(res):
                 return False
         return True
diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
index beff61d4d0f..0c6345ef6c4 100644
--- a/addons/document/test/document_test2.yml
+++ b/addons/document/test/document_test2.yml
@@ -58,6 +58,23 @@
     !python {model: ir.attachment}: |
         ids = self.search(cr, uid, [('res_model', '=', 'res.country'), ('res_id', '=', ref("base.za"))])
         assert ids == [ ref("attach_3rd")], ids
+-
+    I test that I can't create duplicate directories (even when duplicates are hidden by a record rule)
+- 
+    !python {model: document.directory}: |
+        duplicate_detected = False
+        from openerp.osv.osv import except_osv
+        try:
+            demo_uid = ref('base.user_demo')
+            dir_vals = {
+                'name': 'Testing (will be deleted!)',
+                'parent_id': ref('document.dir_root')
+            }
+            new_dir_id = self.create(cr, demo_uid, dir_vals, context=None)
+            self.unlink(cr, uid, [new_dir_id], context=None)
+        except except_osv, e:
+            duplicate_detected = e.value == u'Directory name must be unique!'
+        assert duplicate_detected is True, 'Failed to detect duplicate directory'
 -
     I delete the attachments
 -

From cf39b18dc0171f7a53c376e9af6fab531b482af9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 14:18:24 +0100
Subject: [PATCH 465/547] [FIX] hr_gamification: use correct granting method

bzr revid: mat@openerp.com-20131216131824-webc2alxly7l5z83
---
 addons/hr_gamification/gamification.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/gamification.py
index fcc64ca2dc2..feed68a1cf4 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/gamification.py
@@ -106,7 +106,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
             if uid == wiz.user_id.id:
                 raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
 
-            if badge_obj._can_grant_badge(cr, uid,
+            if badge_obj.check_granting(cr, uid,
                                          user_from_id=uid,
                                          badge_id=wiz.badge_id.id,
                                          context=context):

From 3b60ce38b7f73f7dd85579dc2f4a93602fe0d5e3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 14:27:48 +0100
Subject: [PATCH 466/547] [FIX] gamification: avoid traceback in goal
 computation if target == 0 (even if does not make much sense)

bzr revid: mat@openerp.com-20131216132748-i4o71hmxyeyedznx
---
 addons/gamification/goal.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 6657b76ce3a..fe07d24d43f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -131,7 +131,10 @@ class gamification_goal(osv.Model):
         res = dict.fromkeys(ids, 0.0)
         for goal in self.browse(cr, uid, ids, context=context):
             if goal.type_condition == 'higher':
-                res[goal.id] = min(100, round(100.0 * goal.current / goal.target_goal, 2))
+                if goal.current >= goal.target_goal:
+                    res[goal.id] = 100.0
+                else:
+                    res[goal.id] = round(100.0 * goal.current / goal.target_goal, 2)
             elif goal.current < goal.target_goal:
                 # a goal 'lower than' has only two values possible: 0 or 100%
                 res[goal.id] = 100.0

From b0997141bc2f5f5c639d53b40662a574ae354690 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 14:32:36 +0100
Subject: [PATCH 467/547] [FIX] gamification: priority to manual goals when
 getting click action

bzr revid: mat@openerp.com-20131216133236-vbzr4cytqprkkkx5
---
 addons/gamification/goal.py       | 26 ++++++++++++++------------
 addons/gamification/goal_view.xml |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index fe07d24d43f..19ddd87d6be 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -343,6 +343,20 @@ class gamification_goal(osv.Model):
         :return: action description in a dictionnary
         """
         goal = self.browse(cr, uid, goal_id, context=context)
+
+        if goal.computation_mode == 'manually':
+            #open a wizard window to update the value manually
+            action = {
+                'name': _("Update %s") % goal.type_id.name,
+                'id': goal_id,
+                'type': 'ir.actions.act_window',
+                'views': [[False, 'form']],
+                'target': 'new',
+            }
+            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
+            action['res_model'] = 'gamification.goal.wizard'
+            return action
+
         if goal.type_id.action_id:
             #open a the action linked on the goal
             action = goal.type_id.action_id.read()[0]
@@ -360,18 +374,6 @@ class gamification_goal(osv.Model):
                 action['views'] = views
             return action
 
-        if goal.computation_mode == 'manually':
-            #open a wizard window to update the value manually
-            action = {
-                'name': _("Update %s") % goal.type_id.name,
-                'id': goal_id,
-                'type': 'ir.actions.act_window',
-                'views': [[False, 'form']],
-                'target': 'new',
-            }
-            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
-            action['res_model'] = 'gamification.goal.wizard'
-            return action
         return False
 
 
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml
index 8ff34b4e03a..ab12a3f4ade 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/goal_view.xml
@@ -253,7 +253,7 @@
                                 <field name="suffix" placeholder="e.g. days"/>
                                 <field name="monetary"/>
                             </group>
-                            <group string="Clickable Goals">
+                            <group string="Clickable Goals" attrs="{'invisible': [('computation_mode', '=', 'manually')]}">
                                 <field name="action_id"  class="oe_inline"/>
                                 <field name="res_id_field"  attrs="{'invisible': [('action_id', '=', False)]}" class="oe_inline"/>
                             </group>

From aabf541e33779487292889616eb03c8d220d1d95 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 15:02:31 +0100
Subject: [PATCH 468/547] [FIX] gamification: display computation_mode on
 widget view

bzr revid: mat@openerp.com-20131216140231-hp4ydc3gs3pvalcp
---
 addons/gamification/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 28ec11eab87..305f6fddb05 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -85,7 +85,7 @@ class res_users_gamification_group(osv.Model):
                     vals = {'type_name': planline_board['goal_type'].name,
                             'type_description': planline_board['goal_type'].description,
                             'type_condition': planline_board['goal_type'].condition,
-                            'type_computation_mode': planline_board['goal_type'].computation_mode,
+                            'computation_mode': planline_board['goal_type'].computation_mode,
                             'type_monetary': planline_board['goal_type'].monetary,
                             'type_suffix': planline_board['goal_type'].suffix,
                             'type_action': True if planline_board['goal_type'].action_id else False,

From ae19a1609ddc1f3940f1ae679150ee3506d2943d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 15:20:27 +0100
Subject: [PATCH 469/547] [IMP] gamification: revert partially rev 8929, hidden
 if form view but lower priority. This is needed for set your avatar hack
 (done server side in write())

bzr revid: mat@openerp.com-20131216142027-u4adogapahjm9vm0
---
 addons/gamification/goal.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 19ddd87d6be..55f366c8ff9 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -344,19 +344,6 @@ class gamification_goal(osv.Model):
         """
         goal = self.browse(cr, uid, goal_id, context=context)
 
-        if goal.computation_mode == 'manually':
-            #open a wizard window to update the value manually
-            action = {
-                'name': _("Update %s") % goal.type_id.name,
-                'id': goal_id,
-                'type': 'ir.actions.act_window',
-                'views': [[False, 'form']],
-                'target': 'new',
-            }
-            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
-            action['res_model'] = 'gamification.goal.wizard'
-            return action
-
         if goal.type_id.action_id:
             #open a the action linked on the goal
             action = goal.type_id.action_id.read()[0]
@@ -374,6 +361,19 @@ class gamification_goal(osv.Model):
                 action['views'] = views
             return action
 
+        if goal.computation_mode == 'manually':
+            #open a wizard window to update the value manually
+            action = {
+                'name': _("Update %s") % goal.type_id.name,
+                'id': goal_id,
+                'type': 'ir.actions.act_window',
+                'views': [[False, 'form']],
+                'target': 'new',
+            }
+            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
+            action['res_model'] = 'gamification.goal.wizard'
+            return action
+
         return False
 
 

From d08821442e47efd873eb167e68bfa145b2de3e6f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 16 Dec 2013 15:20:49 +0100
Subject: [PATCH 470/547] [FIX] base_action_rule: upon update/create of an
 automated action in multiprocess mode, force registry reload

Short of signaling the other workers, the (new) automated
rule may be randomly ignored, depending on which worker
handles the request (until the workers all reload
their registries).

bzr revid: odo@openerp.com-20131216142049-xh9gxy5cir3p2i09
---
 addons/base_action_rule/base_action_rule.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index a73933ff0f2..3d45407cb0e 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -23,6 +23,7 @@ from datetime import datetime, timedelta
 import time
 import logging
 
+import openerp
 from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
@@ -206,6 +207,7 @@ class base_action_rule(osv.osv):
     def create(self, cr, uid, vals, context=None):
         res_id = super(base_action_rule, self).create(cr, uid, vals, context=context)
         self._register_hook(cr, [res_id])
+        openerp.modules.registry.RegistryManager.signal_registry_change(cr.dbname)
         return res_id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -213,6 +215,7 @@ class base_action_rule(osv.osv):
             ids = [ids]
         super(base_action_rule, self).write(cr, uid, ids, vals, context=context)
         self._register_hook(cr, ids)
+        openerp.modules.registry.RegistryManager.signal_registry_change(cr.dbname)
         return True
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):

From 8c3b6c0a3d6d766e86a64c2380a3c27dd930c5da Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 15:23:52 +0100
Subject: [PATCH 471/547] [IMP] gamification: remove unused variables, add
 missing ones

bzr revid: mat@openerp.com-20131216142352-2s6isuvobm6xyxa4
---
 addons/gamification/goal.py | 4 ++--
 addons/gamification/plan.py | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 55f366c8ff9..4c61f658e42 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -196,7 +196,7 @@ class gamification_goal(osv.Model):
     }
     _order = 'create_date desc, end_date desc, type_id, id'
 
-    def _check_remind_delay(self, goal, context=None):
+    def _check_remind_delay(self, cr, uid, goal, context=None):
         """Verify if a goal has not been updated for some time and send a
         reminder message of needed.
 
@@ -231,7 +231,7 @@ class gamification_goal(osv.Model):
                 continue
 
             if goal.type_id.computation_mode == 'manually':
-                towrite.update(self._check_remind_delay(goal, context))
+                towrite.update(self._check_remind_delay(cr, uid, goal, context))
 
             elif goal.type_id.computation_mode == 'python':
                 # execute the chosen method
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 0e5fc63f689..cb9574fdf6b 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -320,7 +320,6 @@ class gamification_goal_plan(osv.Model):
     def quick_update(self, cr, uid, plan_id, context=None):
         """Update all the goals of a plan, no generation of new goals"""
         if not context: context = {}
-        plan = self.browse(cr, uid, plan_id, context=context)
         goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('plan_id', '=', plan_id)], context=context)
         self.pool.get('gamification.goal').update(cr, uid, goal_ids, context=context)
         return True
@@ -544,7 +543,6 @@ class gamification_goal_plan(osv.Model):
         """
 
         context = context or {}
-        goal_obj = self.pool.get('gamification.goal')
         # template_env = TemplateHelper()
         temp_obj = self.pool.get('email.template')
         ctx = context.copy()

From 354190b44e9e49fb03deb01098a58c52ce1f4e90 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 16:07:26 +0100
Subject: [PATCH 472/547] [IMP] gamification: add portal_gamification module to
 add security rules

bzr revid: mat@openerp.com-20131216150726-su27319fvvxevam6
---
 .../gamification/security/ir.model.access.csv | 13 +++---
 addons/hr_gamification/__openerp__.py         |  2 +-
 addons/portal_gamification/__init__.py        | 21 ++++++++++
 addons/portal_gamification/__openerp__.py     | 42 +++++++++++++++++++
 .../security/ir.model.access.csv              |  7 ++++
 .../security/portal_security.xml              |  9 ++++
 6 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 addons/portal_gamification/__init__.py
 create mode 100644 addons/portal_gamification/__openerp__.py
 create mode 100644 addons/portal_gamification/security/ir.model.access.csv
 create mode 100644 addons/portal_gamification/security/portal_security.xml

diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 5144e26d2bb..3ea86d2c25b 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -1,20 +1,19 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 
-goal_anybody,"Goal Anybody",model_gamification_goal,,1,1,0,0
+goal_employee,"Goal Employee",model_gamification_goal,base.group_user,1,1,0,0
 goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
 
-goal_type_anybody,"Goal Type Anybody",model_gamification_goal_type,,1,0,0,0
+goal_type_employee,"Goal Type Employee",model_gamification_goal_type,base.group_user,1,0,0,0
 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
 
-plan_anybody,"Goal Plan Anybody",model_gamification_goal_plan,,1,0,0,0
+plan_employee,"Goal Plan Employee",model_gamification_goal_plan,base.group_user,1,0,0,0
 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
 
-planline_anybody,"Goal Planline Anybody",model_gamification_goal_planline,,1,0,0,0
+planline_employee,"Goal Planline Employee",model_gamification_goal_planline,base.group_user,1,0,0,0
 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
 
-badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0
+badge_employee,"Badge Employee",model_gamification_badge,base.group_user,1,0,0,0
 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
 
-badge_user_anybody,"Badge-user Anybody",model_gamification_badge_user,,1,0,0,0
-badge_user_user,"Badge-user User",model_gamification_badge_user,base.group_user,1,1,1,0
+badge_user_employee,"Badge-user Employee",model_gamification_badge_user,base.group_user,1,1,1,0
 badge_user_manager,"Badge-user Manager",model_gamification_badge_user,group_goal_manager,1,1,1,1
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index 7dbf5d76df2..d5d79dba074 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/portal_gamification/__init__.py b/addons/portal_gamification/__init__.py
new file mode 100644
index 00000000000..26c654db9dd
--- /dev/null
+++ b/addons/portal_gamification/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
diff --git a/addons/portal_gamification/__openerp__.py b/addons/portal_gamification/__openerp__.py
new file mode 100644
index 00000000000..e20e54be6e3
--- /dev/null
+++ b/addons/portal_gamification/__openerp__.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Portal Gamification',
+    'version': '1',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description': """
+This module adds security rules for gamification to allow portal users to participate to challenges
+===================================================================================================
+    """,
+    'author': 'OpenERP SA',
+    'depends': ['gamification','portal'],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/portal_security.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+    'category': 'Hidden',
+}
+
diff --git a/addons/portal_gamification/security/ir.model.access.csv b/addons/portal_gamification/security/ir.model.access.csv
new file mode 100644
index 00000000000..963053df0de
--- /dev/null
+++ b/addons/portal_gamification/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+goal_portal,"Goal Portal",gamification.model_gamification_goal,portal.group_portal,1,1,0,0
+goal_type_portal,"Goal Type Portal",gamification.model_gamification_goal_type,portal.group_portal,1,0,0,0
+plan_portal,"Goal Plan Portal",gamification.model_gamification_goal_plan,portal.group_portal,1,0,0,0
+planline_portal,"Goal Planline Portal",gamification.model_gamification_goal_planline,portal.group_portal,1,0,0,0
+badge_portal,"Badge Portal",gamification.model_gamification_badge,portal.group_portal,1,0,0,0
+badge_user_portal,"Badge-user Portal",gamification.model_gamification_badge_user,portal.group_portal,1,1,1,0
diff --git a/addons/portal_gamification/security/portal_security.xml b/addons/portal_gamification/security/portal_security.xml
new file mode 100644
index 00000000000..6b46fe96519
--- /dev/null
+++ b/addons/portal_gamification/security/portal_security.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="gamification.goal_user_visibility" model="ir.rule">
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+        </record>
+
+    </data>
+</openerp>

From e02f16bd54b43f0a2acfaa1598e411bb2d81a74d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 16:14:57 +0100
Subject: [PATCH 473/547] [IMP] gamification: update manifest

bzr revid: mat@openerp.com-20131216151457-6vmwb6b6os0e3enn
---
 addons/gamification/__openerp__.py          | 2 +-
 addons/gamification_sale_crm/__openerp__.py | 2 +-
 addons/portal_gamification/__init__.py      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 12e069d5f92..081908fd3e4 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/gamification_sale_crm/__openerp__.py b/addons/gamification_sale_crm/__openerp__.py
index adfb8de08e0..23152cb9f7a 100644
--- a/addons/gamification_sale_crm/__openerp__.py
+++ b/addons/gamification_sale_crm/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2013 Tiny SPRL (<http://openerp.com>).
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/portal_gamification/__init__.py b/addons/portal_gamification/__init__.py
index 26c654db9dd..484faca7b68 100644
--- a/addons/portal_gamification/__init__.py
+++ b/addons/portal_gamification/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as

From ac4a89e8bf194e4e67283b43ab7751452a385dca Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 16:43:17 +0100
Subject: [PATCH 474/547] [FIX] gamification: replace isoformat ->
 DEFAULT_SERVER_DATE_FORMAT

bzr revid: mat@openerp.com-20131216154317-8xliud4s23zvj9yu
---
 addons/gamification/plan.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index cb9574fdf6b..4b253f7286d 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
 
 # from templates import TemplateHelper
@@ -55,7 +56,7 @@ def start_end_date_for_period(period, default_start_date=False, default_end_date
         end_date = default_end_date
 
     if start_date and end_date:
-        return (start_date.isoformat(), end_date.isoformat())
+        return (start_date.strftime(DF), end_date.strftime(DF))
     else:
         return (start_date, end_date)
 
@@ -79,22 +80,22 @@ class gamification_goal_plan(osv.Model):
         """Return the next report date based on the last report date and report
         period.
 
-        :return: a string in isoformat representing the date"""
+        :return: a string in DEFAULT_SERVER_DATE_FORMAT representing the date"""
         res = {}
         for plan in self.browse(cr, uid, ids, context):
             last = datetime.strptime(plan.last_report_date, '%Y-%m-%d').date()
             if plan.report_message_frequency == 'daily':
                 next = last + timedelta(days=1)
-                res[plan.id] = next.isoformat()
+                res[plan.id] = next.strftime(DF)
             elif plan.report_message_frequency == 'weekly':
                 next = last + timedelta(days=7)
-                res[plan.id] = next.isoformat()
+                res[plan.id] = next.strftime(DF)
             elif plan.report_message_frequency == 'monthly':
                 month_range = calendar.monthrange(last.year, last.month)
                 next = last.replace(day=month_range[1]) + timedelta(days=1)
-                res[plan.id] = next.isoformat()
+                res[plan.id] = next.strftime(DF)
             elif plan.report_message_frequency == 'yearly':
-                res[plan.id] = last.replace(year=last.year + 1).isoformat()
+                res[plan.id] = last.replace(year=last.year + 1).strftime(DF)
             # frequency == 'once', reported when closed only
             else:
                 res[plan.id] = False
@@ -288,7 +289,7 @@ class gamification_goal_plan(osv.Model):
                 '&',
                     ('state', 'in', ('reached', 'failed')),
                     '|',
-                        ('end_date', '>=', yesterday.isoformat()),
+                        ('end_date', '>=', yesterday.strftime(DF)),
                         ('end_date', '=', False)
         ], context=context)
         # update every running goal already generated linked to selected plans
@@ -634,7 +635,7 @@ class gamification_goal_plan(osv.Model):
         for plan in self.browse(cr, uid, plan_ids, context=context):
             (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
             yesterday = date.today() - timedelta(days=1)
-            if end_date == yesterday.isoformat() or force:
+            if end_date == yesterday.strftime(DF) or force:
                 # open chatter message
                 message_body = _("The challenge %s is finished." % plan.name)
 

From 98625d20eddf850c30a336fe93f6716b7a0d26a6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 16 Dec 2013 16:47:28 +0100
Subject: [PATCH 475/547] [IMP] gamification: use DEFAULT_SERVER_DATE_FORMAT
 instead of %Y-%m-%d

bzr revid: mat@openerp.com-20131216154728-xhmazn36jmjpv6ai
---
 addons/gamification/plan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 4b253f7286d..ca2934231bc 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -83,7 +83,7 @@ class gamification_goal_plan(osv.Model):
         :return: a string in DEFAULT_SERVER_DATE_FORMAT representing the date"""
         res = {}
         for plan in self.browse(cr, uid, ids, context):
-            last = datetime.strptime(plan.last_report_date, '%Y-%m-%d').date()
+            last = datetime.strptime(plan.last_report_date, DF).date()
             if plan.report_message_frequency == 'daily':
                 next = last + timedelta(days=1)
                 res[plan.id] = next.strftime(DF)

From 20dba40661eec5121abb3fedbb5d5094ba3c189c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 17 Dec 2013 05:32:33 +0000
Subject: [PATCH 476/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131213055207-syrqwzpvnts4z05q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131214054232-imi9a8u9v0ktnahm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216051546-5os7f9apxcrnrx05
bzr revid: launchpad_translations_on_behalf_of_openerp-20131217053233-yv0pe0b16pixnuk4
---
 addons/account/i18n/hu.po  | 1970 ++++++++++++++++++++++++------------
 addons/sale_mrp/i18n/th.po |   43 +
 2 files changed, 1364 insertions(+), 649 deletions(-)
 create mode 100644 addons/sale_mrp/i18n/th.po

diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 16d95bb19f2..4b4f2f7f032 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-12-10 17:32+0000\n"
+"PO-Revision-Date: 2013-12-16 21:04+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-11 05:32+0000\n"
+"X-Launchpad-Export-Date: 2013-12-17 05:32+0000\n"
 "X-Generator: Launchpad (build 16869)\n"
 
 #. module: account
@@ -168,8 +168,8 @@ msgid ""
 "which is set after generating opening entries from 'Generate Opening "
 "Entries'."
 msgstr ""
-"Be kell állítania az 'Év végi belépő könyvelési naplót' a 'Nyitási tétel "
-"létrehozása' menüvel létrehozott üzleti év tételekhez."
+"Be kell állítania az 'Év végi belépő könyvelési naplót' a 'Nyitási bejegyzés "
+"létrehozása' menüvel létrehozott üzleti év bejegyzéseihez."
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -230,9 +230,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
-"Elemző számla mely alapértelmezésben a számlák adó tételének számlája. "
-"Hagyja üresen, ha alap értelmezésben nem szeretne elemző számát használni a "
-"számlák adó tételeire."
+"Analitikus számla mely alapértelmezésben a számlák adó tételének számlája. "
+"Hagyja üresen, ha alap értelmezésben nem szeretne analitikus számát "
+"használni a számlák adó tételeire."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -243,7 +243,7 @@ msgstr "Adósablonok"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Tételsor párosítás kiválasztása"
+msgstr "Bizonylat tételsor párosítás kiválasztása"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -288,8 +288,8 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
-"Ez magába foglalja az összes alap követelményt a banki, készpénzes, "
-"vásárlói, beszerzési, kiadási, visszaküldött, stb nyugta bevitelhez.\n"
+"Ez magába foglalja az összes alap követelményt a banki, pénztári, vásárlói, "
+"beszerzési, kiadási, visszaküldött, stb nyugta bevitelhez.\n"
 "                Ez a account_voucher (könyvelés_nyugta) modult telepíti.."
 
 #. module: account
@@ -378,7 +378,7 @@ msgstr "Többféle valuta engedélyezése"
 #: code:addons/account/account_invoice.py:77
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr "Meg kell határoznia egy elemző gyüjtőnapló típust '%s'!"
+msgstr "Meg kell határoznia egy analitikus gyüjtőnapló típust '%s'!"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -398,7 +398,7 @@ msgstr "A párosításhoz könyvelési számlákat kell kiválasztania."
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr "Főkönyvi számla használatának engedélyezése."
+msgstr "Analitikus számla használatának engedélyezése."
 
 #. module: account
 #: view:account.invoice:0
@@ -428,7 +428,7 @@ msgstr "Létrehozás dátuma"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Bejövő jóváíró számla"
+msgstr "Beszerzési visszatérítési számla"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -464,8 +464,8 @@ msgstr ""
 "Ez lehetővé teszi a személy vagy vállalat által birtokolt vagyoneszközök "
 "nyilvántartását.\n"
 "                A vagyoneszközök értékcsökkenését követi nyomon, és "
-"könyvelési számlák közt mozgatja ezeket az értékcsökkenő\n"
-"                tételeket.\n"
+"könyvelési számlák bizonylatát hozza létre az értékcsökkenő\n"
+"                tételekre.\n"
 "                Ez a account_asset (számla_eszköz) modult telepíti. Ha nem "
 "jelöli be ezt a kockát, akkor tud számlázni & kifizetni,\n"
 "                de nem tud könyvelni (Napló tételeket, Számlatükröket, ...)"
@@ -580,7 +580,7 @@ msgstr "Kiválasztott számlák jóváhagyása"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr "Gyűjtő célszámla"
+msgstr "Fölérendelt gyűjtő célszámla"
 
 #. module: account
 #: help:account.invoice.line,sequence:0
@@ -614,7 +614,7 @@ msgstr "Számlatükör kiválasztása"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "Jóváíró számla"
+msgstr "Visszatérítési számla"
 
 #. module: account
 #: report:account.overdue:0
@@ -671,7 +671,7 @@ msgstr "3 havonta"
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr "Sorszámok"
+msgstr "Sorba rendezések"
 
 #. module: account
 #: field:account.financial.report,account_report_id:0
@@ -686,8 +686,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
-"A kiválasztott napló nem rendelkezik tervezet állapotú számla mozgásokkal  "
-"erre az időszakra."
+"A kiválasztott napló nem rendelkezik tervezet állapotú számla bizonylatokkal "
+" erre az időszakra."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -740,7 +740,7 @@ msgstr "Számlatípusonkénti értékesítés SZTÉ"
 #: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr "Nem lehet mozgást végrehajtani, ha eltér a pénznem ettől .."
+msgstr "Nem lehet bizonylatolni, ha eltér a pénznem ettől .."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -748,6 +748,8 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: account
 #: view:account.period:0
@@ -774,7 +776,7 @@ msgstr "Könyvelési időszak"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr "Egy időszakra csak egy mozgatást végezhet  a központosított naplón."
+msgstr "Egy időszakra csak egy bizonylatot készíthet  a központi naplón."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -783,9 +785,9 @@ msgid ""
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
-"Állítsa be a gyűjtő/elemző számlát amit alapértelmezetten használ a számlák "
+"Állítsa be az analitikus számlát amit alapértelmezetten használ a számlák "
 "adó tételsoraira a visszatérítéshez. Hagyja üresen, ha alapértelmezetten nem "
-"szeretne gyűjtő/elemző számlát használni a számla adó tételsoraira."
+"szeretne analitikus számlát használni a számla adó tételsoraira."
 
 #. module: account
 #: view:account.account:0
@@ -876,7 +878,7 @@ msgstr "Listák"
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "Soronkénti gyűjtőkód tételek"
+msgstr "Soronkénti analitikus gyűjtőkód tételek"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
@@ -913,12 +915,12 @@ msgid ""
 "Click on compute button."
 msgstr ""
 "Hiányzó adósor!\n"
-"Kattintson a \"(Frissítés)\"-re az adó újraszámításához."
+"Kattintson az \"(Újraszámol)\"-ra az adó újraszámításához."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "Előjegyzés sor"
+msgstr "Számla előjegyzés tételsor"
 
 #. module: account
 #: help:account.invoice,reference:0
@@ -928,13 +930,13 @@ msgstr "A számla partner hivatkozása."
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr "Szállítói számlák és jóváírások"
+msgstr "Szállítói számlák és visszatérítések"
 
 #. module: account
 #: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "A bevitt tétel már párosítva."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -962,11 +964,13 @@ msgid ""
 "Print Report with the currency column if the currency differs from the "
 "company currency."
 msgstr ""
+"Kimutatás nyomtatása pénznem oszloppal, ha a pénznem eltér a vállalat "
+"alapértelmezett pénznemétől."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "Naplókód/Megnevezés"
+msgstr "Naplókód/Bizonylat megnevezés"
 
 #. module: account
 #: view:account.account:0
@@ -1002,6 +1006,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Nem talált jelentés tartalmat.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1677
@@ -1011,6 +1019,9 @@ msgid ""
 "                                                  opening/closing fiscal "
 "year process."
 msgstr ""
+"Nem tudja a jelentés tételének párosítását megszüntetni, ha az automatikusan "
+"lett létrehozva a költségvetési üzleti év                                    "
+"                      nyitási/zárási műveleteikor."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -1026,7 +1037,7 @@ msgstr "Számítás"
 #. module: account
 #: field:account.journal.cashbox.line,pieces:0
 msgid "Values"
-msgstr "Címlet"
+msgstr "Értékek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -1038,7 +1049,7 @@ msgstr "Adókivonat"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr "Negyedéves időszakok létrehozása"
+msgstr "Három havi időszakok létrehozása"
 
 #. module: account
 #: report:account.overdue:0
@@ -1071,14 +1082,14 @@ msgstr "Bruttó érték"
 #. module: account
 #: help:account.invoice,supplier_invoice_number:0
 msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "A beszállító által közölt számla hivatkozás."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
-msgstr "Konszolidáció"
+msgstr "Egyeztetettet mutat"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_liability
@@ -1091,12 +1102,12 @@ msgstr "Kötelezettség"
 #: code:addons/account/account_invoice.py:899
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Képezzen sorrendet a naplón ehhez a számlához."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "Kiterjesztett szűrők…"
+msgstr "Kiterjesztett szűrők"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
@@ -1106,7 +1117,7 @@ msgstr "Központi napló"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "Kimenő jóváíró számla"
+msgstr "Kimenő visszatérítés számla"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1116,7 +1127,7 @@ msgstr "Bankkivonat"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Tételsor"
+msgstr "Bizonylat tételsor"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1126,12 +1137,12 @@ msgid ""
 "basic amount(without tax)."
 msgstr ""
 "Ha az adószámla egy adógyűjtő, akkor ez a mező az adó összegét tartalmazza, "
-"ha adóalapgyűjtő, akkor az adóalap összegét."
+"ha adóalapgyűjtő, akkor az adóalap összegét(adó nélkül)."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr "Beszerzés"
+msgstr "Beszerzések"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -1158,7 +1169,7 @@ msgstr "Kód"
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Jellemzők"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -1176,7 +1187,7 @@ msgstr "Nincs gyűjtőnapló!"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr "Folyószámla kivonat"
+msgstr "Partner folyószámla kivonat"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -1194,6 +1205,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson könyvelési számla fiók hozzáadásához.\n"
+"              </p><p>\n"
+"                Ha többféle pénznem végez műveleteket, akkor veszíthet vagy "
+"nyerhet\n"
+"                bizonyos összegeket az árfolyamváltozás miatt. Ez a menü "
+"egy\n"
+"                előrejelzést ad  a nyereségről vagy veszteségről  az aznap\n"
+"                végrehajtott folyamatokról. Csak olyan számlákon, ahol van\n"
+"                másodlagos pénznem.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1211,11 +1234,13 @@ msgid ""
 "Check this box if you don't want any tax related to this tax code to appear "
 "on invoices"
 msgstr ""
+"Jelölje be ezt a négyzetet, ha nem akarja ehhez az adógyűjtőhöz kapcsolatos "
+"bármely adót feltüntetni ezen a számlán."
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr "Hét"
+msgstr "Az év hete"
 
 #. module: account
 #: field:account.report.general.ledger,landscape:0
@@ -1233,19 +1258,19 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
-"A számlatípus több információt tartalmaz a főkönyvi számláról és a "
-"sajátosságairól."
+"Ezek a típusok az országa szerint vannak meghatározva. A számlatípus több "
+"információt tartalmaz a főkönyvi számláról és a sajátosságairól."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr ""
+msgstr "Visszatérítés "
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Nincs kiadási számla meghatározva ehhez a termékhez: \"%s\" (id:%d)."
 
 #. module: account
 #: view:account.tax:0
@@ -1262,12 +1287,12 @@ msgstr "Vitatott"
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr "Pénztár"
+msgstr "Pénztár rögzítők"
 
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
-msgstr ""
+msgstr "Visszatérítési napló"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1286,6 +1311,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új készpénz napló rögzítéshez.\n"
+"              </p><p>\n"
+"                A pénztár rögzítők lehetővé teszik a beérkezett készpénzek "
+"készpénz naplóban\n"
+"                való rögzítését.. Ez a tulajdonság elérhetővé teszi a "
+"készpénzek napi szintű\n"
+"                nyomon követését. Rögzítheti a kazettában lévő "
+"aprópénzeket,\n"
+"                és a kivét illetve betét után is feltöltheti a "
+"pénzmozgásokat.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1303,7 +1341,7 @@ msgstr "Időszak kezdete"
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr ""
+msgstr "Visszatérítés"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1313,7 +1351,7 @@ msgstr "Kivonat jóváhagyása"
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr "Adó"
+msgstr "Adó számla"
 
 #. module: account
 #: help:account.account,foreign_balance:0
@@ -1321,6 +1359,8 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Teljes összeg (a másodlagos pénznemben) erre a számlára a másodlagos "
+"pénznemben történt tranzakciókra."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1345,6 +1385,8 @@ msgid ""
 "The amount expressed in the secondary currency must be positif when journal "
 "item are debit and negatif when journal item are credit."
 msgstr ""
+"A másodlagos pénznemben kifejezett mennyiségnek pozitívnak kell lennie, ha a "
+"napló tétel tartozás és negatív, ha a napló tétel követelés."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1354,12 +1396,12 @@ msgstr "Számlák érvénytelenítése"
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "A kód meg lesz jelenítve a kimutatásokon."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "A beszerzéseknél felhasznált adók"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1373,7 +1415,7 @@ msgstr "Adókód"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr "Csökkenéseknél használt árfolyam"
+msgstr "Kimenő csökkenéseknél használt árfolyam"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1394,7 +1436,7 @@ msgstr "A tételsor bizonylatszáma."
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr "Tranzakció száma"
+msgstr "# Tranzakció száma"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1402,7 +1444,7 @@ msgstr "Tranzakció száma"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Megjegyzés"
+msgstr "Belépési megnevezés"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1414,12 +1456,12 @@ msgstr "Bizonylat, amely előállította ezt a számlát."
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
-msgstr "Egyéb"
+msgstr "Egyebek"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Feliratkozási tervezet"
 
 #. module: account
 #: view:account.account:0
@@ -1471,7 +1513,7 @@ msgstr "Szint"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Csak a tervezet számlának tudja megváltoztatni a pénznemét."
 
 #. module: account
 #: report:account.invoice:0
@@ -1497,7 +1539,7 @@ msgstr "Válassza ki a kezdő és a záró időszakot"
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
-msgstr "Eredménykimutatás"
+msgstr "Eredménykimutatás (Nyereség/Veszteség)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1566,6 +1608,9 @@ msgid ""
 "And after getting confirmation from the bank it will be in 'Confirmed' "
 "status."
 msgstr ""
+"Ha új bizonylat lett létrehozva akkor annak állapota 'Tervezet' lesz.\n"
+"Miután a banktól megkaptuk a visszaigazolást, az állapot 'Visszaigazolt' "
+"lesz."
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -1579,12 +1624,12 @@ msgstr "Számla állapota"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Bankkivonat"
+msgstr "Bankszámlakivonat"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "Vevő számla"
+msgstr "Vevői,  követelés számla"
 
 #. module: account
 #: code:addons/account/account.py:612
@@ -1611,6 +1656,8 @@ msgid ""
 "There is no default debit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Nincs alapértelmezett tartozás számla meghatározva \n"
+"a könyvelési naplón \"%s\"."
 
 #. module: account
 #: view:account.tax:0
@@ -1620,7 +1667,7 @@ msgstr "Adók keresése"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr "Főkönyvi költség gyűjtőkód karton számla"
+msgstr "Analitikus költség könyvitel számla"
 
 #. module: account
 #: view:account.model:0
@@ -1630,7 +1677,7 @@ msgstr "Tételek létrehozása"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "Tételek száma"
+msgstr "# tételekből"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1645,35 +1692,37 @@ msgid ""
 "There is nothing to reconcile. All invoices and payments\n"
 "                    have been reconciled, your partner balance is clean."
 msgstr ""
+"Nincs mit párosítani. Minden számla és fizetés\n"
+"                    párosítva lett, az üzleti partner egyenlege tiszta."
 
 #. module: account
 #: field:account.chart.template,code_digits:0
 #: field:account.config.settings,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "Számjegyek száma"
+msgstr "# számlyegyek száma"
 
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Azonnali könyvelés"
+msgstr "'Tervezet' átugrása azonnali könyveléshez"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
-msgstr ""
+msgstr "Nincs végrehajtva."
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Credit Note"
-msgstr "Jóváírás"
+msgstr "Jóváírás, visszatérítés jegyzék"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr "Számlázás & Kifizetések"
+msgstr "eSzámlázás & Kifizetések"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1683,7 +1732,7 @@ msgstr "Gyűjtőkód karton az alábbi időszakra"
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr "Tételek száma "
+msgstr "# Tételek számából "
 
 #. module: account
 #: help:account.fiscal.position,active:0
@@ -1703,7 +1752,7 @@ msgstr "Vezérlőpult nézet ideiglenes táblázata"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Bejövő jóváíró számlák"
+msgstr "Beszállítói, bejövő jóváíró számlák"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -1714,7 +1763,7 @@ msgstr "Adógyűjtő kód"
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
-msgstr ""
+msgstr "Bankszámlaszámok a lápjegyzet előnézethez"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1750,7 +1799,7 @@ msgstr "Csoportok"
 #. module: account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Nettó érték"
+msgstr "Nem adózott, nettó érték"
 
 #. module: account
 #: view:account.journal:0
@@ -1765,19 +1814,19 @@ msgstr "Bankkivonatok keresése"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Feladatlan napló tételek"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "Szállító főkönyvi számla"
+msgstr "Fizethető számla"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Adó főkönyvi számla (jóváíró szlák)"
+msgstr "Adó főkönyvi számla (jóváíró visszetérítések szlák)"
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -1788,12 +1837,12 @@ msgstr "ir.sequence"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Kivonatsorok"
+msgstr "Kivonat sorok"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr "Dátum/Kód"
+msgstr "Dátum/kód"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1824,6 +1873,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új számla típus létrehozásához.\n"
+"              </p><p>\n"
+"                Egy számla típus azt határozza meg, hogy azt hogyan "
+"használják\n"
+"                a naplókban. A számla típus alkalmazás módszer határozza meg "
+"az\n"
+"                éves elszámolás számítási módszerét. Az egyenleg kimutatások "
+"\n"
+"                és a nyereség és veszteség kimutatás használja a "
+"kategóriákat\n"
+"                (nyereség/veszteség vagy egyenleg kimuttás).\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: report:account.invoice:0
@@ -1846,7 +1909,7 @@ msgstr "egyenleg"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr "Kiszámlázandó költségek"
+msgstr "Kiszámlázandó analitikus költségek"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1856,7 +1919,7 @@ msgstr "Üzleti év sorszám"
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Analitikus számla"
 
 #. module: account
 #: report:account.overdue:0
@@ -1875,6 +1938,16 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Ha kiválasztotta a 'Tétel soronkénti kerekítést' : mindegyik adóra, először "
+"számítást és kerekítést végez minden egyes Beszerzési megrendelés "
+"BM/Vásárlói megrendelés VM/számla tétel sorra és ezek a kerekített tételek "
+"lesznek összegezve, így kialakítva a teljes adó értéket. Ha kiválasztotta a "
+"'Teljes körű kerekítést': mindegyik adóra, először adó számítást végez "
+"minden egyes Beszerzési megrendelés BM/Vásárlói megrendelés VM/számla tétel "
+"sorra, melyek összegzésre kerülnek  és végül ez a teljes adó összege lesz "
+"kerekítve. Ha adóval együtt történik az eladás, akkor a 'Tétel soronkénti "
+"kerekítést' válassza, mivel bizonyára azt szeretné, hogy az adóval növelt "
+"tételsor összegei egyezzenek a teljes összeg adóval növel értékével."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1906,12 +1979,14 @@ msgid ""
 "The journal must have centralized counterpart without the Skipping draft "
 "state option checked."
 msgstr ""
+"A naplónak, a vázlat állapot átugrás lehetőség beállítása nélküli, központi "
+"ellenszámlával kell rendelkeznie."
 
 #. module: account
 #: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Some entries are already reconciled."
-msgstr ""
+msgstr "Egyes tételek már párosítva lettek."
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1929,16 +2004,18 @@ msgid ""
 "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
 msgstr ""
+"Beállítási csomagot válasszon az automatikus adó és számlatükör\n"
+"                        beállításokhoz."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Függőben lévő számlák"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Cancel Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Üzleti év nyitó tételeinek eldobása"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -1952,7 +2029,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
-"Ha az aktív mező nincs bejelölve, nem használható a könyvelési időszak."
+"Ha az aktív mező hamisra van állítva, lehetősége van a napló időszak "
+"eltüntetésére annak törlése nélkül."
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -1962,12 +2040,12 @@ msgstr "Rendezés"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr "Vevőkövetelések és szállítói tartozások"
+msgstr "Vevőkövetelések (Bevételek) és szállítói tartozások (kiadások)"
 
 #. module: account
 #: field:account.config.settings,module_account_payment:0
 msgid "Manage payment orders"
-msgstr ""
+msgstr "Átutalási megbízások kezelése"
 
 #. module: account
 #: view:account.period:0
@@ -1988,12 +2066,12 @@ msgstr "Általános naplókimutatás"
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "Minden partner"
+msgstr "Összes partner"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "Gyűjtőkód lista"
+msgstr "Analitikus számla gyűjtőkód lista"
 
 #. module: account
 #: report:account.overdue:0
@@ -2010,7 +2088,7 @@ msgstr "Vevő hiv.:"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Adóbevallásnál használja ezt a kódot."
 
 #. module: account
 #: help:account.period,special:0
@@ -2025,12 +2103,12 @@ msgstr "Tervezet állapotú kivonat"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Számla  jóváhagyva"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Fizesse a beszállítóit csekkel"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -2053,6 +2131,12 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Ez a menü az adó bevallást nyomtatja a számlák és kifizetések alapján. Egy "
+"vagy több időintervallumot válasszon egy üzleti évből. Az adó bevalláshoz az "
+"információkat az OpenERP automatikusan létrehozza a számlákból (vagy "
+"kifizetésekből, egyes országokban). Ezek az adatok valós időben frissülnek. "
+"Ez nagyon hasznos, mivel lehetővé teszi az adók lekérdezését egy havi vagy "
+"negyedéves időszak elejénél és végénél."
 
 #. module: account
 #: code:addons/account/account.py:409
@@ -2108,7 +2192,7 @@ msgstr ""
 #: code:addons/account/wizard/pos_box.py:35
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hiba!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -2123,6 +2207,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy új beszállítói számla felviteléhez.\n"
+"              </p><p>\n"
+"                Figyelemmel kísérheti a beszállítótól érkezett számlákat\n"
+"               attól függően, hogy mit vásárolt vagy mi érkezett be. \n"
+"               A rendszer létre tud hozni számla tervezetet automatikusan\n"
+"                a beszerzési megrendelésből vagy vásárlási nyugtákból.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -2139,7 +2232,7 @@ msgstr "Számlák elemzése"
 #. module: account
 #: model:ir.model,name:account.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email összeállító varázsló"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -2153,6 +2246,8 @@ msgid ""
 "This journal already contains items for this period, therefore you cannot "
 "modify its company field."
 msgstr ""
+"Ez a napló már tartalmaz tételt erre a időszakaszra, ezért nem tudja "
+"módosítani a vállalat mezőt."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
@@ -2162,7 +2257,7 @@ msgstr "Soronkénti tételek"
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Alapján"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -2181,11 +2276,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy banki kivonat iktatásához.\n"
+"              </p><p>\n"
+"                Egy banki kivonat a pénzügyi tranzakciók összegzése\n"
+"                egy a banki számlán megadott időintervallumra. Ezt\n"
+"                időszakosan küldi a bank.\n"
+"              </p><p>\n"
+"                OpenERP allows you to reconcile a statement line directly "
+"with\n"
+"                the related sale or puchase invoices.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "A Vállalkozás alapértelmezett pénzneme"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2210,13 +2317,13 @@ msgstr "Pénzeszközök elemzése"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Értékesítés/Beszerzés napló"
 
 #. module: account
 #: view:account.analytic.account:0
 #: field:account.invoice.tax,account_analytic_id:0
 msgid "Analytic account"
-msgstr "Gyűjtőkód"
+msgstr "Analitikus könyvelési számla"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:406
@@ -2234,18 +2341,18 @@ msgstr "Érvényes"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Követők"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr "Naplók nyomtatása"
+msgstr "Főkönyvi naplók nyomtatása"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Termék kategória"
+msgstr "Termékkategória"
 
 #. module: account
 #: code:addons/account/account.py:656
@@ -2254,6 +2361,8 @@ msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
 msgstr ""
+"Nem változtathatja meg a főkönyvi számla típusát erre '%s' típusra, mivel "
+"napló tételeket tartalmaz!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2270,7 +2379,7 @@ msgstr "Üzleti év lezárása"
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Napló :"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2288,12 +2397,12 @@ msgstr "Adó meghatározása"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "Könyvelés kialakítása"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Referencia mértékegység"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2309,12 +2418,12 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Szép munka!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Eszközök adatkezelése"
 
 #. module: account
 #: view:account.account:0
@@ -2328,7 +2437,7 @@ msgstr ""
 #: code:addons/account/report/account_partner_ledger.py:274
 #, python-format
 msgid "Payable Accounts"
-msgstr "Szállító számlák"
+msgstr "Kötelezettség számlák"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -2337,6 +2446,9 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"A napló tétel kiválasztott könyvelési tételei másik pénznem használatát "
+"kényszerítik. El kell távolítania a másodlagos pénznemet a tétel számláról "
+"vagy válasszon több-pénznemes nézetet a naplón."
 
 #. module: account
 #: view:account.invoice:0
@@ -2349,17 +2461,19 @@ msgstr "Nettó érték"
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható az adó."
+msgstr ""
+"Ha az aktív mező nincs bejelölve, eltüntetheti az adó értéket annak törlése "
+"nélkül."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Értékesítési naplóval kapcsolatban álló analitikai napló tételek."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Italic szövegméret (kisebb)"
 
 #. module: account
 #: help:account.journal,cash_control:0
@@ -2367,6 +2481,7 @@ msgid ""
 "If you want the journal should be control at opening/closing, check this "
 "option"
 msgstr ""
+"Ha a napló vezérlést a nyitásnál/zárásnál szeretné, jelölje ezt a lehetőséget"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2390,7 +2505,7 @@ msgstr "Részleges tételsorok"
 #: view:account.fiscalyear:0
 #: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr "Üzletiév"
+msgstr "Üzleti év"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -2417,7 +2532,7 @@ msgstr "Párosítandó számlák"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr "File-ból kivonat importálása a rendszerbe"
+msgstr "Fájlból banki kivonat importálása a rendszerbe"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -2436,7 +2551,7 @@ msgstr "Január"
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr "Tárgyév"
+msgstr "Ez az Üzleti év"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -2447,18 +2562,18 @@ msgstr "Adókivonatok"
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr "30 nap"
+msgstr "30 nap nettó"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Nincs hozááférési joge ehez a %s naplóhoz !"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
 msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Ellenőrizze a végösszeget ezeken a beszállítói számlákon"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2466,7 +2581,7 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr "Pro forma"
+msgstr "Pro-forma"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2492,7 +2607,7 @@ msgstr "Számlatükör sablon keresése"
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Vevő kód"
 
 #. module: account
 #: view:account.account.type:0
@@ -2521,7 +2636,7 @@ msgstr "Ár tartalmazza az adót"
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr "Futó"
+msgstr "Folyamatban lévő"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2534,6 +2649,8 @@ msgstr "Árbevétel főkönyvi számla"
 #: help:account.config.settings,default_sale_tax:0
 msgid "This sale tax will be assigned by default on new products."
 msgstr ""
+"Ez az értékesítési adó lesz alapértelmezetten hozzárendelve az új "
+"termékekhez."
 
 #. module: account
 #: report:account.general.ledger_landscape:0
@@ -2545,12 +2662,12 @@ msgstr "Tételek sorbarendezésének alapja"
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr "Új pénznem"
+msgstr "Változtatás erre"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr "Termékmennyiség "
+msgstr "# Termékmennyiség "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
@@ -2614,7 +2731,7 @@ msgstr "Üzleti év"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Hagyja üresen, ha minden nyitott évre akarja listázni"
+msgstr "Hagyja üresen, ha minden nyitott üzleti évre akarja listázni"
 
 #. module: account
 #: code:addons/account/account.py:653
@@ -2623,11 +2740,13 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
 "contains journal items!"
 msgstr ""
+"Nem változtathatja meg a 'Lezárt' állapotú főkönyvi számlát más típusra, "
+"mivel napló tételeket tartalmaz!"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Főkönyvi számla tétel"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -2643,6 +2762,11 @@ msgid ""
 "amount greater than the total invoiced amount. In order to avoid rounding "
 "issues, the latest line of your payment term must be of type 'balance'."
 msgstr ""
+"Nem hozható létre számla.\n"
+"Az ide vonatkozó fizetési feltétel lehetséges hogy félrekonfigurált, mivel a "
+"számított mennyiség nagyobb mint a számlázott végösszeg. Kerekítésből "
+"származó hibák elkerülésére, a fizetési feltétel utolsó tételének 'egyenleg' "
+"típusnak kell lennie."
 
 #. module: account
 #: view:account.move:0
@@ -2662,6 +2786,8 @@ msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"Banki kivonat törléséhez, először vonja vissza, hogy törölni tudja az ide "
+"vonatkozó napló tételeket."
 
 #. module: account
 #: field:account.invoice.report,payment_term:0
@@ -2684,6 +2810,7 @@ msgstr "ÁFA pozíciók"
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
 msgstr ""
+"Nem tud napló tételeket létrehozni egy lezárt könyvelési számlán %s %s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2699,17 +2826,17 @@ msgstr "Szűrők"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "A számla tervezet állapota"
+msgstr "Egy számla tervezet állapota"
 
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Főkönyvi számla tulajdonságai"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Visszatérítés tervezet számla készítése"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2719,7 +2846,7 @@ msgstr "Partner párosítás"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Pénzügyi számla"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2731,7 +2858,7 @@ msgstr "Adógyűjtő kód"
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% előrefizetés 30 napon belül"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2785,7 +2912,7 @@ msgstr "Megújítandó számlák"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Modelltételek"
+msgstr "Főkönyvi számla modelltételek"
 
 #. module: account
 #: code:addons/account/account.py:3202
@@ -2796,12 +2923,12 @@ msgstr "EXJ"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "Beszerzési adók"
+msgstr "Beszerzések adói"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr "Bankadatok"
+msgstr "Bank adatok"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2822,6 +2949,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson napló bejegyzés készítéséhez.\n"
+"              </p><p>\n"
+"                Egy napló bejegyzés több napló tételt tartalmazhat, melyek "
+"lehetnek\n"
+"                tartozás vagy követelés ügylet.\n"
+"              </p><p>\n"
+"                Automatikusan létrehoz napló tételeket minden \n"
+"                könyvelési dokumentumhoz: számla, visszatérítés, beszállítók "
+"kifizetése, banki kivonatok,\n"
+"                stb. így, napló tételeket kézzel általában/csak egyéb "
+"művelet esetén\n"
+"                képezzen.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice,payment_term:0
@@ -2855,12 +2997,12 @@ msgstr "Kivonatok"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Megnevezés"
+msgstr "Bizonylat megnevezése"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Főkönyvi számla bizonylet tételsor párosítása (leírás)"
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_tax
@@ -2871,7 +3013,7 @@ msgstr ""
 #: view:account.tax:0
 #: model:ir.model,name:account.model_account_tax
 msgid "Tax"
-msgstr "ÁFA"
+msgstr "Adó"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2883,13 +3025,13 @@ msgstr "ÁFA"
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr "Gyűjtőkód"
+msgstr "Analitikus könyvelés"
 
 #. module: account
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Alapértelmezett adó beszerzésekhez"
 
 #. module: account
 #: view:account.account:0
@@ -2921,13 +3063,13 @@ msgstr "Beállítási hiba!"
 #: code:addons/account/account_bank_statement.py:434
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "%s kivonat rögzítve, napló tétel létrehozva."
 
 #. module: account
 #: field:account.invoice.report,price_average:0
 #: field:account.invoice.report,user_currency_price_average:0
 msgid "Average Price"
-msgstr "Átlagár"
+msgstr "Mérlegelt átlagár"
 
 #. module: account
 #: report:account.overdue:0
@@ -2938,7 +3080,7 @@ msgstr "Dátum:"
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr "Megjegyzés"
+msgstr "Címke"
 
 #. module: account
 #: view:res.partner.bank:0
@@ -2955,12 +3097,12 @@ msgstr "Különleges számítás"
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "Bank egyeztetés"
+msgstr "Bank párosítás"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr "Eng. (%)"
+msgstr "Áreng. (%)"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -2969,22 +3111,24 @@ msgstr "Eng. (%)"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr "Hiv"
+msgstr "Hiv."
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Purchase Tax"
-msgstr ""
+msgstr "Beszerzési adó"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr "Adóalapgyűjtő vagy adógyűjtő lehet."
+msgstr "Ez a főkönyvi számla adóalapgyűjtő vagy adógyűjtő számla lehet."
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+"Nem megfelelő követelés vagy tartozás érték a modellben, pozitívnak kell "
+"lennie!"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -3061,7 +3205,7 @@ msgstr "Dátumok"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Fölérendelt számlatükör sablon"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3074,7 +3218,7 @@ msgstr "Fölérendelt adószámla"
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "Korosított folyószámla kivonat"
+msgstr "Korosított partner folyószámla számlaegyenleg"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -3085,12 +3229,12 @@ msgstr "Könyvelési tételek"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Főkönyvi számla és időszak ugyanahhoz a vállalathoz tartozzon."
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr "Engedmény (%)"
+msgstr "Árengedmény (%)"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -3116,7 +3260,7 @@ msgstr "Leírandó összeg"
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3125,12 +3269,15 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"A kiválasztott számla(k) nem erősíthetők meg mivel nem 'Tervezet' vagy 'Pro-"
+"Forma' állapotúak."
 
 #. module: account
 #: code:addons/account/account.py:1071
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
+"Olyan időszakot kell választania ami ugyanahhoz a vállalathoz tartozik."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3143,7 +3290,7 @@ msgstr "Főkönyvi számlánkénti értékesítés"
 #: code:addons/account/account.py:1449
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Nem törölhet egy feladott napló bejegyzést \"%s\"."
 
 #. module: account
 #: view:account.invoice:0
@@ -3153,7 +3300,7 @@ msgstr "Könyvelési időszak"
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Értékesítési napló"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -3161,7 +3308,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "A(z) '%s' naplóhoz meg kell határoznia egy gyűjtőnaplót!"
+msgstr "A(z) '%s' naplóhoz meg kell határoznia egy analitikai gyűjtő naplót!"
 
 #. module: account
 #: code:addons/account/account.py:781
@@ -3170,6 +3317,8 @@ msgid ""
 "This journal already contains items, therefore you cannot modify its company "
 "field."
 msgstr ""
+"Ez a napló már tartalmaz tételeket, ezért nem változtathatja meg a vállalati "
+"mezőt."
 
 #. module: account
 #: code:addons/account/account.py:409
@@ -3178,6 +3327,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance."
 msgstr ""
+"Egy központosítással leellenőrzött nyitó napló szükséges a kezdő egyenleg "
+"beállításához."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3188,13 +3339,13 @@ msgstr "Adógyűjtők"
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Nem megvalósított nyereségek és veszteségek"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr "Vevők"
+msgstr "Vásárlók"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -3215,7 +3366,7 @@ msgstr "Augusztus"
 #. module: account
 #: field:accounting.report,debit_credit:0
 msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Tartozás/követelés oszlop kijelzése"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -3240,12 +3391,12 @@ msgstr ""
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Nem párosított tranzakciók"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Csak egy sablon lista elérhető"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3258,7 +3409,7 @@ msgstr "Beszerzés főkönyvi számla"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Összegzés"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3274,7 +3425,7 @@ msgstr "A kivonat egyeztetésnél használja a rendszer, máshol ne alkalmazza."
 #. module: account
 #: field:account.config.settings,date_stop:0
 msgid "End date"
-msgstr ""
+msgstr "Befejezés dátuma"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -3305,7 +3456,7 @@ msgstr "Pénzügyi számvitel"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr "Eredménykimutatás"
+msgstr "Eredménykimutatás (Nyereség és Veszteség)"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3319,7 +3470,7 @@ msgstr "Eredménykimutatás"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "ÁFA pozíció"
+msgstr "Költségvetési pozíció"
 
 #. module: account
 #: code:addons/account/account_invoice.py:823
@@ -3348,13 +3499,13 @@ msgstr "Alárendelt számlák"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr "Főkönyvi kivonat"
+msgstr "Próbamérleg"
 
 #. module: account
 #: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
-msgstr ""
+msgstr "Nem tudja a kezdő egyenleget alkalmazni (negatív érték)."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -3362,7 +3513,7 @@ msgstr ""
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr "Kimenő számla"
+msgstr "Kimenő, vevői számla"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -3373,7 +3524,7 @@ msgstr "Üzleti év kiválasztása"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Dátum tartomány"
 
 #. module: account
 #: view:account.period:0
@@ -3389,7 +3540,7 @@ msgstr "Számla pénzneme"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Főkönyvi számlák kimutatásai"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3404,7 +3555,7 @@ msgstr "Adósablon lista"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Értékesítési/Beszerzési naplók"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3415,14 +3566,18 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"Kiválasztja, hogy a rendszer milyen árfolyamon számolja a devizás tételek "
-"csökkenéseit. A növekedéseknél mindig a napi árfolyamot használja a rendszer."
+"Kiválasztja, hogy a kimenő tranzakciókhoz milyen árfolyamon számolja a "
+"devizás tételek csökkenéseit. A legtöbb országban a törvényes mód az "
+"'Átlagolás', de ezt nagyon kevés program rendszer tudja kezelni. Ha másik "
+"program rendszerből importálja akkor inkább a dátummal megadott árfolyamot "
+"használja. A bejövő tranzakcióknál, növekedéseknél mindig a napi árfolyamot "
+"használja a rendszer."
 
 #. module: account
 #: code:addons/account/account.py:2678
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Nincs fölérendelt kódja a főkönyvi számla sablonhoz."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3433,7 +3588,7 @@ msgstr "Számjegyek száma a főkönyvi számla számában"
 #. module: account
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
-msgstr "Szállítói fizetási feltétel"
+msgstr "Beszállítói fizetési feltétel"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3450,6 +3605,8 @@ msgstr "Mindig"
 msgid ""
 "Full accounting features: journals, legal statements, chart of accounts, etc."
 msgstr ""
+"Összes könyvelési tulajdonság: naplók, törvényes kivonatok, számlatükrök, "
+"stb."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3466,7 +3623,7 @@ msgstr "Leírás főkönyvi számlája"
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr "Modell"
+msgstr "Model, minta"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
@@ -3479,7 +3636,7 @@ msgstr "Az adóbevallásban szereplő adóalap."
 #: selection:account.entries.report,type:0
 #: selection:account.financial.report,type:0
 msgid "View"
-msgstr "Gyűjtő"
+msgstr "Nézet"
 
 #. module: account
 #: code:addons/account/account.py:3460
@@ -3491,37 +3648,37 @@ msgstr "BNK"
 #. module: account
 #: field:account.move.line,analytic_lines:0
 msgid "Analytic lines"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikai gyűjtőkód tételek"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proforma számlák"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr "Elektronikus file"
+msgstr "Elektronikus fájl"
 
 #. module: account
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
-msgstr ""
+msgstr "Párosítás hivatkozása"
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "A vállalkozásnak van egy számlatükre"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "Adógyűjtő sablon"
+msgstr "Adó kód sablon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr "Folyószámla karton"
+msgstr "Partner folyószámla karton"
 
 #. module: account
 #: model:email.template,body_html:account.email_template_edi_invoice
@@ -3607,11 +3764,93 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>Egy új számlája van: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Fizethet közvetlenül Paypal rendszern:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>További felmerülő kérdésekkel kapcsolatban keressen meg "
+"bennünket.</p>\n"
+"    <p>Köszönjük, hogy a ${object.company_id.name or 'bennünke'}-t "
+"választotta!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Főkönyvi számla időszak"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3619,7 +3858,7 @@ msgstr ""
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
-"A számla minden mozgásának ebben a másodlagos pénznemben kell végbemennie."
+"A számla minden bizonylatának ebben a másodlagos pénznemben kell végbemennie."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3639,12 +3878,12 @@ msgstr "Számlatükör sablonok"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Tranzakciók"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "Párosítás visszavonása"
+msgstr "Visszavont párosítású számlák Párosítása"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3659,18 +3898,20 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
-"Állítsa be a módszert, amellyel az ezen típusú főkönyvi számlák nyitó "
-"tételei létrehozásra kerülnek.\n"
+"Állítsa be a módszert, amellyel az ezen típusú főkönyvi számlák év végi "
+"napló tételei létrehozásra kerülnek.\n"
 "\n"
-" Semmi esetében nem lesznek nyitó tételek.\n"
-" Egyenlegnél az előző évi záró egyenleg lesz a nyitó tétel.\n"
-" Tételes esetében az előző év minden tétele átkerül tárgyévre.\n"
-" Rendezetlennél csak a párosítatlan tételek kerülnek át."
+" 'Semmi' esetében nem lesznek nyitó tételek.\n"
+" 'Egyenleg'-nél az előző évi záró egyenleg lesz a nyitó tétel általában a "
+"készpénznél, házipénztárnál.\n"
+" 'Tételes' esetében az előző év minden tétele átkerül tárgyévre, még a "
+"rendezettek is.\n"
+" 'Rendezetlen' csak a párosítatlan tételek kerülnek át."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "-"
+msgstr "Hadja üressen a költség számla használatához"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -3738,7 +3979,7 @@ msgstr "Pénzügy-Számvitel modul beállítása"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 msgid "Account Tax Declaration"
-msgstr ""
+msgstr "Adó bevalási főkönyvi számla"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -3758,6 +3999,8 @@ msgid ""
 "centralized counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Központosított naplón nem tud számlát létrehozni. Hagyja üresen a beállítás "
+"menüben az ide vonatkozó naplóhoz tartozó központi ellenszámla négyzetet."
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3776,7 +4019,7 @@ msgstr "Nem adott meg partnert!"
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr "Időszak zárása"
+msgstr "Egy időszak lezárása"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3790,11 +4033,13 @@ msgid ""
 "You cannot create journal items with a secondary currency without recording "
 "both 'currency' and 'amount currency' field."
 msgstr ""
+"Nem tud másodlagos pénznemmel ellátott napló tételt létrehozni a 'pénznem' "
+"és 'pénznem mennyiség' mező bevitele nélkül."
 
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Részletek kijelzése"
 
 #. module: account
 #: report:account.overdue:0
@@ -3806,7 +4051,8 @@ msgstr "ÁFA:"
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr "Másodlagos pénznemben kifejezett összeg."
+msgstr ""
+"A vállalat pénznemétől eltérő másodlagos pénznemben kifejezett összeg."
 
 #. module: account
 #: help:account.config.settings,paypal_account:0
@@ -3816,6 +4062,11 @@ msgid ""
 "quotations with a button \"Pay with  Paypal\" in automated emails or through "
 "the OpenERP portal."
 msgstr ""
+"Paypal számla (email) online fizetések befogadásához (hitel kártya, stb.) Ha "
+"beállított egy paypal számlát, akkor az ügyfélnek lehetősége lesz "
+"kiegyenlítenie a számlákat vagy árajánlatban szerepló tételeket  az e-"
+"maileken lévő  \"Paypal-al történő fizetés\" gombbal vagy a portálon "
+"keresztül."
 
 #. module: account
 #: code:addons/account/account_move_line.py:536
@@ -3826,6 +4077,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Journals/Journals."
 msgstr ""
+"Nem található egyetlen %s típusú könyvelési napló ehhez a vállalathoz.\n"
+"\n"
+"Létrehozhat egyet a menüből: \n"
+"Beállítások/Naplók/Naplók."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3849,7 +4104,7 @@ msgstr "Adókivonat"
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Napló keresése"
+msgstr "Főkönyvi napló keresése"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3860,7 +4115,7 @@ msgstr "Függő számlák"
 #: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr "Év"
+msgstr "év"
 
 #. module: account
 #: field:account.config.settings,date_start:0
@@ -3876,6 +4131,12 @@ msgid ""
 "by\n"
 "                                    your supplier/customer."
 msgstr ""
+"Lehetősége lesz szerkeszteni és érvényesíteni ezt a\n"
+"                                    jóváírási értesítést közvetlenül vagy "
+"hagyja tervezetként,\n"
+"                                    amíg a dokumentumot a "
+"vásárlónak/beszállítótól\n"
+"                                    nem bocsájtja ki."
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3883,8 +4144,8 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
-"Minden kiválasztott könyvelési tétel jóváhagyásra és könyvelésre kerül. "
-"Ezután nem lesz módosítható a kontírozásuk."
+"Minden kiválasztott könyvelési tétel jóváhagyásra és könyvelési feladásra "
+"kerül. Ezután nem lesz módosítható a kontírozásuk."
 
 #. module: account
 #: code:addons/account/account_move_line.py:98
@@ -3893,6 +4154,8 @@ msgid ""
 "You have not supplied enough arguments to compute the initial balance, "
 "please select a period and a journal in the context."
 msgstr ""
+"Nem adott meg elég bizonyítékot a kezdő egyenleg kiszámításához, kérem "
+"válasszon időszakot és egy naplót a környezetből."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3902,7 +4165,7 @@ msgstr "Átutalások"
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Ennek a vállalkozásnak saját számlatükre van."
 
 #. module: account
 #: view:account.chart:0
@@ -3918,7 +4181,7 @@ msgstr "Készpénz kifizetése"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr "ÁFA összege"
+msgstr "Adó összege"
 
 #. module: account
 #: view:account.move:0
@@ -3943,6 +4206,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy vásárlói számla készítéséhez.\n"
+"              </p><p>\n"
+"                elektronikus számlázás lehetővé teszi a vásárlók "
+"fizetéseinek \n"
+"                gyors és könnyű beszedését. A vásárlói e-mailen kapják \n"
+"                számláikat, amiket online és/vagy a rendszerükbe importálva\n"
+"                egyenlíthetik ki.\n"
+"              </p><p>\n"
+"                A vásárlókkal folytatott kommunikáció automatikusan\n"
+"                láthatóvá válik a számla alján.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3965,7 +4241,7 @@ msgstr "Beállítások"
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Időszak hossz (napok)"
 
 #. module: account
 #: code:addons/account/account.py:1363
@@ -3974,22 +4250,24 @@ msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Nem módosíthatja ennek a naplónak a már könyvelésre feladott bejegyzését.\n"
+"Először be kell állítania a naplót bejegyzések visszavonására."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Értékesítés/Beszerzés napló nyomtatás"
 
 #. module: account
 #: view:account.installer:0
 msgid "Continue"
-msgstr ""
+msgstr "Folytatás"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr "Termék katerógia"
+msgstr "Termék katerógiája"
 
 #. module: account
 #: code:addons/account/account.py:930
@@ -4012,6 +4290,8 @@ msgstr "Főkönyvi számla létrehozása"
 #, python-format
 msgid "The entries to reconcile should belong to the same company."
 msgstr ""
+"A párosításhoz szóló tételek ugyanahhoz a vállalkozáshoz kell hogy "
+"tartozzanak."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -4021,7 +4301,7 @@ msgstr "Adógyűjtő összege"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Megszüntetett párosítású napló tételek"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -4032,6 +4312,7 @@ msgstr "Tételes"
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
 msgstr ""
+"Ez a beszerzési adó lesz alapértelmezetten hozzárendelve az új termékekhez."
 
 #. module: account
 #: report:account.invoice:0
@@ -4063,7 +4344,7 @@ msgstr "(Ha nem választ időszakot, minden nyitott időszakot figyelembe vesz)"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4121,7 +4402,7 @@ msgstr "Dátum"
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Könyvelésre küld"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -4160,7 +4441,7 @@ msgstr "Összes"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr "Üzleti tervek"
+msgstr "Költségvetési pénzügyi tervek"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -4179,13 +4460,13 @@ msgstr "Üzleti tervek"
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 msgid "No Filters"
-msgstr "Nincs szűrő"
+msgstr "Nincsenek szűrők"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:res.groups,name:account.group_proforma_invoices
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Pro-forma számlák"
 
 #. module: account
 #: view:res.partner:0
@@ -4205,7 +4486,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Az össes beszállítói számlák ellenőrzése"
 
 #. module: account
 #: view:account.tax:0
@@ -4219,6 +4500,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"Ha havi időszakok létrehozva. Az állapot 'Tervezet'. A hónap végi állapot "
+"'Elkészítve' lesz."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4240,18 +4523,18 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr "Gyűjtőkód tételek keresése"
+msgstr "Analitikai gyűjtőkód tételek keresése"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "Szállító számla"
+msgstr "Fizetendő, beszállító számla"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "A nyitó tételek létrehozásához tartozó időszakok nem találhatóak."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4262,7 +4545,9 @@ msgstr "Átutalási megbízás"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "Jelölje be, ha a számla tételei párosíthatóak."
+msgstr ""
+"Jelölje be, ha azt szeretné, hogy a felhasználó ennek a számlának a tételeit "
+"párosítsa."
 
 #. module: account
 #: report:account.invoice:0
@@ -4273,7 +4558,7 @@ msgstr "Egységár"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikai gyűjtőkód tételek"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
@@ -4293,7 +4578,7 @@ msgstr "Adógyűjtő szorzótényezője"
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Adók teljes csomagja"
 
 #. module: account
 #: field:account.account,name:0
@@ -4311,12 +4596,12 @@ msgstr "Megnevezés"
 #: code:addons/account/installer.py:115
 #, python-format
 msgid "No unconfigured company !"
-msgstr ""
+msgstr "Nincs kiépítetlen vállalkozás !"
 
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Várható számlatükör"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4328,28 +4613,30 @@ msgstr "Teljesítés kelte"
 #, python-format
 msgid "The journal must have default credit and debit account."
 msgstr ""
+"A naplónak rendelkeznie kell alapértelmezett követelés és tartozás "
+"számlákkal."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Állítsa be a banki számlaszámait"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Parner azonosító"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Üzenetek és kommunikáció történet"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr "Gyűjtőkód tételek naplója"
+msgstr "Analitikai gyűjtőkód tételek naplója"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -4379,13 +4666,15 @@ msgid ""
 "Check this box if you don't want any tax related to this tax Code to appear "
 "on invoices."
 msgstr ""
+"Jelölje be ezt a négyzetet, ha nem akarja ehhez az adógyűjtőkódhoz tartozó  "
+"bármely adó megjelenítését."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1058
 #: code:addons/account/account_move_line.py:1143
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Nem használhat egyetlan inaktív számlát sem."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4404,19 +4693,19 @@ msgstr "Könyvelés"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "A jelenlegi évre vonatkozó időszakok napló bejegyzései"
 
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "Konszolidált számlák"
+msgstr "Konszolidált alszámlák"
 
 #. module: account
 #: code:addons/account/account_invoice.py:573
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Nincs elegendő adat!"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4424,6 +4713,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"A veszteség vagy nyereség értékének változása az árfolyam változás miatt, ha "
+"több pénznemben történik a tranzakció."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4461,7 +4752,7 @@ msgstr "Ismétlődő tételek"
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr "Megjelenítendő partnerek"
+msgstr "Parnerek megjelenítése"
 
 #. module: account
 #: view:account.invoice:0
@@ -4476,7 +4767,7 @@ msgstr "Eszközök"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Könyvelés és pénzügy"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4493,7 +4784,7 @@ msgstr "Átlagárfolyam"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Főkönyvi számlák kijelzése"
 
 #. module: account
 #: view:account.state.open:0
@@ -4504,7 +4795,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Számla adó tartalmának analitikus könyvelése"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4534,7 +4825,7 @@ msgstr "30 nap, hó vége"
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr "Gyűjtőkód kivonat"
+msgstr "Analitikus gyűjtőkód számlaegyenleg"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -4542,6 +4833,8 @@ msgid ""
 "This payment term will be used instead of the default one for sale orders "
 "and customer invoices"
 msgstr ""
+"Ezt a fizetési feltételt használja az alapértelmezett helyett a vásárlói "
+"megrendeléseken és az értékesítési számlákon."
 
 #. module: account
 #: view:account.config.settings:0
@@ -4549,23 +4842,26 @@ msgid ""
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
 "year."
 msgstr ""
+"Ha \"%(év)ek\" használ előtagként, akkor azt kiváltja az aktuális év."
 
 #. module: account
 #: help:account.account,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható a főkönyvi számla."
+msgstr ""
+"Ha az aktív mező hamisra állított, akkor eltüntetheti a főkönyvi számlát "
+"annak törlése nélkül."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Könyvelésre feladott napló tételek"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
-msgstr ""
+msgstr "Nincs nyomon követés"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4575,7 +4871,7 @@ msgstr "Adósablonok keresése"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr "Könyveletlen tételek"
+msgstr "Könyveletlen (Tervezet) tételek"
 
 #. module: account
 #: help:account.config.settings,decimal_precision:0
@@ -4584,12 +4880,15 @@ msgid ""
 "9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
 "0.0231 EUR."
 msgstr ""
+"Példaként, a kétjegyű (2) decimális pontosság lehetővé teszi az ilyen napló "
+"tételeket: 9.99 EUR, ugyanakkor a négyjegyű (4) decimális pontosság lehetővé "
+"teszi az ilyen napló tételeket: 0.0231 EUR."
 
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr "Gyorsmenü"
+msgstr "Gyorsbillentyű parancs"
 
 #. module: account
 #: view:account.account:0
@@ -4622,6 +4921,7 @@ msgstr "A kiválasztott számlák érvénytelenítése"
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
 msgstr ""
+"Egy analitikai gyűjtőkód naplót kell hozzárendelni ezen a '%s' naplón!"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4629,8 +4929,9 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
-"A költségek a gyűjtőkódokból származnak. Ezek állítják elő a tervezet "
-"állapotú bejövő számlákat."
+"Analitikus költségek (időkimutatásokból, egyes beszerzett termékből, ..) "
+"származnak. Ezek állítják elő a tervezet állapotú bejövő beszállítói  "
+"számlákat."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_tree
@@ -4647,6 +4948,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Kattintson új bankszámlaszám beállításához. \n"
+"          </p><p>\n"
+"            Állítsa be a vállalkozása bank számláit és válassza ki azokat\n"
+"            melyeknek meg kell jelennie a lábjegyzetben.\n"
+"          </p><p>\n"
+"            Ha használja a könyvelési modult részt, naplók és főkönyvi\n"
+"            számlák automatikusan lesznek létrehozva az itt megadott \n"
+"            adatok alapján.\n"
+"          </p>\n"
+"        "
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4654,6 +4966,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Hiba!\n"
+"Nem hozhat létre visszatérő adógyűjtőkódokat."
 
 #. module: account
 #: constraint:account.period:0
@@ -4661,6 +4975,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Hiba!\n"
+"Az időszak(ok) időtartama nem értelmezhető."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4678,11 +4994,12 @@ msgstr "Hónap"
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
+"Napló tételt tartalmazó főkönyvi számla kódját nem tudja megváltoztatni."
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Beszállítói számlák sorrendje"
 
 #. module: account
 #: code:addons/account/account_invoice.py:610
@@ -4692,18 +5009,20 @@ msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
 "Configuration\\Accounting menu."
 msgstr ""
+"Nem talál egy számlatükröt, létre kell hoznia egyet a Beállítások\\"
+"Beállítás\\Könyvelés menüből."
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Termék mértékegysége"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypal számla"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4713,7 +5032,7 @@ msgstr "Számlatípus"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
-msgstr ""
+msgstr "Bank és csekkek"
 
 #. module: account
 #: field:account.account.template,note:0
@@ -4723,14 +5042,14 @@ msgstr "Megjegyzés"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Elentétes oldalú számla egyenleg előjele"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Számlaegyenleg lap (Felelősség számla)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4753,12 +5072,13 @@ msgstr "Adóalapgyűjtő kód"
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
-msgstr ""
+msgstr "Meg kell határozni egy leírás/átváltási árfolyam különbség számlát."
 
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Paypal felhasználónév (általában email) az online összegek fogadásához."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4780,7 +5100,7 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "Minden könyvelt tétel"
+msgstr "Minden könyvelésre feladott tétel"
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4795,19 +5115,19 @@ msgstr "Jelölje be, ha a 0 egyenlegű számlákat is meg akarja jeleníteni!"
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Nyitó egyenlegek párosítása"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
 msgid "Last Reconciliation:"
-msgstr ""
+msgstr "Utolsó párosítás:"
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Számlaegyenlegesítve"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4821,11 +5141,13 @@ msgid ""
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
 msgstr ""
+"Nincs számlatükörrel nem rendelkező vállalat.. Ezért a varázsló nem fog "
+"elindulni."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Főkönyvi szála lehetőségeinek beállítása"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4840,7 +5162,7 @@ msgstr "Átutalási hivatkozás"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Fó cím 1 (kövér, aláhúzott)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4861,7 +5183,7 @@ msgstr "Számlastatisztika"
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Árfolyam"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4888,7 +5210,7 @@ msgstr "Záró egyenleg"
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Lehet látható?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -4904,27 +5226,27 @@ msgstr "Jóváíró számlák"
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Párosítani kívánt napló tételek"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr ""
+msgstr "Sablonok adókhoz"
 
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "Az időszakok neveinek vállalkozásonként egyéninek kell lenniük!"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Pénznem a vállalat országának megfelelően."
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Adó kiszámítás"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4939,6 +5261,9 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Állítsa az értékét hamisra, ha nem akarja a sablont aktívan a számlatükör "
+"varázsló sablonjai között használni, akkor hasznos, ha az al-sablonok "
+"betöltése után szeretne ebből a sablonból számlatükröt létrehozni."
 
 #. module: account
 #: view:account.use.model:0
@@ -4957,6 +5282,9 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Hiba!\n"
+"Nem hozhat létre más vállalkozásnál fölérendelt számlával rendelkező "
+"főkönyvi számlát."
 
 #. module: account
 #: code:addons/account/account_invoice.py:658
@@ -4967,6 +5295,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Journals\\Journals."
 msgstr ""
+"Nem talál ilyen %s típusú főkönyvi számlát ehhez a vállalkozáshoz.\n"
+"\n"
+"Létre tud hozni egyet a menüből: \n"
+"Beállítások\\Naplók\\Naplók."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4982,7 +5314,7 @@ msgstr "ECNJ"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Gyűjtőkód karton"
+msgstr "Gyűjtőszámla karton az analitikus költség naplóhoz"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4992,7 +5324,7 @@ msgstr "Ismétlődő modellek"
 #. module: account
 #: view:account.tax:0
 msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Alsóbbrendű/Alárendelt adók"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -5012,7 +5344,7 @@ msgstr "Követel összegek alapértelmezett főkönyvi számlája"
 #. module: account
 #: view:cash.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Írja le miért vesz ki pénzt a pénz rögzítőből:"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5024,12 +5356,12 @@ msgstr "Érvénytelenített"
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Lehetővé teszi a számlák pro-forma, díjbekérő állapotba tételét."
 
 #. module: account
 #: view:account.journal:0
 msgid "Unit Of Currency Definition"
-msgstr ""
+msgstr "A pénznem egységének meghatározása"
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -5038,12 +5370,14 @@ msgid ""
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Ez hozzáadja a pénznem oszlopot a beszámolóban, ha a vállalkozás pénznemétől "
+"eltérő a pénznem."
 
 #. module: account
 #: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Beszerzési adó %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -5077,7 +5411,7 @@ msgstr "Érvénytelenített számla"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Számláim"
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5087,7 +5421,7 @@ msgstr "Új"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Értékesítési adó"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5112,12 +5446,15 @@ msgid ""
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
+"Ha létre lett hozva a napló időtartam. Az állapota 'Tervezet' lesz. Ha a "
+"kimutatás ki lett nyomtatva akkor annak állapota 'Kinyomtatva' lesz. Ha "
+"minden tranzakció el lett végezve akkor 'Elkészített' állapotú lesz."
 
 #. module: account
 #: code:addons/account/account.py:3205
 #, python-format
 msgid "MISC"
-msgstr ""
+msgstr "Különb."
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -5140,7 +5477,7 @@ msgstr "Számlák"
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Jelölje be a négyzetet, ha a vállalat egy jogi személy."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5186,7 +5523,7 @@ msgstr "Csekk"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "vagy"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5196,7 +5533,7 @@ msgstr "Számlázott"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Könyvelésre feladott napló tételek"
 
 #. module: account
 #: view:account.use.model:0
@@ -5210,6 +5547,9 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Bank számla szám melyre a számla ki lesz egyenlítve. Kimenő vásárlói számla "
+"vagy beszerzési jóváírás esetén a vállalkozás bankszámlája, egyéb esetben az "
+"üzleti partner bank számla száma."
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -5236,12 +5576,12 @@ msgstr "Rendezett"
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr "ÁFA összesítő"
+msgstr "Adó összesítő"
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "A bank egyeztetéshez használt bankkivonat."
+msgstr "A bank egyeztetéshez használt bankkivonat"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -5254,22 +5594,24 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "invoices. Leave empty to use the expense account."
 msgstr ""
+"Főkönyvi számla beállítása a számlák adó tételeinek alapértelmezett "
+"használatához. Hagyja üresen a költség kiadási számla használatához."
 
 #. module: account
 #: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Nyitó időszak"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Fellülvizsgálandó napló tételek"
 
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Globális kerekítés"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5289,6 +5631,8 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The encoded total does not match the computed total."
 msgstr ""
+"Kérem a számlában lévő árak ellenőrzését !\n"
+"A beírt teljes összeg nem egyezik a kiszámított összeggel."
 
 #. module: account
 #: field:account.account,active:0
@@ -5318,12 +5662,12 @@ msgstr "Időszak vége"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr "Számlák átutalása"
+msgstr "Számlák kiegyenlítése"
 
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Egyéni számlaszámnak kell lennie mindegyik válallathoz!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -5334,12 +5678,12 @@ msgstr "Számlatípusonkénti egyenleg"
 #: code:addons/account/account_cash_statement.py:301
 #, python-format
 msgid "There is no %s Account on the journal %s."
-msgstr ""
+msgstr "Nincs %s főkönyvi számla ehhez a naplóhoz %s."
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Könyvelő"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -5347,16 +5691,19 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Erről a nézetről, van egy kimutatás a pénzeszközeire vonatkozólag. Ez "
+"összegzi időszakonként a likviditási számlán bejegyzett tételek  "
+"számlaegyenlegét."
 
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Pénzügyi irányító"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr "Számlasorok összevonása"
+msgstr "Számlatételek összevonása"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -5366,13 +5713,13 @@ msgstr "Zárás"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Tételek"
+msgstr "Bizonylatok"
 
 #. module: account
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Pénzkazetta tételek"
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
@@ -5385,6 +5732,8 @@ msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
 "but not accounting (Journal Items, Chart of  Accounts, ...)"
 msgstr ""
+"Ha nem jelöli be ezt a négyzetet, akkor lehetősége lesz számlázni & "
+"kifizetni, de nem tud könyvelni (Napló bejegyzéseket, számlatükröt, ...)"
 
 #. module: account
 #: view:account.period:0
@@ -5394,7 +5743,7 @@ msgstr "Lezárandó"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Az időszak kezdeti dátuma"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5404,7 +5753,7 @@ msgstr "Sablonok"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "Adótípus"
+msgstr "Adó leírása"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5417,12 +5766,13 @@ msgstr "Alárendelt adószámlák"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "Jelölje be, ha az ár tartalmazza az ÁFÁ-t."
+msgstr ""
+"Jelölje be, ha a termékeken és a számlákon az ár tartalmazza az adót."
 
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr "Gyűjtőkód kivonat -"
+msgstr "Analitikus gyűjtőkód számlaegyenleg -"
 
 #. module: account
 #: report:account.account.balance:0
@@ -5452,7 +5802,7 @@ msgstr "Gyűjtőkód kivonat -"
 #: field:account.vat.declaration,target_move:0
 #: field:accounting.report,target_move:0
 msgid "Target Moves"
-msgstr "Figyelembe vett tételek"
+msgstr "Figyelembe vett bizonylat tételek"
 
 #. module: account
 #: code:addons/account/account.py:1454
@@ -5460,12 +5810,14 @@ msgstr "Figyelembe vett tételek"
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
+"Ha a bizonylet van rendelve egy számlához, akkor az nem törölhető. (Számla: "
+"%s - Bizonylat azonosító ID:%s)"
 
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_opening:0
 msgid "Opening Unit Numbers"
-msgstr "Nyitó darabszám"
+msgstr "Nyitó egységnyi darabszám"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5504,13 +5856,17 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Ez a boolean művelet segítséget nyújt annak kiválasztásában, hogy javasol  "
+"az értékesítési és beszerzési értékek kódolásában vagy az adó listából "
+"válassza ki azokat. Ez utóbbit választása feltételezi, hogy a sablonban "
+"teljes körűen meghatározott az adó."
 
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Folyószámlajelentés"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -5528,7 +5884,7 @@ msgstr "Év"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Ez jelzi, hogy a számlát már elküldték."
 
 #. module: account
 #: field:account.tax.template,description:0
@@ -5543,16 +5899,19 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Nem hozható létre automatikus sorrend ehhez a darabhoz.\n"
+"Rakjon sorrendet a napló meghatározásánál az automatikus számozáshoz vagy "
+"hozzon létre kézi sorrendet ehhez a darabhoz."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Pro Forma számla "
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr "Hónap"
+msgstr "hónap"
 
 #. module: account
 #: view:account.move.line:0
@@ -5571,19 +5930,19 @@ msgstr "Adószámla"
 #: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr "Mérleg"
+msgstr "Egyenleg kimutatatás"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Nyereség & Veszteség (Jövedelem bevételi számla)"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Ellenőrizze a dátumot az időszakban"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5613,6 +5972,7 @@ msgstr "Számítási kód (ha a típus = Python kód)"
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
 msgstr ""
+"Nem található a vállalatra vonatkozó számlatükör, Létre kell hoznia egyet."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5654,7 +6014,7 @@ msgstr "Összeg"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "Záró/nyitó tétel"
+msgstr "Üzleti év záró tétel"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -5673,6 +6033,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"A chettelés összegzést megállítja (üzenetek száma,...). Ez az összegzés "
+"direkt HTML formátumú ahhoz hogy beilleszthető legyen a kanban nézetekbe."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5690,6 +6052,12 @@ msgid ""
 "entry was reconciled, either the user pressed the button \"Fully "
 "Reconciled\" in the manual reconciliation process"
 msgstr ""
+"A partner főkönyvi számla tételeinek legutóbbi összesítő párosításának "
+"dátuma. Ha eltér ennek a partnernek a legutóbbi párosítási dátumától, azzal "
+"itt leírjuk azt a tényt, hogy most nincs mit párosítani. Ez kétféleképpen "
+"teljesülhet: vagy az utolsó tartozás/követelés lett párosítva, vagy a "
+"felhasználó megnyomta a \"Összesítő párosítás\" gombot a kézi párosítás "
+"műveletek elindításához"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5704,14 +6072,14 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"\"A(z) '%s' modellsor által előállított tételsor esedékességének dátuma a "
+"A(z) '%s' modellsor által előállított tételsor esedékességének dátuma a "
 "partner fizetési feltételétől függ!\n"
 "Kérem, adja meg a partnert!\""
 
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr "Összegzésnél használt előjel"
+msgstr "Fölérendeltekhez használt előjel"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5721,12 +6089,12 @@ msgstr "(Számla/partner) név"
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr "Haladás"
+msgstr "Fejlődés"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Készpénz pénztár és bankok"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5736,13 +6104,13 @@ msgstr "account.installer"
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Számítsa újra az adókat és összegzéseket"
 
 #. module: account
 #: code:addons/account/account.py:1116
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
-msgstr ""
+msgstr "Nem módosíthatja/törölheti ennek az időszaknak a napló bejegyzéseit."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5752,7 +6120,7 @@ msgstr "Adóalap tartalmazza az adót"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr "Szállítói számlaszám"
+msgstr "Beszállítói számlaszám"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5760,9 +6128,9 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
-"Napok száma, amely hozzáadódik a mai dátumhoz. Ezután számolja a rendszer a "
-"hónap napját. Pl. ha a dátum 01.15., a napok száma 22 és a hónap napja -1, "
-"akkor a fizetési határidő 02.28. lesz."
+"Napok száma, amely hozzáadódik a mai dátumhoz. Ez alapján számolja a "
+"rendszer a hónap napját. Pl. ha a dátum 01.15., a napok száma 22 és a hónap "
+"napja -1, akkor a fizetési határidő 02.28. lesz."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5773,7 +6141,7 @@ msgstr "Összeg kiszámítása"
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
-msgstr ""
+msgstr "A %s napló, %s lezárt időszak tételeit nem tudja növelni/módosítani."
 
 #. module: account
 #: view:account.journal:0
@@ -5784,7 +6152,7 @@ msgstr "Tétel ellenőrzések"
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr "(Hagyja üresen, hogy az aktuális állapotot nyissa meg)"
+msgstr "(Hagyja üresen, az aktuális állapotot megynyitásához)"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
@@ -5798,7 +6166,7 @@ msgstr "Időszak kezdete"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Eszközök nézete"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -5831,24 +6199,27 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be treated."
 msgstr ""
+"Válassza ki itt ehhez a fizetési tételhez vonatkozó értékelés típust. "
+"Figyeljen oda, hogy az utolsó tételnek 'Egyenleg' típusnak kell lennie "
+"ahhoz, hogy a teljes összegen el legyen végezve."
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "Kezdeti számlaegyenlegeket beleértve"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Tax Codes"
-msgstr "Adógyűjtők"
+msgstr "Adógyűjtőkódok"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Kimenő jóváíró számla"
+msgstr "Kimenő, vásárlói jóváíró számla"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5866,23 +6237,23 @@ msgstr "Kimutatás az elmúlt 15 napban készített számlákról"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "Záró/nyitó napló"
+msgstr "Üzeit évet záró napló tételek"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Visszetérítés tervezet "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Töltse ki ezt az űrlapot, ha pénzt tett a pénztár rögzítőbe:"
 
 #. module: account
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Fizetendő összeg"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5892,7 +6263,7 @@ msgid ""
 "as reconciled."
 msgstr ""
 "A hátralévő partnerek száma, akiket ellenőrizni kell, hogy van-e párosítandó "
-"tételük."
+"tételük. Ez az aktuális partnert már párosítottként tekinti."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5935,19 +6306,19 @@ msgstr "Kifizetés dátuma"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,opening_details_ids:0
 msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "Pénzkazetta nyitó tételek"
 
 #. module: account
 #: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Gyűjtőkódok"
+msgstr "Analitikus gyűjtőkódok"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Ügyfél számlák és visszatérítések"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5960,7 +6331,7 @@ msgstr "Devizaösszeg"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Tételenkénti kerekítés"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5980,12 +6351,12 @@ msgstr "Mennyiség"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr "Bizonylat száma"
+msgstr "Bizonylat száma (Mozgás)"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Normál szöveg"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -5998,30 +6369,34 @@ msgid ""
 "This payment term will be used instead of the default one for purchase "
 "orders and supplier invoices"
 msgstr ""
+"Ezt a fizetési feltétel használja az alapértelmezett helyett a beszerzési "
+"megrendelésekhez és vásárlói számlákhoz"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
-msgstr "Maximálisan párosítható tételek száma"
+msgstr ""
+"Részenkénti kombinációs párosítások száma  egy mint az automatikus párosítás "
+"max. tételszámhoz használt számlaegyenleg pont megtalálásához."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Nullánál hoszabb időszakot kell használnia."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "ÁFA pozíció sablon"
+msgstr "Költségvetési ÁFA pozíció sablon"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Visszetérítés tervezet"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6048,7 +6423,7 @@ msgstr "Pénzkazetta nyitása"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Automatikus formázás"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6059,6 +6434,7 @@ msgstr "Párosítás különbözet leírásával"
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
 msgstr ""
+"Típus nézetben nem tud nepló tételeket létrehozni. Váltson másik nézetbe."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6071,17 +6447,19 @@ msgstr "Fix összeg"
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
+"Nem tudja megváltoztatni az adót, el kell távolítania és létre kell hoznia "
+"tételeket."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr "Automatikus párosítás"
+msgstr "Számla automatikus párosítása"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "Könyvelési tételsor"
+msgstr "Könyvelési napló tételsor"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -6097,7 +6475,7 @@ msgstr "Az adóösszeg kiszámítási módszere."
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Esedékesség dátumának kiszámítása"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -6110,18 +6488,18 @@ msgstr "Létrehozás dátuma"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr "Gyűjtőnaplók"
+msgstr "Analitikus gyűjtőnaplók"
 
 #. module: account
 #: field:account.account,child_id:0
 msgid "Child Accounts"
-msgstr "Alárendelt számlák"
+msgstr "Alárendelt főkönyvi számlák"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Bizonlyat neve (Azonosító id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6133,18 +6511,18 @@ msgstr "Különbözet leírása"
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "bevitt tételek"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "Összes szállítói tartozás"
+msgstr "Fizetendő tartozás összesen"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
 #: model:account.financial.report,name:account.account_financial_report_income0
 msgid "Income"
-msgstr ""
+msgstr "Bevétel"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -6186,7 +6564,7 @@ msgstr "Szabad hivatkozás"
 #: code:addons/account/report/account_partner_ledger.py:276
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr "Vevő és szállító számlák"
+msgstr "Vásárlói és beszállítói számlák"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
@@ -6196,24 +6574,24 @@ msgstr "ÁFA pozíció leképezés"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Vállalat kiválasztás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr "Nyitott állapot"
+msgstr "Nyitott állapotú számla"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr "Max menny:"
+msgstr "Max menny.:"
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund Invoice"
-msgstr "Jóváíró számla"
+msgstr "Jóváíró visszatérítés számla"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -6222,9 +6600,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
-"Ez a menüpont elemzést nyújt a főkönyvi számlákon könyvelt tételekről. A "
-"kereső eszköz használatával különböző kritériumokat határozhat meg a "
-"lekérdezéshez."
+"Ez a menüpont elemzést nyújt a különböző főkönyvi számlákon könyvelt "
+"tételekről. A kereső eszköz használatával különböző kritériumokat határozhat "
+"meg a lekérdezéshez, melyek tájékoztatják a tartozásairól és követeléseiről."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -6242,7 +6620,7 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr "Időszak"
+msgstr "Időszak kényszerítése"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -6261,12 +6639,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy főkönyvi számla hozzáadásához.\n"
+"              </p><p>\n"
+"                Egy számla a főkönyvi karton része amire a vállalkozása\n"
+"                be tud jegyezni bármilyen tartozás és követelés "
+"tranzakciót.\n"
+"                Vállalatok két fő részletben mutatják be az éves "
+"könyvelésüket: \n"
+"                a számla egyenlegen és a bevételi kimutatáson (nyereség és "
+"veszteség\n"
+"                számla). A vállalkozás éves elszámolásához a törvény szerint "
+"be kell\n"
+"                mutatni számos informácót.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr "Sorok száma"
+msgstr "# sorok száma"
 
 #. module: account
 #: view:account.invoice:0
@@ -6296,7 +6689,7 @@ msgstr "Szűrés"
 #: code:addons/account/account.py:2334
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "Rossz kifejezés \"%(...)s\" van a modelljében !"
 
 #. module: account
 #: view:account.tax.template:0
@@ -6307,11 +6700,12 @@ msgstr "Számítási kód (ha az ár tartalmazza az adót)"
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
 msgstr ""
+"Számlaegyenleg a kezdeti egyenleg és a tranzakciós tételek alapján számítva"
 
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Veszteség számla"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -6334,6 +6728,11 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' status."
 msgstr ""
+"Összes kézzel létrehozott napló tétel 'Könyveletlen' állapotú, de "
+"választhatja lehetőségként ennek az állapotnak az átugrását az ide vonatkozó "
+"naplón. Ebben az esetben, úgy viselkedik mint a rendszer által automatikusan "
+"létrehozott napló tétel a dokumentum érvényesítésekor (számlák, bank "
+"kivonatok...) mint 'Könyvelt' állapotú tétel."
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -6347,11 +6746,13 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"."
 msgstr ""
+"Nem érvényesítheti ezt a napló tételt mert a \"%s\" számlája nem tartozik a "
+"\"%s\" szálatükörhöz."
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Kimutatás"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -6380,12 +6781,12 @@ msgstr "Semmi"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Kimenő jóváíró számlák"
+msgstr "Kimenő, vásárlói jóváíró számlák"
 
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Idegen számlaegyenleg"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -6405,12 +6806,12 @@ msgstr "A naplóhoz kapcsolt vállalat"
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Több pénznemes környezetet tesz elérhetővé"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Jegyzés futtatás"
 
 #. module: account
 #: report:account.invoice:0
@@ -6422,7 +6823,7 @@ msgstr "ÁFA pozíció megjegyzés :"
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr "Gyűjtőkód tételek elemzése"
+msgstr "Analitikus gyűjtőkód tételek elemzése"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -6435,11 +6836,13 @@ msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Ez a napló automatikusa létre lesz hozva ehhez a bankszámlához, egy tétel "
+"rögzítésekor"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "Gyűjtőkód tétel"
+msgstr "Analitikus gyűjtőkód bevitel"
 
 #. module: account
 #: view:res.company:0
@@ -6463,8 +6866,8 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
-"Amint a párosítás elkészül, a számla állapota rendezettre változik a "
-"rendszerben."
+"Amint a párosítás elkészül, a számla állapota 'Rendezettre' (u.m. fizetve) "
+"változik a rendszerben."
 
 #. module: account
 #: view:account.chart.template:0
@@ -6481,12 +6884,12 @@ msgstr "Legutolsó párosítás dátuma"
 #: view:account.analytic.line:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Gyűjtőkód tétel"
+msgstr "Analitikus gyűjtőkód tételsor"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modellek"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1124
@@ -6495,11 +6898,13 @@ msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
 "unreconcile related payment entries first."
 msgstr ""
+"Nem vonhat vissza részben kiegyenlített számlát. Először párosítatlanná kell "
+"tennie az ide vonatkozó fizetéseket."
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "Értékesítést terhelő adók"
+msgstr "Vásárlói értékesítést terhelő adók"
 
 #. module: account
 #: help:account.model,name:0
@@ -6509,7 +6914,7 @@ msgstr "Ismétlődő könyvelési tételek kezelésére szolgáló modell"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Értékesítési adó(%)"
 
 #. module: account
 #: view:account.tax.code:0
@@ -6529,6 +6934,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Kattintson a beszállítótól visszakapott jóváíró visszatérítés "
+"bejegyzéséhez.\n"
+"              </p><p>\n"
+"                Beszállítói visszatérítés kézi bevitele helyett, "
+"létrehozhatja a \n"
+"                visszatérítéseket és közvetlenül párosíthatja az ide "
+"vonatkozó beszerzési\n"
+"                beszállítói számlálkkal.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax,type:0
@@ -6551,6 +6967,10 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Ez a boolean művelet segítséget nyújt annak kiválasztásában, hogy javasol  "
+"az értékesítési és beszerzési értékek kódolásában vagy az általános m2o "
+"mezőt választja. Ez utóbbit választása feltételezi, hogy a sablonban teljes "
+"körűen meghatározott az adó."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6565,17 +6985,17 @@ msgstr "Vállalatok"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Kiegyenlítetlen és kiegyenlített stzámlák"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Alszintek mutatása"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Bank & Készpénz pénztár"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6645,7 +7065,7 @@ msgstr "Tételek részleges párosítása"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Cancel"
-msgstr "Mégse"
+msgstr "Mégsem"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6653,18 +7073,19 @@ msgstr "Mégse"
 #: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr "Vevő"
+msgstr "Kintlévőség"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Lezárt számlákon nem hozhat létre napló tételeket."
 
 #. module: account
 #: code:addons/account/account_invoice.py:633
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
+"A számlatulajdonos vállalkozása és a számla tétel vállalkozása nem egyezik."
 
 #. module: account
 #: view:account.invoice:0
@@ -6685,7 +7106,7 @@ msgstr "Pénznem, ha nem egyezik a vállalat pénznemével."
 #: code:addons/account/installer.py:69
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Egyéni"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6701,18 +7122,18 @@ msgstr "Pénzkazetta"
 #: model:account.account.type,name:account.account_type_cash_equity
 #: model:account.account.type,name:account.conf_account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "Saját tőke"
 
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Belső mozgások számlája"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:32
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
-msgstr ""
+msgstr "Kérem ellenőrizze, a 'Napló' beállítását a banki kivonaton"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -6722,7 +7143,7 @@ msgstr "Százalék"
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Kerekítés globálisan"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6738,12 +7159,12 @@ msgstr "Max. tételszám"
 #: code:addons/account/account.py:3465
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Nem tud létrehozni egy nem használt napló kódót."
 
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr "Gyűjtő számla gyűjtőkód tételei"
+msgstr "Analitikus gyűjtő számla gyűjtőkód tételei"
 
 #. module: account
 #: field:account.invoice,internal_number:0
@@ -6754,7 +7175,7 @@ msgstr "Számla belső sorszáma"
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Különbség"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6774,7 +7195,7 @@ msgstr "Párosítás: A következő partnerre lép"
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr "Fordított gyűjtőkód kivonat"
+msgstr "Fordított analitikus gyűjtőkód számlaegyenleg"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
@@ -6790,6 +7211,13 @@ msgid ""
 "due date, make sure that the payment term is not set on the invoice. If you "
 "keep the payment term and the due date empty, it means direct payment."
 msgstr ""
+"Ha fizetési feltételeket használ, a fizetési határidő számítása "
+"automatikusan lesz kiszámítva a könyvelési tételek létrehozásakor. A "
+"fizetési feltételhez több határidő számítás is lehet, például 50% azonnal és "
+"50% egy hónapra, de ha kényszeríteni szeretne egy lejárati dátumot, akkor "
+"győződjön meg róla, hogy nincs beállítva fizetési határidő a számlára. Ha a "
+"fizetési határidő és a lejárati dátumot üresen hagyja az azonnali fizetést "
+"jelent."
 
 #. module: account
 #: code:addons/account/account.py:414
@@ -6798,6 +7226,8 @@ msgid ""
 "There is no opening/closing period defined, please create one to set the "
 "initial balance."
 msgstr ""
+"Nincs nyitó/záró időszakasz meghatározva, kérem hozzon létre egyet a kezdeti "
+"számlaegyenleg beállításához."
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6806,7 +7236,7 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
-"A sorszám mező szolgál az adósorok sorba rendezésére az alacsonyabb "
+"A sorrend mező szolgál az adósorok sorba rendezésére az alacsonyabb "
 "sorszámútól a magasabbig. A sorrend fontos a több alárendelt adóval "
 "rendelkező adók esetében. Ebben az esetben az értékelési sorrend lényeges."
 
@@ -6825,12 +7255,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Felhasználói hiba!"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Eldobás"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6843,12 +7273,12 @@ msgstr "Likviditási"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikus gyűjtőkód tételek"
 
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Van alapértelmezett vállakozás"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6857,14 +7287,14 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
-"Ez a varázsló előállítja az üzleti év nyitó tételeit. Többször is lehet "
-"futtatni ugyanarra az évre: a régi egyenlegeket egyszerűen felülírja az "
-"újakkal."
+"Ez a varázsló előállítja az üzleti évet záró napló tételeket a kiválasztott "
+"üzleti évre vonatkozólag. Többször is lehet futtatni ugyanarra az üzleti "
+"évre: a régi nyitó egyenlegeket egyszerűen felülírja az újakkal."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr "Bank és pénztár"
+msgstr "Bank és készpénz pénztár"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6875,12 +7305,13 @@ msgid ""
 "the system."
 msgstr ""
 "Ez a kimutatás elemzést nyújt az üzleti szempontok alapján létrehozott "
-"gyűjtőkódokon könyvelt tételekről. Használja a kereső eszközt az elemzéshez."
+"analitikai könyvelt tételekről. Használja a kereső eszközt a rendszer által "
+"létrehozott analitikus tételek elemzéséhez."
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "A napló nevének egyedinek kell lennie!"
+msgstr "A napló nevének egyedinek kell lennie mindegyik vállalatra!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6894,6 +7325,8 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"Nem változtathatja meg a már naplót tartalmazó főkönyvi számla tulajdonos "
+"vállalkozását."
 
 #. module: account
 #: report:account.invoice:0
@@ -6903,7 +7336,7 @@ msgstr ""
 #: selection:report.invoice.created,type:0
 #, python-format
 msgid "Supplier Refund"
-msgstr "Bejövő jóváíró számla"
+msgstr "Bejövő beszállítói jóváíró számla"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -6936,7 +7369,7 @@ msgstr "Központosítás"
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr "Csoportosítás"
+msgstr "Csoportosítás ezzel..."
 
 #. module: account
 #: code:addons/account/account.py:1024
@@ -6945,6 +7378,8 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Nincs meghatározva időszak erre a dátumra: %s.\n"
+"Kérem hozzon létre egyet."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -6959,13 +7394,13 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
-"Ha bejelölt, akkor a rendszer megpróbálja összevonni a kontírozási sorokat a "
-"számla könyvelésének generálásakor."
+"Ha bejelölt, akkor a rendszer megpróbálja összevonni a kontírozási számla "
+"tételeket a számla könyvelésének generálásakor."
 
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "Van alapértelmezett vállalat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6982,7 +7417,7 @@ msgstr "account.sequence.fiscalyear"
 #: model:ir.model,name:account.model_account_analytic_journal
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Analytic Journal"
-msgstr "Gyűjtőnapló"
+msgstr "Analitikus gyűjtőnapló"
 
 #. module: account
 #: view:account.entries.report:0
@@ -6995,6 +7430,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"A fizetési feltétel sorának a százalékos értéke 0 és 1 közötti legyen, "
+"Példa: 0.02 érték jelentése: 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -7015,7 +7452,7 @@ msgstr "Beszerzés főkönyvi számla"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Adó nemének egyedinek kell lennie vállalkozásonként!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7028,6 +7465,9 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disabled"
 msgstr ""
+"Ha kiveszi a tranzakciókat a párosításból, akkor azokat a műveleteket is "
+"ellenőriznie kell, melyek ezekkel össze voltak kötve, mivel azok nem lesznek "
+"kiiktatva"
 
 #. module: account
 #: view:account.account.template:0
@@ -7042,7 +7482,7 @@ msgstr "Megjegyzések"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr "Gyűjtőkód tétel statisztika"
+msgstr "Analitikus gyűjtőkód tétel statisztika"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
@@ -7054,7 +7494,7 @@ msgstr "Tételek: "
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Az ide vonatkozó napló pénzneme."
 
 #. module: account
 #: constraint:account.move.line:0
@@ -7062,6 +7502,8 @@ msgid ""
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
 msgstr ""
+"Nem adhatja meg a már vállalkozásként használt pénznemet mint másodlagos "
+"pénznem."
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -7073,7 +7515,7 @@ msgstr "Igaz"
 #: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Számlaegyenleg kivonat (Eszköz számla)"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -7088,7 +7530,7 @@ msgstr "Tartozik összesen"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Következő párosítandó partner tételek"
 
 #. module: account
 #: report:account.invoice:0
@@ -7118,7 +7560,7 @@ msgstr "Python kód"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "A jelenlegi időszakban lévő időszakokkal rendelkező napló tételek"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -7144,7 +7586,7 @@ msgstr "Tétel létrehozása"
 #: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Nyereség & Veszteség (Költség, kiadási számla)"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
@@ -7155,7 +7597,7 @@ msgstr "Összesített forgalom"
 #: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Napló bejegyzéssel rendelkező számlát nem tud eltávolítani."
 
 #. module: account
 #: code:addons/account/account.py:1024
@@ -7167,12 +7609,12 @@ msgstr "Hiba!"
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Pénzügyi beszámoló stílus"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr ""
+msgstr "Számla egyenleg jelölést megtartani"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -7199,13 +7641,13 @@ msgstr "Kézi"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Elvetés: visszatérítés létrehozás és párosítás"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Induló dátumot kell beállítania."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7235,6 +7677,9 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Ha kiválasztott a dátum vagy időszak szerinti szűrést, akkor ez a mező "
+"lehetővé teszi egy oszlop hozzáadását a tartozás/követelés/egyenleg "
+"összegeinek kijelzéséhez a szűrő feltételeinek megfelelően."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7249,12 +7694,12 @@ msgstr "Könyvelési tételek"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "A számlán nem található időszak."
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr "Egy oldalon csak egy partner jelenik meg a kimutatásban"
+msgstr "Egy oldalon csak egy partner jelejen meg a kimutatásban"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7289,12 +7734,13 @@ msgstr "Igen"
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "Minden tétel"
+msgstr "Minden bejegyzés"
 
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
 msgstr ""
+"Csak ugyanahoz a partnerhez tartozó napló tételeket tudja párosítani."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7312,7 +7758,7 @@ msgstr "Nyitó egyenleg"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "Párosítás"
+msgstr "Számla párosítás"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -7340,14 +7786,14 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
-"Jelölje be, ha bizonytalan a tétel kontírozásában. Ennek hatására "
-"ellenőrizendőként jelölődik meg."
+"Jelölje be, ha bizonytalan a napló tétel kontírozásában. Ennek hatására "
+"könyvelő szekértő által 'ellenőrizendő'-ként jelölődik meg."
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Adók teljes csomagja"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -7355,11 +7801,13 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state."
 msgstr ""
+"Válassza ki azokat a bejegyzés tételeket, melyeknek nincs tervezet állapotú "
+"számla bizonlyat bejegyzése."
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr "Beállítások"
+msgstr "Tulajdonságok"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
@@ -7384,6 +7832,8 @@ msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Beállítási hiba!\n"
+"A kiválasztott pénznemet meg kell osztani az alapértelmezett számlával is."
 
 #. module: account
 #: code:addons/account/account.py:2304
@@ -7405,22 +7855,22 @@ msgstr ""
 "%(month)s: hónap meghatározása \n"
 "%(date)s: aktuális dátum\n"
 "\n"
-"pl. %(date)s-i modell"
+"pl. %(date)s-i modellem"
 
 #. module: account
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal Url - elérési út"
 
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Ügyfelek fizetéseinek beállítása"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr "Bizonylat, amely előállította ezt a számlát."
+msgstr "Bizonylat, amely előállította ezt a számla kimutatást."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -7440,18 +7890,18 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
+msgstr "Értékesítésekkor használt adók"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Kimenő számlák"
+msgstr "Vásárlói, kimenő számlák"
 
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Egyéb"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7464,7 +7914,7 @@ msgstr "Értékesítés"
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr "Kész"
+msgstr "Elvégezve"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -7474,13 +7924,15 @@ msgid ""
 "Make sure you have configured payment terms properly.\n"
 "The latest payment term line should be of the \"Balance\" type."
 msgstr ""
+"Nem hagyhat jóvá egy számlaegyenleg nélküli bejegyzést.\n"
+"Győződjön meg a fizetési feltétel pontos megadásáról.\n"
+"Az utolsó fizetés feltételének \"Egyenleg\" típusúnak kell lennie."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
 msgstr ""
-"A kézzel berögzített tételekből álló kivonat lesz a tervezet állapotú "
-"kivonat."
+"A kézzel berögzített tételekből álló kivonat, tervezet állapotú kivonat lesz."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7504,12 +7956,14 @@ msgstr ""
 #: field:account.invoice.line,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr "Forrásbizonylat"
+msgstr "Forrás dokumentum"
 
 #. module: account
 #: help:account.config.settings,company_footer:0
 msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
+"Bank számlák, melyek mindegyik nyomtatott dokumentum lábjegyzetében "
+"szerepelni fognak"
 
 #. module: account
 #: constraint:account.account:0
@@ -7518,16 +7972,19 @@ msgid ""
 "You cannot define children to an account with internal type different of "
 "\"View\"."
 msgstr ""
+"Beállítási hiba!\n"
+"Nem határozhat meg al-számákat egy \"Nézet\"-től eltérő belső típusú "
+"számlához."
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "Könyvelési kimutatás"
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Főkönyvi számla pénzneme"
 
 #. module: account
 #: report:account.invoice:0
@@ -7541,6 +7998,7 @@ msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
 "instead."
 msgstr ""
+"Nem tud olyan számlát törölni ami nincs visszavonva. Inkább térítse vissza."
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7550,7 +8008,7 @@ msgstr "Százalék típusú adókra a %-ot 0-1 közötti számként adja meg."
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Pénzügyi kimutatások sorrendje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7561,13 +8019,13 @@ msgstr "Havi forgalom"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikus gyűjtőkód tételek"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr "Sorok"
+msgstr "Tételsorok"
 
 #. module: account
 #: view:account.tax.template:0
@@ -7587,17 +8045,17 @@ msgstr "Biztos benne, hogy meg akarja nyitni ezt a számlát?"
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Kiadási költség számla nyitó tételei"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr "Vevői hivatkozás"
+msgstr "Vásárlói hivatkozás"
 
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr "Gyűjtő főkönyvi számla sablon"
+msgstr "Felérendelt gyűjtő főkönyvi számla sablon"
 
 #. module: account
 #: report:account.invoice:0
@@ -7608,7 +8066,7 @@ msgstr "Ár"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,closing_details_ids:0
 msgid "Closing Cashbox Lines"
-msgstr ""
+msgstr "Pénzkazetta tételeinek lezárása"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7626,12 +8084,12 @@ msgstr "Tartozik összegek alapértelmezett főkönyvi számlája"
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Könyvelésre feladott bejegyzések"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "A százalékhoz adjon meg egy 0-1 közti arányszám értéket."
 
 #. module: account
 #: report:account.invoice:0
@@ -7644,12 +8102,12 @@ msgstr "Számla kelte"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Számla kibocsátási éve szerinti csoportosítás"
 
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Beszerzési adó (%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7659,12 +8117,12 @@ msgstr "A vevő összes tartozása a vállalat felé."
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Kiegyenlítetlen napló tételek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
 msgid "Chart Templates"
-msgstr ""
+msgstr "Számlatükör sabonok"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -7700,22 +8158,22 @@ msgstr "Zárás dátuma"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Bankkivonat sor"
+msgstr "Bankkivonat tételsor"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "Alapértelmezett előzetesen felszámított ÁFA"
+msgstr "Alapértelmezett előzetesen felszámított beszerzési adó"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Bevételi számla nyitó tételei"
 
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Pro-forma számlák engedélyezése"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7751,12 +8209,12 @@ msgstr "Tételek létrehozása"
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "A vállalkozás fő pénzneme."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -7774,18 +8232,18 @@ msgstr "Figyelem"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Kapcsolatok/Analitikus könyvelések"
 
 #. module: account
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Napló"
+msgstr "Számla napló"
 
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Adó számítás kerekítési mód"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7802,6 +8260,11 @@ msgid ""
 "                                    with the invoice. You will not be able "
 "to modify the credit note."
 msgstr ""
+"Ezt a lehetőséget használja olyan számla visszavonásához, melyet még nem \n"
+"                                    kellett volna kiadnia. Egy jóváírás lesz "
+"létrehozva, érvényesítve és párosítva\n"
+"                                    a számlával. Nem lesz lehetősége a "
+"jóváíró módosítására."
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7836,18 +8299,20 @@ msgid ""
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Nincs alapértelmezett követelés számla meghatározva a \n"
+"következő naplón \"%s\"."
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Számlasor"
+msgstr "Számla tételsor"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Vásárlói és Beszállítói visszatérítések"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7874,30 +8339,47 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Kattintson új analitikus könyvelés létrehozásához.\n"
+"              </p><p>\n"
+"                A rendes számlatükör felépítése meghatározott az ország\n"
+"                törvényi követelményeinek megfelelően. Az analitikus\n"
+"                számlatükör felépítése az üzletmenetének igényeit kell\n"
+"                tükröznie a költség/hozam kimutatásokban kifejezve.\n"
+"              </p><p>\n"
+"                Ezek általában szerkezetileg a szerződésekből, projektekből, "
+"\n"
+"                termékekből, vagy szakaszaiból álltak. A legtöbb OpenERP "
+"művelet\n"
+"                (számlák, időkimutatások, költségek, stb.) hoznak létre "
+"analitikus tartalmakat,\n"
+"                tételeket az ide vonatkozó számlán.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Gyökér/Nézet"
 
 #. module: account
 #: code:addons/account/account.py:3206
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
 
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr "Pro forma"
+msgstr "PRO-FORMA"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr "Nem egyező"
+msgstr "Kiegyenlítetlen"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7908,7 +8390,7 @@ msgstr "Normál"
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "E-mail sablonok"
 
 #. module: account
 #: view:account.move.line:0
@@ -7936,29 +8418,29 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
-"Vevő és szállító tételeknél használt mező. Meg lehet adni a tételsor "
+"Vásárló és beszállító tételeknél használt mező. Meg lehet adni a tételsor "
 "fizetési határidejét."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Több pénznem"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Esedékesség kelte"
 
 #. module: account
 #: code:addons/account/account.py:3193
 #, python-format
 msgid "Sales Journal"
-msgstr "Kimenő számla napló"
+msgstr "Kimenő, vásárlói számla napló"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr "Adó"
+msgstr "Számla adó"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1185
@@ -7970,7 +8452,7 @@ msgstr "Nem adott meg darabszámot!"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Számla kimutatások rangsor"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7981,11 +8463,16 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Ez a lehetőség mező lehetővé teszi egy számla sablon hozzáillesztését egy "
+"jellegzetes számlatükör sablonhoz, mely különbözhet az eredeti gyökér "
+"fölérendeltektől, amihez tartozik. Ez lehetővé teszi olyan számlatükör "
+"meghatározását mely másikat kibővít és kiegészíti egy pár új számlával (Nem "
+"kell többször a mindegyikre jellemző teljes felépítést újra meghatároznia)."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Nem párosított napló bejegyzések"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -7993,6 +8480,8 @@ msgid ""
 "This date will be used as the invoice date for credit note and period will "
 "be chosen accordingly!"
 msgstr ""
+"Ez a dátum lesz használva mint számla dátum a jóváíráshoz és az időszak is "
+"eszerint lesz választva!"
 
 #. module: account
 #: view:product.template:0
@@ -8006,6 +8495,8 @@ msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
 "accounts."
 msgstr ""
+"Be kell állítana egy kódot a kiválasztott számlatükrökön meghatározott "
+"bankszámlához."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -8028,7 +8519,7 @@ msgstr "Záró dátum"
 #: code:addons/account/account.py:1541
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Pénznem igazítás"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -8046,6 +8537,8 @@ msgstr "Kiválasztott számlák érvénytelenítése"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Ez a mező törvényes jelentések készítésére való: nyereség és veszteség, "
+"egyenleg közlő."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8073,17 +8566,17 @@ msgstr "Számlatükör sablonok"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
-msgstr ""
+msgstr "A sorrend mezőt használja az alsóbb rendűtől a felsőbb rendűig."
 
 #. module: account
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
-msgstr ""
+msgstr "A pénznemben visszamaradt összeg"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Jóváírás jegyzet sorrend"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8092,7 +8585,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Tételek könyvelése"
+msgstr "Napló tételek könyvelése"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -8102,12 +8595,12 @@ msgstr "Tételek könyvelése"
 #: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Customer"
-msgstr "Vevő"
+msgstr "Vásárló"
 
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Jelentés neve"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -8118,7 +8611,7 @@ msgstr ""
 #: code:addons/account/account.py:3092
 #, python-format
 msgid "Cash"
-msgstr "Pénztár"
+msgstr "Készpénz pénztár"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -8132,6 +8625,8 @@ msgid ""
 "Refund base on this type. You can not Modify and Cancel if the invoice is "
 "already reconciled"
 msgstr ""
+"Visszatérítés ennek a típusnak az alapján. Nem tudja megváltoztatni és "
+"visszavonni a már párosított számlát"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8144,22 +8639,22 @@ msgstr ""
 #: field:account.tax.code,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr "Sorszám"
+msgstr "Sorrend"
 
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Paypal számla"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Napló tétel száma"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Fölérendelt gyűjtő kimutatás"
 
 #. module: account
 #: constraint:account.account:0
@@ -8168,11 +8663,13 @@ msgid ""
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Hiba!\n"
+"Nem hozhat létre visszatérő számlákat."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -8182,7 +8679,7 @@ msgstr "Kapcsolódás az automatikusan létrehozott könyvelési tételekhez"
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -8205,19 +8702,19 @@ msgstr "Számított egyenleg"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
 #, python-format
 msgid "You must choose at least one record."
-msgstr ""
+msgstr "Választani kell legalább egy rekordot!"
 
 #. module: account
 #: field:account.account,parent_id:0
 #: field:account.financial.report,parent_id:0
 msgid "Parent"
-msgstr "Gyűjtő fk.szla"
+msgstr "Fölérendelt"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Profit"
-msgstr ""
+msgstr "Nyereség"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -8252,19 +8749,19 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
-"A sorszám mező szolgál az adósorok sorba rendezésére a legalacsonyabb "
+"A sorrend mező szolgál az adósorok sorba rendezésére a legalacsonyabb "
 "sorszámútól a legmagasabbig. A sorrend fontos a több alárendelt adóval "
 "rendelkező adók esetében. Ebben az esetben az értékelési sorrend lényeges."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "Pénzkazetta sor"
+msgstr "Pénzkazetta tétel sor"
 
 #. module: account
 #: field:account.installer,charts:0
 msgid "Accounting Package"
-msgstr ""
+msgstr "Könyvelési csomag"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -8274,7 +8771,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "Folyószámla karton"
+msgstr "Partner folyószámla karton"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -8294,22 +8791,22 @@ msgstr "Figyelem!"
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Adó számításhoz a kerekítés módja"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "Tételsor állapota"
+msgstr "Bizonylat tételsor állapota"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr "Tételpárosítás"
+msgstr "Főkönyvi számla bizonylat tételpárosítás"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -8350,7 +8847,7 @@ msgstr "Partner"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr "Válassza ki az alkalmazandó új pénznemet"
+msgstr "Válassza ki a számlázásnál alkalmazandó új pénznemet"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
@@ -8361,7 +8858,7 @@ msgstr "Nincsenek számlasorok!"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Kimutatás típus"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8374,7 +8871,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr "Alkalmazási terület"
+msgstr "Adó alkalmazási terület"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:382
@@ -8407,28 +8904,30 @@ msgstr "Automatikus tétel"
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
 msgstr ""
+"Jelölje be a négyzetet, ha ez a főkönyvi számla lehetővé tesz ia napló "
+"bejegyzéseken a párosításokat."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr "Fordított gyűjtőkód kivonat -"
+msgstr "Fordított analitikus gyűjtőkód kivonat -"
 
 #. module: account
 #: help:account.move.reconcile,opening_reconciliation:0
 msgid ""
 "Is this reconciliation produced by the opening of a new fiscal year ?."
-msgstr ""
+msgstr "Ezt a párosítást egy új üzleti év nyitása hajtotta végre ?."
 
 #. module: account
 #: view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 msgid "Analytic Entries"
-msgstr "Gyűjtőkód tételek"
+msgstr "Analitikus gyűjtőkód tételek"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr "Társult partner"
+msgstr "Társított partner"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1465
@@ -8439,7 +8938,7 @@ msgstr "Először partnert kell választani!"
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr "Egyéb megjegyzés"
+msgstr "További információ"
 
 #. module: account
 #: field:account.invoice.report,residual:0
@@ -8477,7 +8976,7 @@ msgstr "A számla állapota nyitott."
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "Status"
-msgstr "Státusz"
+msgstr "Állapot"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -8490,7 +8989,7 @@ msgstr "Gyűjtőkód karton"
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr "Ehhez a vállalkozáshoz nem lett üzleti adóügyi év meghatározva"
+msgstr "Ehhez a vállalkozáshoz nincs üzleti adóügyi év meghatározva"
 
 #. module: account
 #: view:account.invoice:0
@@ -8500,7 +8999,7 @@ msgstr "Pro forma"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr "Naplókód/Megnevezés"
+msgstr "Naplókód/Bizonylat megnevezés"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -8515,13 +9014,13 @@ msgstr ""
 #: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Bejövő jóváíró számla napló"
+msgstr "Bejövő, beszállítói  jóváíró számla napló"
 
 #. module: account
 #: code:addons/account/account.py:1333
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Kérem egy sorozat meghatározását a naplón."
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8531,12 +9030,12 @@ msgstr "Százalék típusú adókra a %-ot 0-1 közötti számként adja meg."
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "Jelenlegi számlák"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Számla dátuma szerinti csoportosítása"
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -8550,6 +9049,10 @@ msgid ""
 "recalls.\n"
 "                This installs the module account_followup."
 msgstr ""
+"Ez engedélyezi az automatikus leveleket a kiegyenlítetlen számlákra, több-"
+"szintű visszahívással.\n"
+"                Ez a account_followup (számla_nyomon követés) modult "
+"telepíti.."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8582,22 +9085,24 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Teljes mennyiség (a vállalkozás pénznemében) a számlán második pénznemben "
+"tartott tranzakciókra."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Net Total:"
-msgstr "Nettó érték:"
+msgstr "Teljes nettó érték:"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Válasszon egy induló és egy befejező időszakot."
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Következő számla szám"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -8617,7 +9122,7 @@ msgstr "Árbevétel főkönyvi számla"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Módosított egyenleg"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8694,14 +9199,16 @@ msgstr "Záró egyenleg"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Központi ellenszámla"
 
 #. module: account
 #: help:account.move.line,blocked:0
 msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
-msgstr "Bejelölheti ezt a négyzetet, hogy jelezze, hogy a tétel peresített."
+msgstr ""
+"Bejelölheti ezt a négyzetet, hogy jelezze a napló tételen, hogy a tétel "
+"peresített a hozzá tartozó ügyféllel."
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -8712,12 +9219,12 @@ msgstr "Részleges párosítás"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr "Fordított gyűjtőkód kivonat"
+msgstr "Analitikus számla fordított gyűjtőkód kivonat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr "Általános kimutatás"
+msgstr "Főkönyvi számla általános kimutatás"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8729,6 +9236,12 @@ msgid ""
 "invoice will be created \n"
 "                                    so that you can edit it."
 msgstr ""
+"Használja ezt a lehetőséget ha törölni szeretné ezt és másikat létrehozni \n"
+"                                    helyette. Jóváíró számla lesz "
+"létrehozva, érvényesítve és párosítva\n"
+"                                    a jelenlegi számlával. Egy szerkeszthető "
+"új, tervezet, számla lesz\n"
+"                                    létrehozva."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -8739,17 +9252,17 @@ msgstr "Bankkivonat automatikus importálása"
 #: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error!"
-msgstr ""
+msgstr "Ismeretlen hiba!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr "Bank egyeztetés"
+msgstr "Banki bizonylat egyeztetés"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Alkalmaz"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8761,7 +9274,7 @@ msgstr "Főkönyvi számlatípusok"
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Számla (Ref ${object.number or 'n/a'})"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1210
@@ -8770,6 +9283,8 @@ msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal."
 msgstr ""
+"Nem használhatja ezt az általános főkönyvi számlát ebben a naplóban, "
+"ellenőrizze az ide vonatkozó naplón a 'Beviteli felügyelet' fület."
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -8793,7 +9308,7 @@ msgstr "Párosítás"
 #. module: account
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr "-"
+msgstr "Hagyja üressen a bevételi számla használatához"
 
 #. module: account
 #: view:account.invoice:0
@@ -8805,6 +9320,12 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Ez a gomb csak akkor látszik, ha a Számla állapota 'fizetve' (a teljes "
+"párosítást, kiegyenlítést mutatva) és automatán számolt 'párosítás' boolean "
+"művelet Hamis (feltételezve, hogy ez már nem feltétel). Más szavakkal, a "
+"számlát ismét párosítatlanná tette és ez már nem érthető úgy mint 'fizetve' "
+"állapotú. Ezt a gombot kell megnyomnia ahhoz, hogy ismét megnyithassa  és "
+"megoldja a lehetséges felmerült körülményeket a folyamat normál elvégzéséhez."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -8824,11 +9345,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy napló létrehozásához.\n"
+"              </p><p>\n"
+"                Egy napló az összes főkönyvi számlákkal kapcsolatos \n"
+"                pénzmozgások rögzítésére szolgál a\n"
+"                mindennapos üzletben.\n"
+"              </p><p>\n"
+"                Egy tipikus vállalkozásban mindegyik fizetési típushoz "
+"hozzárendel\n"
+"                egy naplót (készpénzes, banki számlák, csekkek), egy "
+"beszállítói napló, egy vásárlói napló\n"
+"                és egy a különféle információkra.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr "Üzleti év zárt állapotban"
+msgstr "Zárt állípotú üzleti év"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -8843,7 +9378,7 @@ msgstr "Jóváíró számla napló"
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr "Szűrés"
+msgstr "Szűrés ezzel"
 
 #. module: account
 #: code:addons/account/wizard/account_period_close.py:51
@@ -8851,6 +9386,8 @@ msgstr "Szűrés"
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Egy időszak lezárásához, először le kell könyvelnie az ide vonatkozó napló "
+"bejegyzéseket."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8862,13 +9399,13 @@ msgstr "Vállalatszintű elemzés"
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr "Vevő/szállító főkönyvi számla"
+msgstr "A számlához használt vevő/szállító főkönyvi számla"
 
 #. module: account
 #: code:addons/account/account.py:3391
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Adó %.2f%%"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -8886,7 +9423,7 @@ msgstr "Fizetési feltétel sor"
 #: code:addons/account/account.py:3194
 #, python-format
 msgid "Purchase Journal"
-msgstr "Bejövő számla napló"
+msgstr "Bejövő, beszállítói számla napló"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
@@ -8916,7 +9453,7 @@ msgstr "Fizetési határidő"
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr "Szállítók"
+msgstr "Beszállítók"
 
 #. module: account
 #: view:account.journal:0
@@ -8935,7 +9472,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr "Statisztika"
+msgstr "Statisztikák"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -8950,6 +9487,9 @@ msgid ""
 "computed. Because it is space consuming, we do not allow to use it while "
 "doing a comparison."
 msgstr ""
+"Ez a lehetőség több számlaegyenleg számítási részlethez enged betekintést. "
+"Mivel ez sok helyet emészt fel, nem engedélyezzük hasonlítás használata "
+"esetén."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
@@ -8959,13 +9499,16 @@ msgstr "Üzleti év zárása"
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "A főkönyvi számla számának egyedinek kell lennie!"
+msgstr ""
+"A főkönyvi számla számának egyedinek kell lennie mindegyik vállalkozáshoz!"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
 #: help:product.template,property_account_expense:0
 msgid "This account will be used to value outgoing stock using cost price."
 msgstr ""
+"Ezt a számlát használja a kimenő raktárkészlet megbecsüléséhez a költség "
+"értékek használatával."
 
 #. module: account
 #: view:account.invoice:0
@@ -9003,14 +9546,14 @@ msgstr "Engedélyezett számlák (üres, ha mindegyik)"
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Értékesítési adó (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr "Gyűjtőkód lista"
+msgstr "Analitikus könyvelések számlatükre"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -9028,12 +9571,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új ismétlődő tétel létrehozásához.\n"
+"              </p><p>\n"
+"                Egy ismétlődő tétel keletkezik, ismétlődési alapon egy "
+"megadott \n"
+"                dátumtól, pl. egy szerződés aláírására hivatkozva a vásárló "
+"ügyféllel\n"
+"                vagy egy beszállítóval. Ilyen tételeket tud létrehozni a "
+"rendszer\n"
+"                automatikus könyvelési feladásához.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.journal:0
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr "Egyéb"
+msgstr "Egyebek"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -9044,7 +9599,7 @@ msgstr "A vállalat összes tartozása a szállítóval szemben."
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr "Költségek"
+msgstr "Analitikus költségek"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -9062,7 +9617,7 @@ msgstr "A(z) \"%s\" tétel nem érvényes!"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Legkisebb szöveg"
 
 #. module: account
 #: help:account.config.settings,module_account_check_writing:0
@@ -9070,11 +9625,14 @@ msgid ""
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"Ez lehetővé teszi az írás és nyomtatás ellenőrzését.\n"
+"                Ez account_check_writing (számla_ellenőrzés_írás) modult "
+"telepíti."
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Számlázás & Kifizetések"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -9089,7 +9647,7 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_expense
 #: model:account.financial.report,name:account.account_financial_report_expense0
 msgid "Expense"
-msgstr "Költség"
+msgstr "Kiadások, költségek"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
@@ -9102,13 +9660,15 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"Szabadon választott más pénznemben kifejezett összeg, ha a tétel devizás."
+"Szabadon választott más pénznemben kifejezett összeg, ha a tétel több "
+"pénznembeli devizás."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
+"A főkönyvi számla bizonylat (%s) ehhez a központosításhoz visszaigazolt."
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9147,6 +9707,8 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Itt választhatja ki a létrehozni kívánt jóváírás naplóját. Ha üresen hagyja "
+"ezt a mezőt, akkor a jelenlegi számla naplóját fogja használni."
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -9169,23 +9731,23 @@ msgstr "Párosított tételek"
 #: code:addons/account/account.py:2334
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Rossz modell !"
 
 #. module: account
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "Adó sablon"
 
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr "Időszak"
+msgstr "Időszak kényszerítése"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "Folyószámla kivonat nyomtatása"
+msgstr "Partner folyószámla kivonat nyomtatása"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1121
@@ -9195,6 +9757,9 @@ msgid ""
 "some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
+"Nem hajtja végre ezt a módosítást egy párosított tételen. Egyes nem érvényes "
+"tételt tud, vagy párosítatlanná kell tennie az egészet először.\n"
+"%s."
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9205,6 +9770,12 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"Egy főkönyvi számlához, melyen több a tartozás mint a követelés  és ezt "
+"szeretné nyomtatni mint negatív összegeget a kimutatásain, akkor az előjelet "
+"át kell változtatnia az egyenlegen; pl.: Kiadási, költség számla. Ez szintén "
+"vonatkozik olyan számlákra, melyen több a követelés mint a tartozás és azt "
+"mint pozitív összeget szeretné nyomtatni  a kimutatásain; pl.: Bevételi, "
+"vásárlói számla."
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -9218,7 +9789,7 @@ msgstr "Szerződések"
 #: field:account.financial.report,credit:0
 #: field:account.financial.report,debit:0
 msgid "unknown"
-msgstr "Ismeretlen"
+msgstr "ismeretlen"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -9237,14 +9808,14 @@ msgstr ""
 #: field:account.bank.statement,message_is_follower:0
 #: field:account.invoice,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Ez egy követő"
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,narration:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Belső jegyzet"
 
 #. module: account
 #: constraint:account.account:0
@@ -9253,6 +9824,9 @@ msgid ""
 "You cannot select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
 msgstr ""
+"Beállítási hiba!\n"
+"Nem választhat \"Párosítatlan\" eltolási módtól eltérő főkönyvi számla "
+"típust a \"Kiadási/Bevételi\" belső típusú számlákhoz."
 
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
@@ -9273,6 +9847,7 @@ msgstr ""
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
+"Nem hatástalaníthat olyan főkönyvi számlát, mely napló tételeket tartalmaz."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9299,7 +9874,7 @@ msgstr "Tételsorok"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 msgid "Open Journal"
-msgstr "Nem könyvelt tételek könyvelése"
+msgstr "Napló megnyitása"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9322,7 +9897,7 @@ msgstr "Címlet"
 #: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "Kimenő jóváíró számla napló"
+msgstr "Kimenő, értékesítési jóváíró számla napló"
 
 #. module: account
 #: view:account.move:0
@@ -9339,6 +9914,11 @@ msgid ""
 "chart\n"
 "                        of accounts."
 msgstr ""
+"Ha már egyszer a számla tervezetek le lettek igazolva, többé nem tudja\n"
+"                        azokat módosítani. A számlák egyedi azonosítóval "
+"lesznek \n"
+"                        ellátva és napló bejegyzések készülnek a "
+"számlatükrökben."
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -9353,7 +9933,7 @@ msgstr "Üzleti év és időszakok zárása"
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr ""
+msgstr "Bejövő, beszerzési jóváíró számla napló"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9366,23 +9946,23 @@ msgstr "Termék információ"
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr "Gyűjtőnaplók"
+msgstr "Anaitikus gyűjtőnaplók"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr "Számla készítése"
+msgstr "Számla létrehozás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Könyvelési adatok beállítása"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr "Előzetesen felszámított ÁFA(%)"
+msgstr "Előzetesen felszámított beszerzési ÁFA(%)"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
@@ -9397,11 +9977,13 @@ msgid ""
 "Please check that the field 'Internal Transfers Account' is set on the "
 "payment method '%s'."
 msgstr ""
+"Kérem ellenőrizze, hogy a 'Belső mozgások könyvelési számla' mező be legyen "
+"állítva a '%s' fizetési feltételnél ."
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Részletek mutatása"
 
 #. module: account
 #: code:addons/account/account.py:3203
@@ -9415,14 +9997,14 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
-"A költségek a gyűjtőkódokból származnak. Ezek állítják elő a "
-"számlatervezeteket."
+"Analitikus költségek (időkimutatások, egyes megvásárolt termékek, ...) az "
+"analitikus könyvelésből származnak. Ezek számla tervezeteket hoznak létre."
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr "Tételeim"
+msgstr "Bejegyzéseim"
 
 #. module: account
 #: help:account.invoice,state:0
@@ -9437,6 +10019,18 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
+" * A 'Tervezet' állapotot használja, miután egy felhasználó bevitt egy új, "
+"még nem jóváhagyott Számlát.             \n"
+"* A 'Pro-forma' állapotú amikor a számla díjbekérő, Pro-forma; a számlának "
+"még nincs száma.             \n"
+"* A 'Nyitott' állapotot akkor használja, ha a felhasználó számlát készít,és "
+"egy számlaszámot hoz létre. Addig marad nyitott állapotú, amíg a számla nem "
+"kerül kifizetésre.             \n"
+"* A 'Fizetve' állapot lesz beállítva automatikusan amint a számla "
+"kifizetésre került. A hozzá kapcsolódó napló bejegyzések párosítása vagy "
+"megtörténik vagy nem.             \n"
+"* A 'Visszavont' állapotot használja, ha a felhasználó érvényteleníti a "
+"számlát."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -9456,7 +10050,7 @@ msgstr "Pénzügyi  kimutatások"
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "Felelősség nézet"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9504,12 +10098,12 @@ msgstr "A partnerre hivatkozó vállalatok"
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr "Jóváírás igénylése"
+msgstr "Jóváírás, visszatérítés igénylése"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr "Követel összesen"
+msgstr "Követelés összesen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -9529,18 +10123,18 @@ msgstr "Bizonylat: vevő folyószámla kivonat"
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr "Vevő számlák"
+msgstr "Követelés (vevő) számlák"
 
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Beszállítők jóváírási sorrend"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled."
-msgstr ""
+msgstr "Számla már párosítva volt."
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9552,6 +10146,12 @@ msgid ""
 "payments.\n"
 "                This installs the module account_payment."
 msgstr ""
+"Ez lehetővé teszi hogy létrehozza és kezelje az átutalási megbízásait, egy "
+"könnyű\n"
+"                    * csatoló alapjaként a különböző automatikus fizetési  "
+"szerkezetekhez, és\n"
+"                    * hatékonyabb kezelését a számla fizetéseknek.\n"
+"                Ez a account_payment (számla_kifizetés) modult telepíti.."
 
 #. module: account
 #: xsl:account.transfer:0
@@ -9562,7 +10162,7 @@ msgstr "Dokumentum"
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "Vevő főkönyvi számla"
+msgstr "Bevételi (Vevő) főkönyvi számla"
 
 #. module: account
 #: code:addons/account/account_move_line.py:771
@@ -9570,6 +10170,8 @@ msgstr "Vevő főkönyvi számla"
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
+"A bejegyzések párosításához az összes bejegyzéshez ugyanaz a vállalkozás "
+"szükséges."
 
 #. module: account
 #: field:account.account,balance:0
@@ -9614,12 +10216,12 @@ msgstr "Számla megjelenítése"
 #: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
-msgstr "Szállító"
+msgstr "Szállítónak fizetendő"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "Tábla"
+msgstr "Főkonyvi számla tábla"
 
 #. module: account
 #: view:account.model:0
@@ -9647,7 +10249,7 @@ msgstr "Szűrés"
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "Egységek száma"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -9664,14 +10266,14 @@ msgstr "Kézi tétel"
 #: view:account.move.line:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Bizonylat száma"
+msgstr "Bizonylat"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:478
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Érvénytelen lépés!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -9702,7 +10304,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Ezzel a partnerrel nincs semmilyen lejárat."
 
 #. module: account
 #: help:account.tax,account_paid_id:0
@@ -9710,19 +10312,22 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "refunds. Leave empty to use the expense account."
 msgstr ""
+"Számla beállítása ami alapértelmezetten a számlák adó tételeinek "
+"visszatérítésére szolgál. Hagyja üresen, ha a költség számlát szeretné "
+"használni."
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
-"A kiválasztott sablonnal létrehoz egy főkönyvi számlát a már létező gyűjtő "
-"főkönyvi számla alá."
+"A kiválasztott sablonnal létrehoz egy főkönyvi számlát a már létező "
+"fölérendelt gyűjtő főkönyvi számla alá."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Source"
-msgstr ""
+msgstr "Forrás"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9736,8 +10341,8 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
-"A naplóban meg kell adnia a bankszámlát\n"
-"az egyeztetéshez."
+"A napló leírásban meg kell adnia a bankszámlát\n"
+"az egyeztetéshez, párosításhoz."
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -9745,11 +10350,13 @@ msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Ez a mező tartalmazza ennek a naplónak a bejegyzéseihez tartozó számok "
+"infoormációit."
 
 #. module: account
 #: field:account.invoice,sent:0
 msgid "Sent"
-msgstr ""
+msgstr "Elküldött"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9760,7 +10367,7 @@ msgstr "Általános kimutatás"
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "Alapértelmezett értékesítési adó"
 
 #. module: account
 #: report:account.overdue:0
@@ -9771,7 +10378,7 @@ msgstr "Egyenleg :"
 #: code:addons/account/account.py:1587
 #, python-format
 msgid "Cannot create moves for different companies."
-msgstr ""
+msgstr "Nem tud létrehozni bizonylatot különboző vállalkozásokra."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -9781,14 +10388,14 @@ msgstr "Időszakos feldolgozás"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Vásárlói és Beszállítói számlák"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr "Pénzügyi rendezés tételek"
+msgstr "Pénzügyi rendezés tételei"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9812,7 +10419,7 @@ msgstr "Előjegyzés"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr "Gyűjtőkód kivonat"
+msgstr "Analitikus gyűjtőkód számlaegyenleg"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9845,7 +10452,7 @@ msgstr "Záró időszak"
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "Költség nézet"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
@@ -9856,13 +10463,13 @@ msgstr "Fizetési határidő"
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
-msgstr ""
+msgstr "Azonnali, készpénzes fizetés"
 
 #. module: account
 #: code:addons/account/account.py:1502
 #, python-format
 msgid " Centralisation"
-msgstr ""
+msgstr " Központosítás"
 
 #. module: account
 #: help:account.journal,type:0
@@ -9873,12 +10480,18 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Válassza az 'Értékesítés'-t a a vásárlói számlák naplóihoz. Válassza a "
+"'Beszerzés'-t a beszállítói számlák naplóihoz. Válassza a 'Készpénz'-t vagy "
+"a 'Bank'-ot olyan naplókhoz melyek a vásárlói vagy beszerzési fizetéseket "
+"rögzítik. Válassza az 'Általános'-t az egyéb műveletek naplózásához. "
+"Válassza 'Nyitó/Záró' helyzetet olyan tételekhez amit új üzleti év "
+"generálásához használ."
 
 #. module: account
 #: view:account.subscription:0
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "Előjegyzés"
+msgstr "Főkönyvi számla előjegyzés"
 
 #. module: account
 #: report:account.overdue:0
@@ -9926,6 +10539,8 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"Ez jelzi, hogy a számla ki lett fizetve és a számla napló bejegyzése "
+"párosítva lett a fizetés egy vagy több napló bejegyzésével."
 
 #. module: account
 #: view:account.invoice:0
@@ -9945,7 +10560,7 @@ msgstr "Készpénz befizetése"
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "Rendezetlen"
+msgstr "Rendezetlen, párosítatlan"
 
 #. module: account
 #: code:addons/account/account_invoice.py:922
@@ -9956,7 +10571,7 @@ msgstr "Hibás összesen!"
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "Sorszámozás"
+msgstr "Bevitel sorszámozás"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -9991,7 +10606,7 @@ msgstr "Gyűjtőkód karton (csak mennyiségi)"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "Gyűjtőkódokból"
+msgstr "Analitikus gyűjtőkódokból"
 
 #. module: account
 #: view:account.installer:0
@@ -10010,6 +10625,8 @@ msgid ""
 "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state."
 msgstr ""
+"A kiválasztott számlá(ka)t nem lehet visszavonni mivel már 'Visszavont' vagy "
+"'Elkészített' állapotú."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10036,7 +10653,7 @@ msgstr "Könyvelési tételsorok"
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Összehasonlítás"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1119
@@ -10046,6 +10663,9 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first.\n"
 "%s."
 msgstr ""
+"Nem hagyhatja végre ezt a módosítást egy jóváhagyott bejegyzésen. Csak nem "
+"törvényes mezőket változtathat meg vagy a naplót vissza kell vonni először.\n"
+"%s."
 
 #. module: account
 #: help:account.config.settings,module_account_budget:0
@@ -10056,11 +10676,18 @@ msgid ""
 "analytic account.\n"
 "                This installs the module account_budget."
 msgstr ""
+"Ez lehetővé teszi a könyvelő számára az analitikus és átlátható "
+"költségvetést.\n"
+"                Ha már a mester költségvetés és a költségvetés meg lett "
+"határozva,\n"
+"                a projekt irányító  beállíthatja a tervezett költségeket "
+"mindegyik analitikus könyvelési számlára.\n"
+"                Ez a account_budget (számla_költség) modult telepíti.."
 
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
-msgstr ""
+msgstr "OBI"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10086,7 +10713,7 @@ msgstr "Másodlagos pénznem"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr "Könyvelési tételek jóváhagyása"
+msgstr "Könyvelési tételek bizonylatának jóváhagyása"
 
 #. module: account
 #: field:account.account,credit:0
@@ -10110,7 +10737,7 @@ msgstr "Könyvelési tételek jóváhagyása"
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr "Követel"
+msgstr "Követelés"
 
 #. module: account
 #: view:account.invoice:0
@@ -10131,7 +10758,7 @@ msgstr "Kontírozási modell"
 #: code:addons/account/account.py:1073
 #, python-format
 msgid "Start period should precede then end period."
-msgstr ""
+msgstr "Előbb van az induó időszak és utána a záró időszak."
 
 #. module: account
 #: field:account.invoice,number:0
@@ -10152,7 +10779,7 @@ msgstr "Általános"
 #: field:account.invoice.report,price_total:0
 #: field:account.invoice.report,user_currency_price_total:0
 msgid "Total Without Tax"
-msgstr "Nettó érték"
+msgstr "Nettó, adó nélküli érték"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -10210,13 +10837,13 @@ msgstr "Április"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Nyereség (Veszteség) a kimutatásba"
 
 #. module: account
 #: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Nincs Értékesítés/Beszerzés napló(k) meghatározva."
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -10226,18 +10853,18 @@ msgstr "Megnyitás a párosításhoz"
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr "Bal szülő"
+msgstr "Bal fölérendelt szülő alkalmazás szabályok"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Címmező 2 (kövér)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr "Bejövő számlák"
+msgstr "Bejövő, beszállítói számlák"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -10273,7 +10900,7 @@ msgstr "Könyvelési időszak"
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "Sorok eltávolítása"
+msgstr "Tételsorok eltávolítása"
 
 #. module: account
 #: selection:account.account,type:0
@@ -10294,7 +10921,7 @@ msgstr "Belső típus"
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Előzőleg létrehozott bejegyzések"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -10368,19 +10995,19 @@ msgstr "Eredeti adó"
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr "Üzleti év sorszámok"
+msgstr "Üzleti év sorrendek"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Nincsenek részletek"
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Nem realizált Nyereség vagy veszteség"
 
 #. module: account
 #: view:account.move:0
@@ -10392,12 +11019,12 @@ msgstr "Állapotok"
 #: help:product.category,property_account_income_categ:0
 #: help:product.template,property_account_income:0
 msgid "This account will be used to value outgoing stock using sale price."
-msgstr ""
+msgstr "Ez a főkönyvi számla értékeli a kimenő árukat az eladási ár alapján."
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr "Számla végösszeg"
+msgstr "Számla végösszeg ellenőrzés"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -10409,23 +11036,23 @@ msgstr "Számla végösszeg"
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr "Összesen"
+msgstr "Bruttó érték összesen"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:109
 #, python-format
 msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Nem lehet %s tervezet/proforma/érvénytelenített számla."
 
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Visszatérítés analitikai adógyűjtő számla"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr "Megnyitás a bank egyeztetéshez"
+msgstr "Megnyitás a bank egyeztetéshez, párosításhoz"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -10491,7 +11118,7 @@ msgstr "Esedékesség kelte"
 #: field:cash.box.in,name:0
 #: field:cash.box.out,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Indoklás"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -10519,12 +11146,12 @@ msgstr "Havi időszakok létrehozása"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr "Összegzésnél használt előjel"
+msgstr "Fölérendeltekhez használt előjel"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr "Főkönyvi kivonat"
+msgstr "Próbamérleg kimutatás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -10549,22 +11176,26 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disable"
 msgstr ""
+"Ha párosítatlanná teszi a tranzakciókat, akkor a tranzakciókhoz kapcsolt "
+"tranzakciókat is ellenőriznie kell, mert azok nem lesznek kiiktatva"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "Lehetetlen megváltoztatni az adót!"
 
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
 msgstr ""
+"A kiválasztott naplónak és időszaknak ugyanahhoz a vállalkozáshoz kell "
+"tartoznia."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr "Számlasorok"
+msgstr "Számla tételsorok"
 
 #. module: account
 #: field:account.chart,period_to:0
@@ -10574,7 +11205,7 @@ msgstr "Záró időszak"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "A napló kódjának egyedinek kell lennie!"
+msgstr "A napló kódjának egyedinek kell lennie mindegyik vállalathoz!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10583,6 +11214,9 @@ msgid ""
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"Ebből a kimutatásból, áttekintheti az ehhez a partnerhez tartozó számlázott "
+"összegeket. A kereső eszközzel egyénivé teheti a Számla kimutatásait és így, "
+"az a kívánsága szerinti lesz."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -10593,7 +11227,7 @@ msgstr "A következő partnerre lép"
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr "Különbözet leírása"
+msgstr "Különbözet bizonylat leírása"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -10603,7 +11237,7 @@ msgstr "A számla állapota kész."
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Vásárlói fizetési nyomon követések kezelése"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -10613,7 +11247,7 @@ msgstr "Főkönyvi számlánkénti értékesítési kimutatás"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "ÁFA pozíció"
+msgstr "Főkönyvi számla költségvetési ÁFA pozíció"
 
 #. module: account
 #: report:account.invoice:0
@@ -10625,7 +11259,7 @@ msgstr "ÁFA pozíció"
 #: selection:report.invoice.created,type:0
 #, python-format
 msgid "Supplier Invoice"
-msgstr "Bejövő számla"
+msgstr "Beszállítók bejövő számlái"
 
 #. module: account
 #: field:account.account,debit:0
@@ -10654,18 +11288,18 @@ msgstr "Tartozik"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Címmező 3 (kövér, kisebb)"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "Számlasorok"
+msgstr "Számla téetelsorok"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "A tételek mennyiségi lehetőségei."
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -10675,13 +11309,13 @@ msgstr "Párosított tranzakciók"
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr "Vevő számlák"
+msgstr "Vásárlóktól követelés számlák"
 
 #. module: account
 #: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
-msgstr ""
+msgstr "Már párosítottak."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -10696,7 +11330,7 @@ msgstr "Tartomány"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Beszerzési naplóval összefüggő analitikai napló tételei"
 
 #. module: account
 #: help:account.account,type:0
@@ -10707,6 +11341,11 @@ msgid ""
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"A 'Belső típus' a különböző elérhető számla tulajdonságokat tartalmazza: "
+"nézetnek nem lehet napló bejegyzései, egyeztetett számlák melyek "
+"tartalmazhatnak al-számlákat a több szintes vállalati felépítésnél, "
+"fizetendők/követelések a fölérendelt  főkönyvi számlákhoz (tartozik/követel "
+"számításokhoz), lezárt a leértékelt számlákhoz."
 
 #. module: account
 #: report:account.account.balance:0
@@ -10715,23 +11354,23 @@ msgstr ""
 #: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr "Amelyeken van mozgás"
+msgstr "Amelyeken van bizonylata"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "Adógyűjtő sablon"
+msgstr "Főkönyvi számla adógyűjtő sablon"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr "Manuálisan"
+msgstr "Kézzel"
 
 #. module: account
 #: help:account.move,balance:0
 msgid ""
 "This is a field only used for internal purpose and shouldn't be displayed"
-msgstr ""
+msgstr "Ez a mező belső használatra és nem szabad megjeleníteni"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10745,13 +11384,14 @@ msgstr "December"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Csoportosítás számla dátuma alapján"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Nincs bevételi számla meghatározva ehhez a termékhez: \"%s\" (id:%d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10767,13 +11407,15 @@ msgstr "Alkalmazhatóság"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "Szabadon választott más pénznem, ha a tétel devizás."
+msgstr "Szabadon választott más pénznem, ha a tétel több-devizás."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr "Bejövő vagy kimenő számlából kivonat importálása a rendszerbe"
+msgstr ""
+"Beszállítói bejövő vagy vásárlói kimenő számlából kivonat importálása a "
+"rendszerbe"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -10784,7 +11426,7 @@ msgstr "Számlázás"
 #: view:account.account:0
 #: view:account.analytic.account:0
 msgid "Parent Account"
-msgstr "Gyűjtő főkönyvi számla"
+msgstr "Fölérendelt gyűjtő főkönyvi számla"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -10794,7 +11436,7 @@ msgstr "Típusonkénti főkönyvi számlák"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr "Gyűjtőkód lista"
+msgstr "Analitikai gyűjtőkód lista"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -10804,7 +11446,7 @@ msgstr "A számla végösszegéből még nem rendezett rész."
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Bejegyzések rendezése ezzel"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1546
@@ -10813,6 +11455,7 @@ msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
 "the product."
 msgstr ""
+"A kiválasztott mértékegység nem kompatibilis a termék mértékegységével."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -10836,6 +11479,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy új adó kód létrehozásához.\n"
+"              </p><p>\n"
+"                Országtól függően, az adó kód egy kitöltendő cella a \n"
+"                törvényes adóbevallásában. A rendszer lehetővé teszi az adó\n"
+"                felépítésének és az  adók kiszámításának meghatározását ami "
+"\n"
+"                rögzítésre kerül egy vagy több adó kódhoz.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10862,6 +11515,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Válassza ki a kitölteni kívánt időszakot és naplót.\n"
+"              </p><p>\n"
+"                Ezt a nézetet használja a könyvelő a gyors rendszer beviteli "
+"\n"
+"                rögzítéshez. Ha egy beszállítói számlát szeretne rögzíteni,\n"
+"                akkor a kiadások főkönyvi számlánál kezdje a tétel "
+"rögzítését.\n"
+"                A rendszer fel fogja automatikusan ajánlani az erre a "
+"számlára,\n"
+"                és az ellenszámlára \"Fizetendő főkönyvi számla\", adót.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10872,7 +11538,7 @@ msgstr ""
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "Több számlatükör telepítése"
 
 #. module: account
 #: report:account.general.journal:0
@@ -10892,7 +11558,7 @@ msgstr "Számla keresése"
 #: code:addons/account/account_invoice.py:1159
 #, python-format
 msgid "Refund"
-msgstr "Jóváíró számla"
+msgstr "Visszatérítés"
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
@@ -10922,11 +11588,13 @@ msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Nem tudja eltávolítani/inaktiválni azt a számlát, mely már be lett állítva "
+"egy vásárlóhoz vagy beszállítóhoz."
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr "Könyvelési tételsorok jóváhagyása"
+msgstr "Könyvelési bizonylat tételsorok jóváhagyása"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -10939,7 +11607,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr "A számla állapota kész."
+msgstr "A számla állapota, kész."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
@@ -10950,7 +11618,7 @@ msgstr "Amint a párosítás elkészül, a számla rendezettnek minősül."
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly."
-msgstr ""
+msgstr "Az új pénznem nem megfelelően beállított."
 
 #. module: account
 #: view:account.account.template:0
@@ -10960,18 +11628,18 @@ msgstr "Főkönyvi számla sablonok keresése"
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr "Adók"
+msgstr "Kézzel megadott adók a számlán"
 
 #. module: account
 #: code:addons/account/account_invoice.py:573
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
-msgstr ""
+msgstr "A beszállító fizetési feltételének nincs fizetési feltétel tétele."
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr "Jobb szülő"
+msgstr "Jobb fölérendelt szülő alkalmazás szabályok"
 
 #. module: account
 #. openerp-web
@@ -10979,7 +11647,7 @@ msgstr "Jobb szülő"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:80
 #, python-format
 msgid "Never"
-msgstr ""
+msgstr "Soha"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -10995,12 +11663,12 @@ msgstr "account.addtmpl.wizard"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr "Vevő/szállító számlák"
+msgstr "Partnerek"
 
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Belső jegyzetek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -11014,7 +11682,9 @@ msgstr "Üzleti évek"
 msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
-msgstr "Ha az aktív mező nincs bejelölve, nem használható a gyűjtőnapló."
+msgstr ""
+"Ha az aktív mező hamis, akkor eltüntetheti az analitikus naplót annak "
+"törlése nélkül."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -11025,13 +11695,13 @@ msgstr "Hiv."
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr "Modell"
+msgstr "Főkönyvi számla modell"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Veszteség"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11046,7 +11716,7 @@ msgstr "Február"
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
 msgid "Closing Unit Numbers"
-msgstr "Záró darabszám"
+msgstr "Záró egység számok"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -11061,7 +11731,7 @@ msgstr "Bankszámla"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr "Központi napló"
+msgstr "Főkönyvi számla központi napló"
 
 #. module: account
 #: report:account.overdue:0
@@ -11103,7 +11773,7 @@ msgstr "Beszerzés főkönyvi számla a terméksablonban"
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Vásárló fizetési feltétele"
 
 #. module: account
 #: help:accounting.report,label_filter:0
@@ -11111,11 +11781,13 @@ msgid ""
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
 msgstr ""
+"Ez a címke lesz feltüntetve a kimutatásokon a megadott összehasonlító szűrő "
+"szerint kiszámított egyenleg megmutatásához."
 
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr ""
+msgstr "Tételenkénti kerekítés"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
diff --git a/addons/sale_mrp/i18n/th.po b/addons/sale_mrp/i18n/th.po
new file mode 100644
index 00000000000..d055e4b93c8
--- /dev/null
+++ b/addons/sale_mrp/i18n/th.po
@@ -0,0 +1,43 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-12 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-13 05:52+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""

From 04837c244fe5c70bbb81a470e169f99b11a8c93e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 17 Dec 2013 06:13:56 +0000
Subject: [PATCH 477/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131217061356-7230cnvseunpundw
---
 addons/account/i18n/hu.po         | 650 ++++++++++++++++++------------
 addons/account_voucher/i18n/hu.po |  28 +-
 2 files changed, 416 insertions(+), 262 deletions(-)

diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 3cb9c6f4ac8..20001edfe29 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-12-15 18:58+0000\n"
+"PO-Revision-Date: 2013-12-16 21:23+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-16 05:35+0000\n"
+"X-Launchpad-Export-Date: 2013-12-17 06:13+0000\n"
 "X-Generator: Launchpad (build 16869)\n"
 
 #. module: account
@@ -42,7 +42,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "the parent company"
-msgstr "a szülő vállalat"
+msgstr "A fölérendelt vállalat"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -249,7 +249,7 @@ msgstr "Adósablonok"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Tételsor párosítás kiválasztása"
+msgstr "Bizonylat tételsor párosítás kiválasztása"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -475,8 +475,8 @@ msgstr ""
 "Ez lehetővé teszi a személy vagy vállalat által birtokolt vagyoneszközök "
 "nyilvántartását.\n"
 "                A vagyoneszközök értékcsökkenését követi nyomon, és "
-"könyvelési számlák közt mozgatja ezeket az értékcsökkenő\n"
-"                tételeket.\n"
+"könyvelési számlák bizonylatát hozza létre az értékcsökkenő\n"
+"                tételekre.\n"
 "                Ez a account_asset (számla_eszköz) modult telepíti. Ha nem "
 "jelöli be ezt a kockát, akkor tud számlázni & kifizetni,\n"
 "                de nem tud könyvelni (Napló tételeket, Számlatükröket, ...)"
@@ -591,7 +591,7 @@ msgstr "Kiválasztott számlák jóváhagyása"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr "Gyűjtő célszámla"
+msgstr "Fölérendelt gyűjtő célszámla"
 
 #. module: account
 #: help:account.invoice.line,sequence:0
@@ -686,7 +686,7 @@ msgstr "3 havonta"
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr "Sorszámok"
+msgstr "Sorba rendezések"
 
 #. module: account
 #: field:account.financial.report,account_report_id:0
@@ -701,8 +701,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
-"A kiválasztott napló nem rendelkezik tervezet állapotú számla mozgásokkal  "
-"erre az időszakra."
+"A kiválasztott napló nem rendelkezik tervezet állapotú számla bizonylatokkal "
+" erre az időszakra."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -767,7 +767,7 @@ msgstr "Számlatípusonkénti értékesítés SZTÉ"
 #: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr "Nem lehet mozgást végrehajtani, ha eltér a pénznem ettől .."
+msgstr "Nem lehet bizonylatolni, ha eltér a pénznem ettől .."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -775,6 +775,8 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: account
 #: view:account.period:0
@@ -808,7 +810,7 @@ msgstr ""
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr "Egy időszakra csak egy mozgatást végezhet  a központi naplón."
+msgstr "Egy időszakra csak egy bizonylatot készíthet  a központi naplón."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -1007,7 +1009,7 @@ msgstr ""
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "Naplókód/Megnevezés"
+msgstr "Naplókód/Bizonylat megnevezés"
 
 #. module: account
 #: view:account.account:0
@@ -1028,7 +1030,7 @@ msgstr "Szeptember"
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
 msgid "Latest Manual Reconciliation Processed:"
-msgstr ""
+msgstr "Utolsó kézi párosítás végrehajtása:"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -1050,6 +1052,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Nem talált jelentés tartalmat.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1677
@@ -1167,7 +1173,7 @@ msgstr "Bankkivonat"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Tételsor mozgatás"
+msgstr "Bizonylat tételsor"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1442,7 +1448,7 @@ msgstr "Adókód"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Kimenő csökkenéseknél használt árfolyam"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1458,7 +1464,7 @@ msgstr "Helyzet"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "A tételsor bizonylatszáma."
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1488,7 +1494,7 @@ msgstr "Egyebek"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr "Feliratkozási vázlat"
+msgstr "Feliratkozási tervezet"
 
 #. module: account
 #: view:account.account:0
@@ -1649,7 +1655,7 @@ msgstr "Számla állapota"
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Closing Entries"
-msgstr ""
+msgstr "Záró tételek visszavonása"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1836,7 +1842,7 @@ msgstr "Ismétlődő"
 #. module: account
 #: report:account.invoice:0
 msgid "TIN :"
-msgstr ""
+msgstr "TIN :"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1867,7 +1873,7 @@ msgstr "Feladatlan napló tételek"
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr ""
+msgstr "Fizethető számla"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -2026,7 +2032,7 @@ msgid ""
 "The journal must have centralized counterpart without the Skipping draft "
 "state option checked."
 msgstr ""
-"A naplónak a vázlat állapot átugrás lehetőség beállítása nélküli központi "
+"A naplónak, a vázlat állapot átugrás lehetőség beállítása nélküli, központi "
 "ellenszámlával kell rendelkeznie."
 
 #. module: account
@@ -2254,8 +2260,8 @@ msgstr ""
 "              </p><p>\n"
 "                Figyelemmel kísérheti a beszállítótól érkezett számlákat\n"
 "               attól függően, hogy mit vásárolt vagy mi érkezett be. \n"
-"               OpenERP létre tud hozni számla vázlatokat automatikusan\n"
-"                a beszerzési megrendelésből vagy vásárlási nyuktákból.\n"
+"               A rendszer létre tud hozni számla tervezetet automatikusan\n"
+"                a beszerzési megrendelésből vagy vásárlási nyugtákból.\n"
 "              </p>\n"
 "            "
 
@@ -2465,7 +2471,7 @@ msgstr "Szép munka!"
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Eszközök adatkezelése"
 
 #. module: account
 #: view:account.account:0
@@ -2704,7 +2710,7 @@ msgstr "Tételek sorbarendezésének alapja"
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Változtatás erre"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2878,7 +2884,7 @@ msgstr "Főkönyvi számla tulajdonságai"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr "Visszatérítés vázlat számla készítése"
+msgstr "Visszatérítés tervezet számla készítése"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2954,7 +2960,7 @@ msgstr "Megújítandó számlák"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Főkönyvi számla modelltételek"
 
 #. module: account
 #: code:addons/account/account.py:3202
@@ -3009,12 +3015,12 @@ msgstr "Kivonatok"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Mozgás megnevezése"
+msgstr "Bizonylat megnevezése"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr "Könyvelési tételsor mozgás párosítása (leírás)"
+msgstr "Főkönyvi számla bizonylet tételsor párosítása (leírás)"
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_tax
@@ -3075,7 +3081,7 @@ msgstr "Beállítási hiba!"
 #: code:addons/account/account_bank_statement.py:434
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
-msgstr "%s kivonat rögzítve, napló tétel létre lett hozva."
+msgstr "%s kivonat rögzítve, napló tétel létrehozva."
 
 #. module: account
 #: field:account.invoice.report,price_average:0
@@ -3217,7 +3223,7 @@ msgstr "Dátumok"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr "Szülő számlatükör sablon"
+msgstr "Fölérendelt számlatükör sablon"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3281,7 +3287,7 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
-"A kiválasztott számla(k) nem erősíthetők meg mivel nem 'Vázlat' vagy 'Pro-"
+"A kiválasztott számla(k) nem erősíthetők meg mivel nem 'Tervezet' vagy 'Pro-"
 "Forma' állapotúak."
 
 #. module: account
@@ -3598,7 +3604,7 @@ msgstr ""
 #: code:addons/account/account.py:2678
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr "Nincs szülő kódja a főkönyvi számla sablonhoz."
+msgstr "Nincs fölérendelt kódja a főkönyvi számla sablonhoz."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3879,7 +3885,7 @@ msgstr "Főkönyvi számla időszak"
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
-"A számla minden mozgásának ebben a másodlagos pénznemben kell végbemennie."
+"A számla minden bizonylatának ebben a másodlagos pénznemben kell végbemennie."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -4154,7 +4160,7 @@ msgid ""
 msgstr ""
 "Lehetősége lesz szerkeszteni és érvényesíteni ezt a\n"
 "                                    jóváírási értesítést közvetlenül vagy "
-"hagyja vázlatként,\n"
+"hagyja tervezetként,\n"
 "                                    amíg a dokumentumot a "
 "vásárlónak/beszállítótól\n"
 "                                    nem bocsájtja ki."
@@ -4510,8 +4516,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
-"Ha havi időszakok lettek létrehozva. Az állapot 'Vázlat'. A hónap végi "
-"állapot 'Elvégezve' lesz."
+"Ha havi időszakok létrehozva. Az állapot 'Tervezet'. A hónap végi állapot "
+"'Elkészítve' lesz."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4593,7 +4599,7 @@ msgstr "Adók teljes csomagja"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Full Reconciliation Date"
-msgstr ""
+msgstr "Utolsó teljes párosítás dátuma"
 
 #. module: account
 #: field:account.account,name:0
@@ -4886,7 +4892,7 @@ msgstr "Adósablonok keresése"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr "Könyveletlen (Vázlat) tételek"
+msgstr "Könyveletlen (Tervezet) tételek"
 
 #. module: account
 #: help:account.config.settings,decimal_precision:0
@@ -5057,7 +5063,7 @@ msgstr "Megjegyzés"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Elentétes oldalú számla egyenleg előjele"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -5162,7 +5168,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Add an internal note..."
-msgstr ""
+msgstr "Belső jegyzet hozzáadása..."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -5303,8 +5309,8 @@ msgid ""
 "You cannot create an account which has parent account of different company."
 msgstr ""
 "Hiba!\n"
-"Nem hozhat létre más vállalkozásnál szülő számlával rendelkező főkönyvi "
-"számlát."
+"Nem hozhat létre más vállalkozásnál fölérendelt számlával rendelkező "
+"főkönyvi számlát."
 
 #. module: account
 #: code:addons/account/account_invoice.py:658
@@ -5382,7 +5388,7 @@ msgstr "Érvénytelenített"
 #: code:addons/account/account.py:1903
 #, python-format
 msgid " (Copy)"
-msgstr ""
+msgstr " (Másolás)"
 
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
@@ -5468,7 +5474,7 @@ msgstr "Adógyűjtő kód (jóváíró számlák)"
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice "
-msgstr ""
+msgstr "Számla "
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5482,9 +5488,9 @@ msgid ""
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
-"Ha létre lett hozva a napló időtartam. Az állapota 'Vázlat' lesz. Ha a "
+"Ha létre lett hozva a napló időtartam. Az állapota 'Tervezet' lesz. Ha a "
 "kimutatás ki lett nyomtatva akkor annak állapota 'Kinyomtatva' lesz. Ha "
-"minden tranzakció el lett végezve akkor 'Elvégzve' állapotú lesz."
+"minden tranzakció el lett végezve akkor 'Elkészített' állapotú lesz."
 
 #. module: account
 #: code:addons/account/account.py:3205
@@ -5495,7 +5501,7 @@ msgstr "Különb."
 #. module: account
 #: view:res.partner:0
 msgid "Accounting-related settings are managed on"
-msgstr ""
+msgstr "Könyveléssel-kapcsolatos beállítások kezelése ezzel"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -5654,7 +5660,7 @@ msgstr "Számítás"
 #. module: account
 #: view:account.invoice:0
 msgid "Additional notes..."
-msgstr ""
+msgstr "Kiegészítő jegyzetek..."
 
 #. module: account
 #: field:account.tax,type_tax_use:0
@@ -5699,7 +5705,7 @@ msgstr "Időszak vége"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Számlák kiegyenlítése"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -5719,7 +5725,7 @@ msgstr "Üzleti év nyitó tételeinek előállítása"
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Könyvelő"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -5749,7 +5755,7 @@ msgstr "Zárás"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Mozgások"
+msgstr "Bizonylatok"
 
 #. module: account
 #: field:account.bank.statement,details_ids:0
@@ -5765,7 +5771,7 @@ msgstr "ÁFA-bevallás"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cancel Statement"
-msgstr ""
+msgstr "Bizonylat elvetése"
 
 #. module: account
 #: help:account.config.settings,module_account_accountant:0
@@ -5794,7 +5800,7 @@ msgstr "Sablonok"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Adó leírása"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5843,7 +5849,7 @@ msgstr "Analitikus gyűjtőkód számlaegyenleg -"
 #: field:account.vat.declaration,target_move:0
 #: field:accounting.report,target_move:0
 msgid "Target Moves"
-msgstr "Figyelembe vett tételek"
+msgstr "Figyelembe vett bizonylat tételek"
 
 #. module: account
 #: code:addons/account/account.py:1454
@@ -5851,8 +5857,8 @@ msgstr "Figyelembe vett tételek"
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
-"Ha a mozgás hozzá van rendelve egy számlához, akkor az nem törölhető. "
-"(Számla: %s - Mozgás azonosító ID:%s)"
+"Ha a bizonylet van rendelve egy számlához, akkor az nem törölhető. (Számla: "
+"%s - Bizonylat azonosító ID:%s)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5907,7 +5913,7 @@ msgstr ""
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Folyószámlajelentés"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -6097,7 +6103,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Fölérendeltekhez használt előjel"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -6230,7 +6236,7 @@ msgstr "Kezdeti számlaegyenlegeket beleértve"
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Tax Codes"
-msgstr ""
+msgstr "Adógyűjtőkódok"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -6260,7 +6266,7 @@ msgstr "Üzeit évet záró napló tételek"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr "Visszetérítés vázlat "
+msgstr "Visszetérítés tervezet "
 
 #. module: account
 #: view:cash.box.in:0
@@ -6428,6 +6434,9 @@ msgid ""
 "number).  You can set it back to \"Draft\" state and modify its content, "
 "then re-confirm it."
 msgstr ""
+"Nem törölheti a már érvényesített számlát (és kapott egy számot). "
+"Visszaállíthatja 'Tervezet' állapotba és módosíthatja a tartalmát, utána "
+"újra-jóváhagyhatja."
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -6448,12 +6457,12 @@ msgstr "Nullánál hoszabb időszakot kell használnia."
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Költségvetési ÁFA pozíció sablon"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr "Visszetérítés vázlat"
+msgstr "Visszetérítés tervezet"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6504,7 +6513,7 @@ msgstr "Fix összeg"
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
-"Nem tudja megváltoztatni az adó, el kell távolítania és létre kell hoznia "
+"Nem tudja megváltoztatni az adót, el kell távolítania és létre kell hoznia "
 "tételeket."
 
 #. module: account
@@ -6550,13 +6559,13 @@ msgstr "Analitikus gyűjtőnaplók"
 #. module: account
 #: field:account.account,child_id:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Alárendelt főkönyvi számlák"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr "Mozgatás neve (Azonosító id): %s (%s)"
+msgstr "Bizonlyat neve (Azonosító id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6573,7 +6582,7 @@ msgstr "bevitt tételek"
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Fizetendő tartozás összesen"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
@@ -6604,7 +6613,7 @@ msgstr "Március"
 #: code:addons/account/account.py:1031
 #, python-format
 msgid "You can not re-open a period which belongs to closed fiscal year"
-msgstr ""
+msgstr "Nem tudja újra megnyitni a már lezárt üzleti évhez tartozó időszakot"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -6874,7 +6883,7 @@ msgstr "Több pénznemes környezetet tesz elérhetővé"
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Jegyzés futtatás"
 
 #. module: account
 #: report:account.invoice:0
@@ -7186,7 +7195,7 @@ msgstr "Belső mozgások számlája"
 #: code:addons/account/wizard/pos_box.py:32
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
-msgstr "Kérem ellenőrizze, hogy a 'Napló' beállítását a banki kivonaton"
+msgstr "Kérem ellenőrizze, a 'Napló' beállítását a banki kivonaton"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -7294,7 +7303,7 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
-"A sorszám mező szolgál az adósorok sorba rendezésére az alacsonyabb "
+"A sorrend mező szolgál az adósorok sorba rendezésére az alacsonyabb "
 "sorszámútól a magasabbig. A sorrend fontos a több alárendelt adóval "
 "rendelkező adók esetében. Ebben az esetben az értékelési sorrend lényeges."
 
@@ -7436,7 +7445,7 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
-"Nem lett meghatározva időszak erre a dátumra: %s.\n"
+"Nincs meghatározva időszak erre a dátumra: %s.\n"
 "Kérem hozzon létre egyet."
 
 #. module: account
@@ -7864,8 +7873,8 @@ msgstr "Adók teljes csomagja"
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state."
 msgstr ""
-"Válassza ki azokat a bejegyzés tételeket, melyeknek nincs vázlat állapotú "
-"számla mozgás bejegyzése."
+"Válassza ki azokat a bejegyzés tételeket, melyeknek nincs tervezet állapotú "
+"számla bizonlyat bejegyzése."
 
 #. module: account
 #: view:account.chart.template:0
@@ -7958,7 +7967,7 @@ msgstr "Értékesítésekkor használt adók"
 #. module: account
 #: view:account.period:0
 msgid "Re-Open Period"
-msgstr ""
+msgstr "Időszak újra-nyitás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -8030,13 +8039,12 @@ msgstr "Forrás dokumentum"
 #: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
-"Nem lett kiadási számla meghatározva ehhez a termékhez: \"%s\" (id:%d)."
+msgstr "Nincs kiadási számla meghatározva ehhez a termékhez: \"%s\" (id:%d)."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Internal notes..."
-msgstr ""
+msgstr "Belső jegyzet..."
 
 #. module: account
 #: constraint:account.account:0
@@ -8119,7 +8127,7 @@ msgstr "Vásárlói hivatkozás"
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr "Gyűjtő főkönyvi számla sablon"
+msgstr "Felérendelt gyűjtő főkönyvi számla sablon"
 
 #. module: account
 #: report:account.invoice:0
@@ -8360,7 +8368,7 @@ msgid ""
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
-"Nem lett alapértelmezett követelés számla meghatározva a \n"
+"Nincs alapértelmezett követelés számla meghatározva a \n"
 "következő naplón \"%s\"."
 
 #. module: account
@@ -8427,7 +8435,7 @@ msgstr "Gyökér/Nézet"
 #: code:addons/account/account.py:3206
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
 
 #. module: account
 #: report:account.invoice:0
@@ -8526,7 +8534,7 @@ msgid ""
 msgstr ""
 "Ez a lehetőség mező lehetővé teszi egy számla sablon hozzáillesztését egy "
 "jellegzetes számlatükör sablonhoz, mely különbözhet az eredeti gyökér "
-"szülőtől, amihez tartozik. Ez lehetővé teszi olyan számlatükör "
+"fölérendeltektől, amihez tartozik. Ez lehetővé teszi olyan számlatükör "
 "meghatározását mely másikat kibővít és kiegészíti egy pár új számlával (Nem "
 "kell többször a mindegyikre jellemző teljes felépítést újra meghatároznia)."
 
@@ -8646,7 +8654,7 @@ msgstr "Jóváírás jegyzet sorrend"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Tételek könyvelése"
+msgstr "Napló tételek könyvelése"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -8700,22 +8708,22 @@ msgstr ""
 #: field:account.tax.code,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr "Sorszám"
+msgstr "Sorrend"
 
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Paypal számla"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Napló tétel száma"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Fölérendelt gyűjtő kimutatás"
 
 #. module: account
 #: constraint:account.account:0
@@ -8724,6 +8732,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Hiba!\n"
+"Nem hozhat létre visszatérő számlákat."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
@@ -8738,7 +8748,7 @@ msgstr "Kapcsolódás az automatikusan létrehozott könyvelési tételekhez"
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -8761,19 +8771,19 @@ msgstr "Számított egyenleg"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
 #, python-format
 msgid "You must choose at least one record."
-msgstr ""
+msgstr "Választani kell legalább egy rekordot!"
 
 #. module: account
 #: field:account.account,parent_id:0
 #: field:account.financial.report,parent_id:0
 msgid "Parent"
-msgstr "Gyűjtő fk.szla"
+msgstr "Fölérendelt"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Profit"
-msgstr ""
+msgstr "Nyereség"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -8798,6 +8808,8 @@ msgid ""
 "You cannot delete an invoice which is not draft or cancelled. You should "
 "refund it instead."
 msgstr ""
+"Nem törölheti a számlákat, ha azok nem tervezetek vagy nem kerültek "
+"visszavonásra. Inkább jóvá kell írnia azokat."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -8816,7 +8828,7 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
-"A sorszám mező szolgál az adósorok sorba rendezésére a legalacsonyabb "
+"A sorrend mező szolgál az adósorok sorba rendezésére a legalacsonyabb "
 "sorszámútól a legmagasabbig. A sorrend fontos a több alárendelt adóval "
 "rendelkező adók esetében. Ebben az esetben az értékelési sorrend lényeges."
 
@@ -8828,7 +8840,7 @@ msgstr "Pénzkazetta tétel sor"
 #. module: account
 #: field:account.installer,charts:0
 msgid "Accounting Package"
-msgstr ""
+msgstr "Könyvelési csomag"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -8838,7 +8850,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "Folyószámla karton"
+msgstr "Partner folyószámla karton"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -8858,22 +8870,22 @@ msgstr "Figyelem!"
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Adó számításhoz a kerekítés módja"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "Tételsor állapota"
+msgstr "Bizonylat tételsor állapota"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr "Tételpárosítás"
+msgstr "Főkönyvi számla bizonylat tételpárosítás"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -8914,7 +8926,7 @@ msgstr "Partner"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr "Válassza ki az alkalmazandó új pénznemet"
+msgstr "Válassza ki a számlázásnál alkalmazandó új pénznemet"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
@@ -8925,7 +8937,7 @@ msgstr "Nincsenek számlasorok!"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Kimutatás típus"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8938,7 +8950,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr "Alkalmazási terület"
+msgstr "Adó alkalmazási terület"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:382
@@ -8971,6 +8983,8 @@ msgstr "Automatikus tétel"
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
 msgstr ""
+"Jelölje be a négyzetet, ha ez a főkönyvi számla lehetővé tesz ia napló "
+"bejegyzéseken a párosításokat."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -8981,7 +8995,7 @@ msgstr "Partner fizetési feltétel"
 #: help:account.move.reconcile,opening_reconciliation:0
 msgid ""
 "Is this reconciliation produced by the opening of a new fiscal year ?."
-msgstr ""
+msgstr "Ezt a párosítást egy új üzleti év nyitása hajtotta végre ?."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8992,7 +9006,7 @@ msgstr "Analitikus gyűjtőkód tételek"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr "Társult partner"
+msgstr "Társított partner"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1465
@@ -9003,7 +9017,7 @@ msgstr "Először partnert kell választani!"
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr "Egyéb megjegyzés"
+msgstr "További információ"
 
 #. module: account
 #: field:account.invoice.report,residual:0
@@ -9041,7 +9055,7 @@ msgstr "A számla állapota nyitott."
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "Status"
-msgstr "Státusz"
+msgstr "Állapot"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -9054,7 +9068,7 @@ msgstr "Gyűjtőkód karton"
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr "Ehhez a vállalkozáshoz nem lett üzleti adóügyi év meghatározva"
+msgstr "Ehhez a vállalkozáshoz nincs üzleti adóügyi év meghatározva"
 
 #. module: account
 #: view:account.invoice:0
@@ -9064,7 +9078,7 @@ msgstr "Pro forma"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr "Naplókód/Megnevezés"
+msgstr "Naplókód/Bizonylat megnevezés"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -9079,13 +9093,13 @@ msgstr ""
 #: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Bejövő jóváíró számla napló"
+msgstr "Bejövő, beszállítói  jóváíró számla napló"
 
 #. module: account
 #: code:addons/account/account.py:1333
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Kérem egy sorozat meghatározását a naplón."
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -9095,12 +9109,12 @@ msgstr "Százalék típusú adókra a %-ot 0-1 közötti számként adja meg."
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "Jelenlegi számlák"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Számla dátuma szerinti csoportosítása"
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -9114,6 +9128,10 @@ msgid ""
 "recalls.\n"
 "                This installs the module account_followup."
 msgstr ""
+"Ez engedélyezi az automatikus leveleket a kiegyenlítetlen számlákra, több-"
+"szintű visszahívással.\n"
+"                Ez a account_followup (számla_nyomon követés) modult "
+"telepíti.."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -9146,22 +9164,24 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Teljes mennyiség (a vállalkozás pénznemében) a számlán második pénznemben "
+"tartott tranzakciókra."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Net Total:"
-msgstr "Nettó érték:"
+msgstr "Teljes nettó érték:"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Válasszon egy induló és egy befejező időszakot."
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Következő számla szám"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -9181,7 +9201,7 @@ msgstr "Árbevétel főkönyvi számla"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Módosított egyenleg"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -9265,7 +9285,9 @@ msgstr "Központi ellenszámla"
 msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
-msgstr "Bejelölheti ezt a négyzetet, hogy jelezze, hogy a tétel peresített."
+msgstr ""
+"Bejelölheti ezt a négyzetet, hogy jelezze a napló tételen, hogy a tétel "
+"peresített a hozzá tartozó ügyféllel."
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -9276,12 +9298,12 @@ msgstr "Részleges párosítás"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr "Fordított gyűjtőkód kivonat"
+msgstr "Analitikus számla fordított gyűjtőkód kivonat"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr "Általános kimutatás"
+msgstr "Főkönyvi számla általános kimutatás"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -9293,6 +9315,12 @@ msgid ""
 "invoice will be created \n"
 "                                    so that you can edit it."
 msgstr ""
+"Használja ezt a lehetőséget ha törölni szeretné ezt és másikat létrehozni \n"
+"                                    helyette. Jóváíró számla lesz "
+"létrehozva, érvényesítve és párosítva\n"
+"                                    a jelenlegi számlával. Egy szerkeszthető "
+"új, tervezet, számla lesz\n"
+"                                    létrehozva."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -9302,12 +9330,12 @@ msgstr "Bankkivonat automatikus importálása"
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr "Bank egyeztetés"
+msgstr "Banki bizonylat egyeztetés"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Alkalmaz"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -9319,7 +9347,7 @@ msgstr "Főkönyvi számlatípusok"
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Számla (Ref ${object.number or 'n/a'})"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1210
@@ -9328,6 +9356,8 @@ msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal."
 msgstr ""
+"Nem használhatja ezt az általános főkönyvi számlát ebben a naplóban, "
+"ellenőrizze az ide vonatkozó naplón a 'Beviteli felügyelet' fület."
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -9351,7 +9381,7 @@ msgstr "Párosítás"
 #. module: account
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr "-"
+msgstr "Hagyja üressen a bevételi számla használatához"
 
 #. module: account
 #: view:account.invoice:0
@@ -9363,6 +9393,12 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Ez a gomb csak akkor látszik, ha a Számla állapota 'fizetve' (a teljes "
+"párosítást, kiegyenlítést mutatva) és automatán számolt 'párosítás' boolean "
+"művelet Hamis (feltételezve, hogy ez már nem feltétel). Más szavakkal, a "
+"számlát ismét párosítatlanná tette és ez már nem érthető úgy mint 'fizetve' "
+"állapotú. Ezt a gombot kell megnyomnia ahhoz, hogy ismét megnyithassa  és "
+"megoldja a lehetséges felmerült körülményeket a folyamat normál elvégzéséhez."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9400,7 +9436,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr "Üzleti év zárt állapotban"
+msgstr "Zárt állípotú üzleti év"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -9415,7 +9451,7 @@ msgstr "Jóváíró számla napló"
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr "Szűrés"
+msgstr "Szűrés ezzel"
 
 #. module: account
 #: code:addons/account/wizard/account_period_close.py:51
@@ -9423,6 +9459,8 @@ msgstr "Szűrés"
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Egy időszak lezárásához, először le kell könyvelnie az ide vonatkozó napló "
+"bejegyzéseket."
 
 #. module: account
 #: view:account.entries.report:0
@@ -9434,13 +9472,13 @@ msgstr "Vállalatszintű elemzés"
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr "Vevő/szállító főkönyvi számla"
+msgstr "A számlához használt vevő/szállító főkönyvi számla"
 
 #. module: account
 #: code:addons/account/account.py:3391
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Adó %.2f%%"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -9458,7 +9496,7 @@ msgstr "Fizetési feltétel sor"
 #: code:addons/account/account.py:3194
 #, python-format
 msgid "Purchase Journal"
-msgstr "Bejövő számla napló"
+msgstr "Bejövő, beszállítói számla napló"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
@@ -9488,7 +9526,7 @@ msgstr "Fizetési határidő"
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr "Szállítók"
+msgstr "Beszállítók"
 
 #. module: account
 #: view:account.journal:0
@@ -9498,7 +9536,7 @@ msgstr "Engedélyezett főkönyvi számlatípusok (üres, ha mindegyik)"
 #. module: account
 #: view:account.payment.term:0
 msgid "Payment term explanation for the customer..."
-msgstr ""
+msgstr "Fizetési feltétel magyarázata a vásárló felé..."
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -9512,7 +9550,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr "Statisztika"
+msgstr "Statisztikák"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -9527,6 +9565,9 @@ msgid ""
 "computed. Because it is space consuming, we do not allow to use it while "
 "doing a comparison."
 msgstr ""
+"Ez a lehetőség több számlaegyenleg számítási részlethez enged betekintést. "
+"Mivel ez sok helyet emészt fel, nem engedélyezzük hasonlítás használata "
+"esetén."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
@@ -9536,13 +9577,16 @@ msgstr "Üzleti év zárása"
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "A főkönyvi számla számának egyedinek kell lennie!"
+msgstr ""
+"A főkönyvi számla számának egyedinek kell lennie mindegyik vállalkozáshoz!"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
 #: help:product.template,property_account_expense:0
 msgid "This account will be used to value outgoing stock using cost price."
 msgstr ""
+"Ezt a számlát használja a kimenő raktárkészlet megbecsüléséhez a költség "
+"értékek használatával."
 
 #. module: account
 #: view:account.invoice:0
@@ -9580,7 +9624,7 @@ msgstr "Engedélyezett számlák (üres, ha mindegyik)"
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Értékesítési adó (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9612,9 +9656,9 @@ msgstr ""
 "megadott \n"
 "                dátumtól, pl. egy szerződés aláírására hivatkozva a vásárló "
 "ügyféllel\n"
-"                vagy egy beszállítóval. Ilyen tételeket automatikusan tud "
-"kitenni\n"
-"                a rendszer által.\n"
+"                vagy egy beszállítóval. Ilyen tételeket tud létrehozni a "
+"rendszer\n"
+"                automatikus könyvelési feladásához.\n"
 "              </p>\n"
 "            "
 
@@ -9622,7 +9666,7 @@ msgstr ""
 #: view:account.journal:0
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr "Egyéb"
+msgstr "Egyebek"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -9651,7 +9695,7 @@ msgstr "A(z) \"%s\" tétel nem érvényes!"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Legkisebb szöveg"
 
 #. module: account
 #: help:account.config.settings,module_account_check_writing:0
@@ -9659,11 +9703,14 @@ msgid ""
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"Ez lehetővé teszi az írás és nyomtatás ellenőrzését.\n"
+"                Ez account_check_writing (számla_ellenőrzés_írás) modult "
+"telepíti."
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Számlázás & Kifizetések"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -9678,7 +9725,7 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_expense
 #: model:account.financial.report,name:account.account_financial_report_expense0
 msgid "Expense"
-msgstr "Költség"
+msgstr "Kiadások, költségek"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
@@ -9691,14 +9738,15 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"Szabadon választott más pénznemben kifejezett összeg, ha a tétel devizás."
+"Szabadon választott más pénznemben kifejezett összeg, ha a tétel több "
+"pénznembeli devizás."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
-"A főkönyvi számla mozgatás (%s) ehhez a központosításhoz visszaigazolt."
+"A főkönyvi számla bizonylat (%s) ehhez a központosításhoz visszaigazolt."
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9737,6 +9785,8 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Itt választhatja ki a létrehozni kívánt jóváírás naplóját. Ha üresen hagyja "
+"ezt a mezőt, akkor a jelenlegi számla naplóját fogja használni."
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -9759,13 +9809,13 @@ msgstr "Párosított tételek"
 #: code:addons/account/account.py:2334
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Rossz modell !"
 
 #. module: account
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "Adó sablon"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -9775,7 +9825,7 @@ msgstr "Időszak kényszerítése"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "Folyószámla kivonat nyomtatása"
+msgstr "Partner folyószámla kivonat nyomtatása"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1121
@@ -9785,6 +9835,9 @@ msgid ""
 "some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
+"Nem hajtja végre ezt a módosítást egy párosított tételen. Egyes nem érvényes "
+"tételt tud, vagy párosítatlanná kell tennie az egészet először.\n"
+"%s."
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9795,6 +9848,12 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"Egy főkönyvi számlához, melyen több a tartozás mint a követelés  és ezt "
+"szeretné nyomtatni mint negatív összegeget a kimutatásain, akkor az előjelet "
+"át kell változtatnia az egyenlegen; pl.: Kiadási, költség számla. Ez szintén "
+"vonatkozik olyan számlákra, melyen több a követelés mint a tartozás és azt "
+"mint pozitív összeget szeretné nyomtatni  a kimutatásain; pl.: Bevételi, "
+"vásárlói számla."
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -9808,7 +9867,7 @@ msgstr "Szerződések"
 #: field:account.financial.report,credit:0
 #: field:account.financial.report,debit:0
 msgid "unknown"
-msgstr "Ismeretlen"
+msgstr "ismeretlen"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -9827,14 +9886,14 @@ msgstr ""
 #: field:account.bank.statement,message_is_follower:0
 #: field:account.invoice,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Ez egy követő"
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,narration:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Belső jegyzet"
 
 #. module: account
 #: constraint:account.account:0
@@ -9843,6 +9902,9 @@ msgid ""
 "You cannot select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
 msgstr ""
+"Beállítási hiba!\n"
+"Nem választhat \"Párosítatlan\" eltolási módtól eltérő főkönyvi számla "
+"típust a \"Kiadási/Bevételi\" belső típusú számlákhoz."
 
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
@@ -9863,6 +9925,7 @@ msgstr ""
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
 msgstr ""
+"Nem hatástalaníthat olyan főkönyvi számlát, mely napló tételeket tartalmaz."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9889,7 +9952,7 @@ msgstr "Tételsorok"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 msgid "Open Journal"
-msgstr "Nem könyvelt tételek könyvelése"
+msgstr "Napló megnyitása"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9912,7 +9975,7 @@ msgstr "Címlet"
 #: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "Kimenő jóváíró számla napló"
+msgstr "Kimenő, értékesítési jóváíró számla napló"
 
 #. module: account
 #: view:account.move:0
@@ -9929,6 +9992,11 @@ msgid ""
 "chart\n"
 "                        of accounts."
 msgstr ""
+"Ha már egyszer a számla tervezetek le lettek igazolva, többé nem tudja\n"
+"                        azokat módosítani. A számlák egyedi azonosítóval "
+"lesznek \n"
+"                        ellátva és napló bejegyzések készülnek a "
+"számlatükrökben."
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -9943,7 +10011,7 @@ msgstr "Üzleti év és időszakok zárása"
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr "Bejövő jóváíró számla napló"
+msgstr "Bejövő, beszerzési jóváíró számla napló"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9962,17 +10030,17 @@ msgstr "Anaitikus gyűjtőnaplók"
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr "Számla készítése"
+msgstr "Számla létrehozás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Könyvelési adatok beállítása"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr "Előzetesen felszámított ÁFA(%)"
+msgstr "Előzetesen felszámított beszerzési ÁFA(%)"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
@@ -9987,11 +10055,13 @@ msgid ""
 "Please check that the field 'Internal Transfers Account' is set on the "
 "payment method '%s'."
 msgstr ""
+"Kérem ellenőrizze, hogy a 'Belső mozgások könyvelési számla' mező be legyen "
+"állítva a '%s' fizetési feltételnél ."
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Részletek mutatása"
 
 #. module: account
 #: code:addons/account/account.py:3203
@@ -10006,13 +10076,13 @@ msgid ""
 "accounts. These generate draft invoices."
 msgstr ""
 "Analitikus költségek (időkimutatások, egyes megvásárolt termékek, ...) az "
-"analitikus könyvelésből származnak. Ezek számla vázlatokat hoznak létre."
+"analitikus könyvelésből származnak. Ezek számla tervezeteket hoznak létre."
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr "Tételeim"
+msgstr "Bejegyzéseim"
 
 #. module: account
 #: help:account.invoice,state:0
@@ -10027,6 +10097,18 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
+" * A 'Tervezet' állapotot használja, miután egy felhasználó bevitt egy új, "
+"még nem jóváhagyott Számlát.             \n"
+"* A 'Pro-forma' állapotú amikor a számla díjbekérő, Pro-forma; a számlának "
+"még nincs száma.             \n"
+"* A 'Nyitott' állapotot akkor használja, ha a felhasználó számlát készít,és "
+"egy számlaszámot hoz létre. Addig marad nyitott állapotú, amíg a számla nem "
+"kerül kifizetésre.             \n"
+"* A 'Fizetve' állapot lesz beállítva automatikusan amint a számla "
+"kifizetésre került. A hozzá kapcsolódó napló bejegyzések párosítása vagy "
+"megtörténik vagy nem.             \n"
+"* A 'Visszavont' állapotot használja, ha a felhasználó érvényteleníti a "
+"számlát."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -10046,7 +10128,7 @@ msgstr "Pénzügyi  kimutatások"
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "Felelősség nézet"
 
 #. module: account
 #: report:account.account.balance:0
@@ -10099,7 +10181,7 @@ msgstr "Jóváírás, visszatérítés igénylése"
 #. module: account
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr "Követel összesen"
+msgstr "Követelés összesen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -10119,18 +10201,18 @@ msgstr "Bizonylat: vevő folyószámla kivonat"
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr "Vevő számlák"
+msgstr "Követelés (vevő) számlák"
 
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Beszállítők jóváírási sorrend"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled."
-msgstr ""
+msgstr "Számla már párosítva volt."
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -10142,6 +10224,12 @@ msgid ""
 "payments.\n"
 "                This installs the module account_payment."
 msgstr ""
+"Ez lehetővé teszi hogy létrehozza és kezelje az átutalási megbízásait, egy "
+"könnyű\n"
+"                    * csatoló alapjaként a különböző automatikus fizetési  "
+"szerkezetekhez, és\n"
+"                    * hatékonyabb kezelését a számla fizetéseknek.\n"
+"                Ez a account_payment (számla_kifizetés) modult telepíti.."
 
 #. module: account
 #: xsl:account.transfer:0
@@ -10152,7 +10240,7 @@ msgstr "Dokumentum"
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "Vevő főkönyvi számla"
+msgstr "Bevételi (Vevő) főkönyvi számla"
 
 #. module: account
 #: code:addons/account/account_move_line.py:771
@@ -10160,6 +10248,8 @@ msgstr "Vevő főkönyvi számla"
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
+"A bejegyzések párosításához az összes bejegyzéshez ugyanaz a vállalkozás "
+"szükséges."
 
 #. module: account
 #: field:account.account,balance:0
@@ -10204,17 +10294,17 @@ msgstr "Számla megjelenítése"
 #: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
-msgstr "Szállító"
+msgstr "Szállítónak fizetendő"
 
 #. module: account
 #: view:account.account:0
 msgid "Account name"
-msgstr ""
+msgstr "Főkönyvi számla neve"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "Tábla"
+msgstr "Főkonyvi számla tábla"
 
 #. module: account
 #: view:account.model:0
@@ -10243,7 +10333,7 @@ msgstr "Szűrés"
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "Egységek száma"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -10260,14 +10350,14 @@ msgstr "Kézi tétel"
 #: view:account.move.line:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Bizonylat száma"
+msgstr "Bizonylat"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:478
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Érvénytelen lépés!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -10298,7 +10388,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Ezzel a partnerrel nincs semmilyen lejárat."
 
 #. module: account
 #: help:account.tax,account_paid_id:0
@@ -10315,13 +10405,13 @@ msgstr ""
 msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
-"A kiválasztott sablonnal létrehoz egy főkönyvi számlát a már létező gyűjtő "
-"főkönyvi számla alá."
+"A kiválasztott sablonnal létrehoz egy főkönyvi számlát a már létező "
+"fölérendelt gyűjtő főkönyvi számla alá."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Source"
-msgstr ""
+msgstr "Forrás"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -10335,8 +10425,8 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
-"A naplóban meg kell adnia a bankszámlát\n"
-"az egyeztetéshez."
+"A napló leírásban meg kell adnia a bankszámlát\n"
+"az egyeztetéshez, párosításhoz."
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -10344,11 +10434,13 @@ msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Ez a mező tartalmazza ennek a naplónak a bejegyzéseihez tartozó számok "
+"infoormációit."
 
 #. module: account
 #: field:account.invoice,sent:0
 msgid "Sent"
-msgstr ""
+msgstr "Elküldött"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -10359,7 +10451,7 @@ msgstr "Általános kimutatás"
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "Alapértelmezett értékesítési adó"
 
 #. module: account
 #: report:account.overdue:0
@@ -10370,7 +10462,7 @@ msgstr "Egyenleg :"
 #: code:addons/account/account.py:1587
 #, python-format
 msgid "Cannot create moves for different companies."
-msgstr ""
+msgstr "Nem tud létrehozni bizonylatot különboző vállalkozásokra."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -10380,14 +10472,14 @@ msgstr "Időszakos feldolgozás"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Vásárlói és Beszállítói számlák"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr "Pénzügyi rendezés tételek"
+msgstr "Pénzügyi rendezés tételei"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10444,7 +10536,7 @@ msgstr "Záró időszak"
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "Költség nézet"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
@@ -10455,7 +10547,7 @@ msgstr "Fizetési határidő"
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
-msgstr ""
+msgstr "Azonnali, készpénzes fizetés"
 
 #. module: account
 #: code:addons/account/account.py:1502
@@ -10483,7 +10575,7 @@ msgstr ""
 #: view:account.subscription:0
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "Előjegyzés"
+msgstr "Főkönyvi számla előjegyzés"
 
 #. module: account
 #: report:account.overdue:0
@@ -10531,12 +10623,14 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"Ez jelzi, hogy a számla ki lett fizetve és a számla napló bejegyzése "
+"párosítva lett a fizetés egy vagy több napló bejegyzésével."
 
 #. module: account
 #: code:addons/account/account_move_line.py:780
 #, python-format
 msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!"
-msgstr ""
+msgstr "Napló tétel '%s' (id: %s), Bizonylat '%s' már párosítva lett!"
 
 #. module: account
 #: view:account.invoice:0
@@ -10550,7 +10644,7 @@ msgstr "Számlatervezetek"
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
 #, python-format
 msgid "Nothing more to reconcile"
-msgstr ""
+msgstr "Nincs több párosítandó"
 
 #. module: account
 #: view:cash.box.in:0
@@ -10563,7 +10657,7 @@ msgstr "Készpénz befizetése"
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "Rendezetlen"
+msgstr "Rendezetlen, párosítatlan"
 
 #. module: account
 #: code:addons/account/account_invoice.py:922
@@ -10574,7 +10668,7 @@ msgstr "Hibás összesen!"
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "Sorszámozás"
+msgstr "Bevitel sorszámozás"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -10628,6 +10722,8 @@ msgid ""
 "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state."
 msgstr ""
+"A kiválasztott számlá(ka)t nem lehet visszavonni mivel már 'Visszavont' vagy "
+"'Elkészített' állapotú."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10654,7 +10750,7 @@ msgstr "Könyvelési tételsorok"
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Összehasonlítás"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1119
@@ -10664,6 +10760,9 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first.\n"
 "%s."
 msgstr ""
+"Nem hagyhatja végre ezt a módosítást egy jóváhagyott bejegyzésen. Csak nem "
+"törvényes mezőket változtathat meg vagy a naplót vissza kell vonni először.\n"
+"%s."
 
 #. module: account
 #: help:account.config.settings,module_account_budget:0
@@ -10685,7 +10784,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
-msgstr ""
+msgstr "OBI"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10711,7 +10810,7 @@ msgstr "Másodlagos pénznem"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr "Könyvelési tételek jóváhagyása"
+msgstr "Könyvelési tételek bizonylatának jóváhagyása"
 
 #. module: account
 #: field:account.account,credit:0
@@ -10735,7 +10834,7 @@ msgstr "Könyvelési tételek jóváhagyása"
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr "Követel"
+msgstr "Követelés"
 
 #. module: account
 #: view:account.invoice:0
@@ -10756,7 +10855,7 @@ msgstr "Kontírozási modell"
 #: code:addons/account/account.py:1073
 #, python-format
 msgid "Start period should precede then end period."
-msgstr ""
+msgstr "Előbb van az induó időszak és utána a záró időszak."
 
 #. module: account
 #: field:account.invoice,number:0
@@ -10777,7 +10876,7 @@ msgstr "Általános"
 #: field:account.invoice.report,price_total:0
 #: field:account.invoice.report,user_currency_price_total:0
 msgid "Total Without Tax"
-msgstr "Nettó érték"
+msgstr "Nettó, adó nélküli érték"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -10818,7 +10917,7 @@ msgstr "Árfolyam"
 #. module: account
 #: view:account.config.settings:0
 msgid "e.g. sales@openerp.com"
-msgstr ""
+msgstr "pl. sales@openerp.com"
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -10840,7 +10939,7 @@ msgstr "Április"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Nyereség (Veszteség) a kimutatásba"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -10850,18 +10949,18 @@ msgstr "Megnyitás a párosításhoz"
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr "Bal szülő"
+msgstr "Bal fölérendelt szülő alkalmazás szabályok"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Címmező 2 (kövér)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr "Bejövő számlák"
+msgstr "Bejövő, beszállítói számlák"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -10897,7 +10996,7 @@ msgstr "Könyvelési időszak"
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "Sorok eltávolítása"
+msgstr "Tételsorok eltávolítása"
 
 #. module: account
 #: selection:account.account,type:0
@@ -10918,7 +11017,7 @@ msgstr "Belső típus"
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Előzőleg létrehozott bejegyzések"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -10985,19 +11084,19 @@ msgstr "Eredeti adó"
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr "Üzleti év sorszámok"
+msgstr "Üzleti év sorrendek"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Nincsenek részletek"
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Nem realizált Nyereség vagy veszteség"
 
 #. module: account
 #: view:account.move:0
@@ -11009,12 +11108,12 @@ msgstr "Állapotok"
 #: help:product.category,property_account_income_categ:0
 #: help:product.template,property_account_income:0
 msgid "This account will be used to value outgoing stock using sale price."
-msgstr ""
+msgstr "Ez a főkönyvi számla értékeli a kimenő árukat az eladási ár alapján."
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr "Számla végösszeg"
+msgstr "Számla végösszeg ellenőrzés"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -11026,13 +11125,13 @@ msgstr "Számla végösszeg"
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr "Összesen"
+msgstr "Bruttó érték összesen"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:109
 #, python-format
 msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Nem lehet %s tervezet/proforma/érvénytelenített számla."
 
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
@@ -11042,7 +11141,7 @@ msgstr "Visszatérítés analitikai adógyűjtő számla"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr "Megnyitás a bank egyeztetéshez"
+msgstr "Megnyitás a bank egyeztetéshez, párosításhoz"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -11108,7 +11207,7 @@ msgstr "Esedékesség kelte"
 #: field:cash.box.in,name:0
 #: field:cash.box.out,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Indoklás"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -11136,12 +11235,12 @@ msgstr "Havi időszakok létrehozása"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr "Összegzésnél használt előjel"
+msgstr "Fölérendeltekhez használt előjel"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr "Főkönyvi kivonat"
+msgstr "Próbamérleg kimutatás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -11166,22 +11265,26 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disable"
 msgstr ""
+"Ha párosítatlanná teszi a tranzakciókat, akkor a tranzakciókhoz kapcsolt "
+"tranzakciókat is ellenőriznie kell, mert azok nem lesznek kiiktatva"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "Lehetetlen megváltoztatni az adót!"
 
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
 msgstr ""
+"A kiválasztott naplónak és időszaknak ugyanahhoz a vállalkozáshoz kell "
+"tartoznia."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr "Számlasorok"
+msgstr "Számla tételsorok"
 
 #. module: account
 #: field:account.chart,period_to:0
@@ -11191,7 +11294,7 @@ msgstr "Záró időszak"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "A napló kódjának egyedinek kell lennie!"
+msgstr "A napló kódjának egyedinek kell lennie mindegyik vállalathoz!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -11200,6 +11303,9 @@ msgid ""
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"Ebből a kimutatásból, áttekintheti az ehhez a partnerhez tartozó számlázott "
+"összegeket. A kereső eszközzel egyénivé teheti a Számla kimutatásait és így, "
+"az a kívánsága szerinti lesz."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -11210,7 +11316,7 @@ msgstr "A következő partnerre lép"
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr "Különbözet leírása"
+msgstr "Különbözet bizonylat leírása"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -11220,7 +11326,7 @@ msgstr "A számla állapota kész."
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Vásárlói fizetési nyomon követések kezelése"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -11230,7 +11336,7 @@ msgstr "Főkönyvi számlánkénti értékesítési kimutatás"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "ÁFA pozíció"
+msgstr "Főkönyvi számla költségvetési ÁFA pozíció"
 
 #. module: account
 #: report:account.invoice:0
@@ -11242,7 +11348,7 @@ msgstr "ÁFA pozíció"
 #: selection:report.invoice.created,type:0
 #, python-format
 msgid "Supplier Invoice"
-msgstr "Bejövő számla"
+msgstr "Beszállítók bejövő számlái"
 
 #. module: account
 #: field:account.account,debit:0
@@ -11271,18 +11377,18 @@ msgstr "Tartozik"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Címmező 3 (kövér, kisebb)"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "Számlasorok"
+msgstr "Számla téetelsorok"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "A tételek mennyiségi lehetőségei."
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -11292,12 +11398,12 @@ msgstr "Párosított tranzakciók"
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr "Vevő számlák"
+msgstr "Vásárlóktól követelés számlák"
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr "Fordított gyűjtőkód kivonat -"
+msgstr "Fordított analitikus gyűjtőkód kivonat -"
 
 #. module: account
 #: field:temp.range,name:0
@@ -11318,6 +11424,11 @@ msgid ""
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"A 'Belső típus' a különböző elérhető számla tulajdonságokat tartalmazza: "
+"nézetnek nem lehet napló bejegyzései, egyeztetett számlák melyek "
+"tartalmazhatnak al-számlákat a több szintes vállalati felépítésnél, "
+"fizetendők/követelések a fölérendelt  főkönyvi számlákhoz (tartozik/követel "
+"számításokhoz), lezárt a leértékelt számlákhoz."
 
 #. module: account
 #: report:account.account.balance:0
@@ -11326,23 +11437,23 @@ msgstr ""
 #: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr "Amelyeken van mozgás"
+msgstr "Amelyeken van bizonylata"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "Adógyűjtő sablon"
+msgstr "Főkönyvi számla adógyűjtő sablon"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr "Manuálisan"
+msgstr "Kézzel"
 
 #. module: account
 #: help:account.move,balance:0
 msgid ""
 "This is a field only used for internal purpose and shouldn't be displayed"
-msgstr ""
+msgstr "Ez a mező belső használatra és nem szabad megjeleníteni"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11356,13 +11467,14 @@ msgstr "December"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Csoportosítás számla dátuma alapján"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Nincs bevételi számla meghatározva ehhez a termékhez: \"%s\" (id:%d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -11378,13 +11490,15 @@ msgstr "Alkalmazhatóság"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "Szabadon választott más pénznem, ha a tétel devizás."
+msgstr "Szabadon választott más pénznem, ha a tétel több-devizás."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr "Bejövő vagy kimenő számlából kivonat importálása a rendszerbe"
+msgstr ""
+"Beszállítói bejövő vagy vásárlói kimenő számlából kivonat importálása a "
+"rendszerbe"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -11395,7 +11509,7 @@ msgstr "Számlázás"
 #: view:account.account:0
 #: view:account.analytic.account:0
 msgid "Parent Account"
-msgstr "Gyűjtő főkönyvi számla"
+msgstr "Fölérendelt gyűjtő főkönyvi számla"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -11415,7 +11529,7 @@ msgstr "A számla végösszegéből még nem rendezett rész."
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Bejegyzések rendezése ezzel"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1546
@@ -11424,6 +11538,7 @@ msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
 "the product."
 msgstr ""
+"A kiválasztott mértékegység nem kompatibilis a termék mértékegységével."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -11447,6 +11562,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson egy új adó kód létrehozásához.\n"
+"              </p><p>\n"
+"                Országtól függően, az adó kód egy kitöltendő cella a \n"
+"                törvényes adóbevallásában. A rendszer lehetővé teszi az adó\n"
+"                felépítésének és az  adók kiszámításának meghatározását ami "
+"\n"
+"                rögzítésre kerül egy vagy több adó kódhoz.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11473,6 +11598,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Válassza ki a kitölteni kívánt időszakot és naplót.\n"
+"              </p><p>\n"
+"                Ezt a nézetet használja a könyvelő a gyors rendszer beviteli "
+"\n"
+"                rögzítéshez. Ha egy beszállítói számlát szeretne rögzíteni,\n"
+"                akkor a kiadások főkönyvi számlánál kezdje a tétel "
+"rögzítését.\n"
+"                A rendszer fel fogja automatikusan ajánlani az erre a "
+"számlára,\n"
+"                és az ellenszámlára \"Fizetendő főkönyvi számla\", adót.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -11483,7 +11621,7 @@ msgstr ""
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "Több számlatükör telepítése"
 
 #. module: account
 #: report:account.general.journal:0
@@ -11533,11 +11671,13 @@ msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Nem tudja eltávolítani/inaktiválni azt a számlát, mely már be lett állítva "
+"egy vásárlóhoz vagy beszállítóhoz."
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr "Könyvelési tételsorok jóváhagyása"
+msgstr "Könyvelési bizonylat tételsorok jóváhagyása"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -11550,7 +11690,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr "A számla állapota kész."
+msgstr "A számla állapota, kész."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
@@ -11561,7 +11701,7 @@ msgstr "Amint a párosítás elkészül, a számla rendezettnek minősül."
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly."
-msgstr ""
+msgstr "Az új pénznem nem megfelelően beállított."
 
 #. module: account
 #: view:account.account.template:0
@@ -11571,18 +11711,18 @@ msgstr "Főkönyvi számla sablonok keresése"
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr "Adók"
+msgstr "Kézzel megadott adók a számlán"
 
 #. module: account
 #: code:addons/account/account_invoice.py:573
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
-msgstr ""
+msgstr "A beszállító fizetési feltételének nincs fizetési feltétel tétele."
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr "Jobb szülő"
+msgstr "Jobb fölérendelt szülő alkalmazás szabályok"
 
 #. module: account
 #. openerp-web
@@ -11590,7 +11730,7 @@ msgstr "Jobb szülő"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:80
 #, python-format
 msgid "Never"
-msgstr ""
+msgstr "Soha"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -11606,12 +11746,12 @@ msgstr "account.addtmpl.wizard"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr "Vevő/szállító számlák"
+msgstr "Partnerek"
 
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Belső jegyzetek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -11638,13 +11778,13 @@ msgstr "Hiv."
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr "Modell"
+msgstr "Főkönyvi számla modell"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Veszteség"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11659,7 +11799,7 @@ msgstr "Február"
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
 msgid "Closing Unit Numbers"
-msgstr "Záró darabszám"
+msgstr "Záró egység számok"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -11674,7 +11814,7 @@ msgstr "Bankszámla"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr "Központi napló"
+msgstr "Főkönyvi számla központi napló"
 
 #. module: account
 #: report:account.overdue:0
@@ -11716,7 +11856,7 @@ msgstr "Beszerzés főkönyvi számla a terméksablonban"
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Vásárló fizetési feltétele"
 
 #. module: account
 #: help:accounting.report,label_filter:0
@@ -11724,11 +11864,13 @@ msgid ""
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
 msgstr ""
+"Ez a címke lesz feltüntetve a kimutatásokon a megadott összehasonlító szűrő "
+"szerint kiszámított egyenleg megmutatásához."
 
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr ""
+msgstr "Tételenkénti kerekítés"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -11790,3 +11932,15 @@ msgstr ""
 #~ "teljesülhet: vagy az utolsó tartozás/követelés lett párosítva, vagy a "
 #~ "felhasználó megnyomta a \"Összesítő párosítás\" gombot a kézi párosítás "
 #~ "műveletek elindításához"
+
+#, python-format
+#~ msgid "Unknown Error!"
+#~ msgstr "Ismeretlen hiba!"
+
+#, python-format
+#~ msgid "There is no Sale/Purchase Journal(s) defined."
+#~ msgstr "Nincs Értékesítés/Beszerzés napló(k) meghatározva."
+
+#, python-format
+#~ msgid "Already reconciled."
+#~ msgstr "Már párosítottak."
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 432e9512a16..568fd2bfeee 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -8,14 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-12 12:24+0000\n"
+"PO-Revision-Date: 2013-12-16 10:30+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-17 06:13+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1074
+#, python-format
+msgid "Please define a sequence on the journal."
+msgstr "Kérem egy sorozat meghatározását a naplón."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Group by Invoice Date"
+msgstr "Számla dátuma szerinti csoportosítása"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -943,12 +954,6 @@ msgstr "Összegzés"
 msgid "Active"
 msgstr "Aktív"
 
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1074
-#, python-format
-msgid "Please define a sequence on the journal."
-msgstr "Kérem egy sorozat meghatározását a naplón."
-
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
@@ -963,11 +968,6 @@ msgstr "Vevői befizetések"
 msgid "Sales Receipts Analysis"
 msgstr "Értékesítési bevételi bizonylatok elemzései"
 
-#. module: account_voucher
-#: view:sale.receipt.report:0
-msgid "Group by Invoice Date"
-msgstr "Számla dátuma szerinti csoportosítása"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"

From 322e0b9cae17e873b5002b7e71065d9a1d88e38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Dec 2013 09:47:28 +0100
Subject: [PATCH 478/547] [FIX] hr: posting on the user should not fail when it
 is not linked to anh employee. In that case, fall back on the previous
 behavior that is posting on the partner.

bzr revid: tde@openerp.com-20131217084728-myk234abi9gqwkuq
---
 addons/hr/res_users.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr/res_users.py b/addons/hr/res_users.py
index c3550596281..d5bebe05446 100644
--- a/addons/hr/res_users.py
+++ b/addons/hr/res_users.py
@@ -57,9 +57,10 @@ class res_users(osv.Model):
             various mailboxes, we do not have access to the current partner_id. """
         if kwargs.get('type') == 'email':
             return super(res_users, self).message_post(cr, uid, thread_id, context=context, **kwargs)
+        res = None
         employee_ids = self._message_post_get_eid(cr, uid, thread_id, context=context)
-        if not employee_ids:
-            pass  # dpo something
+        if not employee_ids:  # no employee: fall back on previous behavior
+            return super(res_users, self).message_post(cr, uid, thread_id, context=context, **kwargs)
         for employee_id in employee_ids:
             res = self.pool.get('hr.employee').message_post(cr, uid, employee_id, context=context, **kwargs)
         return res

From cfd24d982295af13ac6c90f2882e7e49e754c8f3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 17 Dec 2013 11:41:11 +0100
Subject: [PATCH 479/547] [FIX] view_list_editable: toggle visibility (using
 force_visibility attribute) for readonly changes, using
 effective_invisibility instead of invisibility attribute (opw 601970)

bzr revid: mat@openerp.com-20131217104111-u9bnqvz7rd5rzwnc
---
 .../web/static/src/js/view_list_editable.js   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index bd9cee06797..4c7e4655054 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -274,7 +274,7 @@ openerp.web.list_editable = function (instance) {
             if (!this.editor.is_editing()) { return; }
             for(var i=0, len=this.fields_for_resize.length; i<len; ++i) {
                 var item = this.fields_for_resize[i];
-                if (!item.field.get('invisible')) {
+                if (!item.field.get('effective_invisible')) {
                     this.resize_field(item.field, item.cell);
                 }
             }
@@ -440,23 +440,22 @@ openerp.web.list_editable = function (instance) {
         setup_events: function () {
             var self = this;
             _.each(this.editor.form.fields, function(field, field_name) {
-                var setting = false;
                 var set_invisible = function() {
-                    if (!setting && field.get("effective_readonly")) {
-                        setting = true;
-                        field.set({invisible: true});
-                        setting = false;
-                    }
+                    field.set({'force_invisible': field.get('effective_readonly')});
                 };
                 field.on("change:effective_readonly", self, set_invisible);
-                field.on("change:invisible", self, set_invisible);
                 set_invisible();
-                field.on('change:invisible', self, function () {
-                    if (field.get('invisible')) { return; }
+                field.on('change:effective_invisible', self, function () {
+                    if (field.get('effective_invisible')) { return; }
                     var item = _(self.fields_for_resize).find(function (item) {
                         return item.field === field;
                     });
-                    if (item) { self.resize_field(item.field, item.cell); }
+                    if (item) {
+                        setTimeout(function() {
+                            self.resize_field(item.field, item.cell);
+                        }, 0);
+                    }
+                     
                 });
             });
 

From df0ba6c7e8f17c24111b27769951d0d68e545312 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 17 Dec 2013 11:43:01 +0100
Subject: [PATCH 480/547] [FIX] project_mrp: local copy of the "Procurement"
 process node to avoid errors during updates when sale_stock is not installed

The various attempts to fix this error without duplicating the node
have all caused other errors. Having a duplicate process node has
no consequence on business operations, so it is an acceptable
workaround until the node can be moved to the sale module.

bzr revid: odo@openerp.com-20131217104301-t8fsf28jgjqq9q7k
---
 addons/project_mrp/process/project_mrp_process.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index 59915715999..a6aaccedbbc 100644
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -46,14 +46,15 @@
         Process Transition
     -->
 
-        <!-- This "foreign" process node is duplicated here from the corresponding sale_stock node because
+        <!-- This process node is duplicated here from the corresponding sale_stock node because
              `project_mrp` implements a basic procurement system for services without actually using the
-             full-fledged procurement process from sale_stock, and without the dependency. So it stil
-             represents a "procurement system".
-             TODO: To cleanup this invalid foreign external ID, the node should probably be moved to the
+             full-fledged procurement process from sale_stock, and without the dependency. So it still
+             represents a "procurement system". Sharing the external ID causes other problems, so
+             we duplicate it instead.
+             TODO: To cleanup this duplicate node, it should probably be moved to the
              `sale` module directly, and removed from both `sale_stock` and `project_mrp`.
         --> 
-        <record id="sale_stock.process_node_saleprocurement0" model="process.node">
+        <record id="process_node_saleprocurement0" model="process.node">
             <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field name="kind">subflow</field>
@@ -68,7 +69,7 @@
             <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
-            <field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
 
         <record id="process_transition_createtask0" model="process.transition">

From 3e028490f6018f182ce8b5dcc0eb7e501858c6d1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 17 Dec 2013 11:48:13 +0100
Subject: [PATCH 481/547] [IMP] gamification: licency stuff

bzr revid: mat@openerp.com-20131217104813-7nh422l1d85s6y51
---
 addons/gamification/__init__.py          | 21 +++++++++++++++++++++
 addons/gamification/badge.py             |  2 +-
 addons/gamification/goal.py              |  2 +-
 addons/gamification/goal_type_data.py    |  2 +-
 addons/gamification/plan.py              |  2 +-
 addons/gamification/res_users.py         |  2 +-
 addons/gamification_sale_crm/__init__.py | 20 ++++++++++++++++++++
 addons/hr_gamification/__init__.py       | 21 +++++++++++++++++++++
 addons/hr_gamification/gamification.py   |  2 +-
 9 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index 3c4211df081..843121ee65b 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -1,3 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 import goal
 import goal_type_data
 import plan
diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index b562c6f7a7d..8e09a2a397b 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 4c61f658e42..11a3b2517ff 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/goal_type_data.py
index ccde88e53f0..3fef79f9a79 100644
--- a/addons/gamification/goal_type_data.py
+++ b/addons/gamification/goal_type_data.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index ca2934231bc..80631518b3d 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/addons/gamification/res_users.py b/addons/gamification/res_users.py
index 305f6fddb05..3450dc1492c 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/res_users.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/addons/gamification_sale_crm/__init__.py b/addons/gamification_sale_crm/__init__.py
index e69de29bb2d..e14c014a1ef 100644
--- a/addons/gamification_sale_crm/__init__.py
+++ b/addons/gamification_sale_crm/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
diff --git a/addons/hr_gamification/__init__.py b/addons/hr_gamification/__init__.py
index cef4a8c371c..51cf01dfa09 100644
--- a/addons/hr_gamification/__init__.py
+++ b/addons/hr_gamification/__init__.py
@@ -1 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 import gamification
diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/gamification.py
index feed68a1cf4..73ae0b6cfe3 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/gamification.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by

From df0a13ab4c546c4d4a80d97b3d08e07782aae332 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 17 Dec 2013 13:42:01 +0100
Subject: [PATCH 482/547] [FIX]sale_crm: quotation/sale order default
 section_id based on res_users default_section_id

bzr revid: dle@openerp.com-20131217124201-kha2717b4ka51aih
---
 addons/sale_crm/sale_crm.py | 40 +++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index e9ab87e54a4..4b73c3b25e8 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -21,21 +21,6 @@
 
 from openerp.osv import osv, fields
 
-class sale_order(osv.osv):
-    _inherit = 'sale.order'
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
-            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}")
-    }
-
-    def _prepare_invoice(self, cr, uid, order, lines, context=None):
-        invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
-        if order.section_id and order.section_id.id:
-            invoice_vals['section_id'] = order.section_id.id
-        return invoice_vals
-
-
 class res_users(osv.Model):
     _inherit = 'res.users'
     _columns = {
@@ -49,6 +34,31 @@ class res_users(osv.Model):
         self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
         return init_res
 
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    _columns = {
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
+            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}")
+    }
+
+    def _get_default_section_id(self, cr, uid, context=None):
+        """ Gives default section by checking if present in the context """
+        section_id = self.pool.get('crm.lead')._resolve_section_id_from_context(cr, uid, context=context) or False
+        if not section_id:
+            section_id = self.pool.get('res.users').browse(cr, uid, uid, context).default_section_id.id or False
+        return section_id
+
+    _defaults = {
+        'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
+    }
+
+    def _prepare_invoice(self, cr, uid, order, lines, context=None):
+        invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
+        if order.section_id and order.section_id.id:
+            invoice_vals['section_id'] = order.section_id.id
+        return invoice_vals
+
 
 class sale_crm_lead(osv.Model):
     _inherit = 'crm.lead'

From 0877e27f822e3778eac52a0a9a875819779d566c Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cto@openerp.com>
Date: Tue, 17 Dec 2013 15:00:15 +0100
Subject: [PATCH 483/547] [FIX] The widget selection on partner_id force the
 form to load every partner for nothing

bzr revid: cto@openerp.com-20131217140015-f3v3tjmrhnwjfsqi
---
 addons/account_payment/account_payment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index c2f27a576a2..89840b02254 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -64,7 +64,7 @@
                         <field name="journal"/>
                         <field name="bank_id" domain="[('partner_id','=',partner_id)]"  />
                         <field name="company_id" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
-                        <field name="partner_id" widget='selection' invisible="1"/>
+                        <field name="partner_id" invisible="1"/>
                     </group>
                 </form>
             </field>

From 6dc8698319e33694112dc10a85c9597c9c5a1d24 Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@openerp.com>
Date: Tue, 17 Dec 2013 16:49:15 +0100
Subject: [PATCH 484/547] [FIX] base: remove old deprecated file
 ``base_module_scan.py``.

This file was wrongly left-over from ancient v6.1 times and not used at all under v7.0.

lp bug: https://launchpad.net/bugs/1228821 fixed

bzr revid: xal@openerp.com-20131217154915-v6iy8us55k8rp7nc
---
 .../base/module/wizard/base_module_scan.py    | 74 -------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 openerp/addons/base/module/wizard/base_module_scan.py

diff --git a/openerp/addons/base/module/wizard/base_module_scan.py b/openerp/addons/base/module/wizard/base_module_scan.py
deleted file mode 100644
index 7ddd580d284..00000000000
--- a/openerp/addons/base/module/wizard/base_module_scan.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import os
-import glob
-import imp
-import zipfile
-
-from openerp import tools
-from openerp.osv import osv
-
-class base_module_scan(osv.osv_memory):
-    """ scan module """
-
-    _name = "base.module.scan"
-    _description = "scan module"
-
-    def watch_dir(self, cr, uid, ids, context):
-        mod_obj = self.pool.get('ir.module.module')
-        all_mods = mod_obj.read(cr, uid, mod_obj.search(cr, uid, []), ['name', 'state'])
-        known_modules = [x['name'] for x in all_mods]
-        ls_ad = glob.glob(os.path.join(tools.config['addons_path'], '*', '__terp__.py'))
-        modules = [module_name_re.match(name).group(1) for name in ls_ad]
-        for fname in os.listdir(tools.config['addons_path']):
-            if zipfile.is_zipfile(fname):
-                modules.append( fname.split('.')[0])
-        for module in modules:
-            if module in known_modules:
-                continue
-            terp = mod_obj.get_module_info(module)
-            if not terp.get('installable', True):
-                continue
-
-            # XXX check if this code is correct...
-            fm = imp.find_module(module)
-            try:
-                imp.load_module(module, *fm)
-            finally:
-                if fm[0]:
-                    fm[0].close()
-
-            values = mod_obj.get_values_from_terp(terp)
-            mod_id = mod_obj.create(cr, uid, dict(name=module, state='uninstalled', **values))
-            dependencies = terp.get('depends', [])
-            for d in dependencies:
-                cr.execute('insert into ir_module_module_dependency (module_id,name) values (%s, %s)', (mod_id, d))
-        for module in known_modules:
-            terp = mod_obj.get_module_info(module)
-            if terp.get('installable', True):
-                for mod in all_mods:
-                    if mod['name'] == module and mod['state'] == 'uninstallable':
-                        mod_obj.write(cr, uid, [mod['id']], {'state': 'uninstalled'})
-        return {}
-
-base_module_scan()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 122c15c48d430c502adf2df45bad4405a864b5ce Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 17 Dec 2013 17:15:41 +0100
Subject: [PATCH 485/547] [REF] gamification: pretty much changing half of the
 code to make tde happy...

bzr revid: mat@openerp.com-20131217161541-oxsgy7gmko2x6qui
---
 addons/gamification/__init__.py               |   7 +-
 addons/gamification/__openerp__.py            |  21 +-
 addons/gamification/data/__init__.py          |  22 +
 .../{badge_data.xml => data/badge.xml}        |   0
 addons/gamification/{ => data}/cron.xml       |   6 +-
 .../goal_base.xml}                            |  74 +--
 .../goal_definition.py}                       |   8 +-
 addons/gamification/models/__init__.py        |  25 +
 addons/gamification/{ => models}/badge.py     |   6 +-
 .../{plan.py => models/challenge.py}          | 457 ++++++++----------
 addons/gamification/{ => models}/goal.py      |  99 ++--
 addons/gamification/{ => models}/res_users.py | 110 ++---
 .../security/gamification_security.xml        |   6 +-
 .../gamification/security/ir.model.access.csv |  12 +-
 .../static/src/js/gamification.js             |  20 +-
 .../static/src/xml/gamification.xml           |  76 +--
 addons/gamification/templates.py              |  42 --
 .../templates/group_progress.mako             |  10 +-
 .../templates/personal_progress.mako          |  10 +-
 addons/gamification/templates/reminder.mako   |   2 +-
 addons/gamification/test/goal_demo.yml        |  30 +-
 .../{badge_view.xml => views/badge.xml}       |   2 +-
 .../{plan_view.xml => views/challenge.xml}    |  95 ++--
 .../{goal_view.xml => views/goal.xml}         |  89 ++--
 addons/gamification_sale_crm/__openerp__.py   |   2 +-
 .../gamification_sale_crm/sale_crm_goals.xml  |  56 +--
 .../sale_crm_goals_demo.xml                   |   8 +-
 addons/hr_gamification/gamification.py        |   2 +-
 addons/hr_gamification/gamification_view.xml  |  22 +-
 .../security/ir.model.access.csv              |   4 +-
 .../security/ir.model.access.csv              |   6 +-
 31 files changed, 644 insertions(+), 685 deletions(-)
 create mode 100644 addons/gamification/data/__init__.py
 rename addons/gamification/{badge_data.xml => data/badge.xml} (100%)
 rename addons/gamification/{ => data}/cron.xml (67%)
 rename addons/gamification/{goal_base_data.xml => data/goal_base.xml} (75%)
 rename addons/gamification/{goal_type_data.py => data/goal_definition.py} (89%)
 create mode 100644 addons/gamification/models/__init__.py
 rename addons/gamification/{ => models}/badge.py (98%)
 rename addons/gamification/{plan.py => models/challenge.py} (61%)
 rename addons/gamification/{ => models}/goal.py (80%)
 rename addons/gamification/{ => models}/res_users.py (56%)
 delete mode 100644 addons/gamification/templates.py
 rename addons/gamification/{badge_view.xml => views/badge.xml} (99%)
 rename addons/gamification/{plan_view.xml => views/challenge.xml} (79%)
 rename addons/gamification/{goal_view.xml => views/goal.xml} (82%)

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index 843121ee65b..d644a612108 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -19,8 +19,5 @@
 #
 ##############################################################################
 
-import goal
-import goal_type_data
-import plan
-import res_users
-import badge
+import models
+import data
diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 081908fd3e4..0bf31601876 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -30,7 +30,7 @@ Gamification process
 The Gamification module provides ways to evaluate and motivate the users of OpenERP.
 
 The users can be evaluated using goals and numerical objectives to reach.
-**Goals** are assigned through **plans** to evaluate and compare members of a team with each others and through time.
+**Goals** are assigned through **challenges** to evaluate and compare members of a team with each others and through time.
 
 For non-numerical achievements, **badges** can be granted to users. From a simple "thank you" to an exceptional achievement, a badge is an easy way to exprimate gratitude to a user for their good work.
 
@@ -38,24 +38,23 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
 """,
 
     'data': [
-        'plan_view.xml',
-        'badge_view.xml',
-        'goal_view.xml',
-        'cron.xml',
+        'views/challenge.xml',
+        'views/badge.xml',
+        'views/goal.xml',
+        'data/cron.xml',
         'security/gamification_security.xml',
         'security/ir.model.access.csv',
-        'goal_base_data.xml',
-        'badge_data.xml',
+        'data/goal_base.xml',
+        'data/badge.xml',
     ],
     'test': [
         'test/goal_demo.yml'
     ],
     'installable': True,
     'application': True,
-    'auto_install': True,
+    'auto_install': False,
+
     'css': ['static/src/css/gamification.css'],
-    'js': [
-        'static/src/js/gamification.js',
-    ],
+    'js': ['static/src/js/gamification.js',],
     'qweb': ['static/src/xml/gamification.xml'],
 }
diff --git a/addons/gamification/data/__init__.py b/addons/gamification/data/__init__.py
new file mode 100644
index 00000000000..b5649616b2c
--- /dev/null
+++ b/addons/gamification/data/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import goal_definition
diff --git a/addons/gamification/badge_data.xml b/addons/gamification/data/badge.xml
similarity index 100%
rename from addons/gamification/badge_data.xml
rename to addons/gamification/data/badge.xml
diff --git a/addons/gamification/cron.xml b/addons/gamification/data/cron.xml
similarity index 67%
rename from addons/gamification/cron.xml
rename to addons/gamification/data/cron.xml
index 52726176841..8585771c97d 100644
--- a/addons/gamification/cron.xml
+++ b/addons/gamification/data/cron.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record forcecreate="True" id="ir_cron_check_plan"
+        <record forcecreate="True" id="ir_cron_check_challenge"
             model="ir.cron">
-            <field name="name">Run Goal Plan Checker</field>
+            <field name="name">Run Goal Challenge Checker</field>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
-            <field name="model">gamification.goal.plan</field>
+            <field name="model">gamification.challenge</field>
             <field name="function">_cron_update</field>
             <field name="args">()</field>
         </record>
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/data/goal_base.xml
similarity index 75%
rename from addons/gamification/goal_base_data.xml
rename to addons/gamification/data/goal_base.xml
index 48bc562effe..60000ec2805 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <!-- goal types -->
-        <record model="gamification.goal.type" id="type_base_timezone">
+        <!-- goal definitions -->
+        <record model="gamification.goal.definition" id="definition_base_timezone">
             <field name="name">Set your Timezone</field>
             <field name="description">Configure your profile and specify your timezone</field>
             <field name="computation_mode">count</field>
@@ -14,7 +14,7 @@
             <field name="res_id_field">user.id</field>
         </record>
 
-        <record model="gamification.goal.type" id="type_base_avatar">
+        <record model="gamification.goal.definition" id="definition_base_avatar">
             <field name="name">Set your Avatar</field>
             <field name="description">In your user preference</field>
             <field name="computation_mode">manually</field>
@@ -25,7 +25,7 @@
         </record>
 
 
-        <record model="gamification.goal.type" id="type_base_company_data">
+        <record model="gamification.goal.definition" id="definition_base_company_data">
             <field name="name">Set your Company Data</field>
             <field name="description">Write some information about your company (specify at least a name)</field>
             <field name="computation_mode">count</field>
@@ -37,7 +37,7 @@
             <field name="res_id_field">user.company_id.id</field>
         </record>
 
-        <record model="gamification.goal.type" id="type_base_company_logo">
+        <record model="gamification.goal.definition" id="definition_base_company_logo">
             <field name="name">Set your Company Logo</field>
             <field name="computation_mode">count</field>
             <field name="display_mode">checkbox</field>
@@ -58,7 +58,7 @@
             <field name="help">Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system.</field>
         </record>
 
-        <record model="gamification.goal.type" id="type_base_invite">
+        <record model="gamification.goal.definition" id="definition_base_invite">
             <field name="name">Invite new Users</field>
             <field name="description">Create at least another user</field>
             <field name="display_mode">checkbox</field>
@@ -68,7 +68,7 @@
             <field name="action_id" eval="ref('action_new_simplified_res_users')" />
         </record>
 
-        <record model="gamification.goal.type" id="type_nbr_following">
+        <record model="gamification.goal.definition" id="definition_nbr_following">
             <field name="name">Mail Group Following</field>
             <field name="description">Follow mail groups to receive news</field>
             <field name="computation_mode">python</field>
@@ -77,8 +77,8 @@
         </record>
 
 
-        <!-- plans -->
-        <record model="gamification.goal.plan" id="plan_base_discover">
+        <!-- challenges -->
+        <record model="gamification.challenge" id="challenge_base_discover">
             <field name="name">Complete your Profile</field>
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
@@ -88,7 +88,7 @@
             <field name="category">other</field>
         </record>
 
-        <record model="gamification.goal.plan" id="plan_base_configure">
+        <record model="gamification.challenge" id="challenge_base_configure">
             <field name="name">Setup your Company</field>
             <field name="period">once</field>
             <field name="visibility_mode">progressbar</field>
@@ -98,32 +98,32 @@
             <field name="category">other</field>
         </record>
 
-        <!-- planlines -->
-        <record model="gamification.goal.planline" id="planline_base_discover1">
-            <field name="type_id" eval="ref('type_base_timezone')" />
+        <!-- lines -->
+        <record model="gamification.challenge.line" id="line_base_discover1">
+            <field name="definition_id" eval="ref('definition_base_timezone')" />
             <field name="target_goal">1</field>
-            <field name="plan_id" eval="ref('plan_base_discover')" />
+            <field name="challenge_id" eval="ref('challenge_base_discover')" />
         </record>
-        <record model="gamification.goal.planline" id="planline_base_discover2">
-            <field name="type_id" eval="ref('type_base_avatar')" />
+        <record model="gamification.challenge.line" id="line_base_discover2">
+            <field name="definition_id" eval="ref('definition_base_avatar')" />
             <field name="target_goal">1</field>
-            <field name="plan_id" eval="ref('plan_base_discover')" />
+            <field name="challenge_id" eval="ref('challenge_base_discover')" />
         </record>
 
-        <record model="gamification.goal.planline" id="planline_base_admin2">
-            <field name="type_id" eval="ref('type_base_company_logo')" />
+        <record model="gamification.challenge.line" id="line_base_admin2">
+            <field name="definition_id" eval="ref('definition_base_company_logo')" />
             <field name="target_goal">1</field>
-            <field name="plan_id" eval="ref('plan_base_configure')" />
+            <field name="challenge_id" eval="ref('challenge_base_configure')" />
         </record>
-        <record model="gamification.goal.planline" id="planline_base_admin1">
-            <field name="type_id" eval="ref('type_base_company_data')" />
+        <record model="gamification.challenge.line" id="line_base_admin1">
+            <field name="definition_id" eval="ref('definition_base_company_data')" />
             <field name="target_goal">0</field>
-            <field name="plan_id" eval="ref('plan_base_configure')" />
+            <field name="challenge_id" eval="ref('challenge_base_configure')" />
         </record>
-        <record model="gamification.goal.planline" id="planline_base_admin3">
-            <field name="type_id" eval="ref('type_base_invite')" />
+        <record model="gamification.challenge.line" id="line_base_admin3">
+            <field name="definition_id" eval="ref('definition_base_invite')" />
             <field name="target_goal">1</field>
-            <field name="plan_id" eval="ref('plan_base_configure')" />
+            <field name="challenge_id" eval="ref('challenge_base_configure')" />
         </record>
     </data>
 
@@ -141,7 +141,7 @@
 
     <p class="oe_grey">${object.report_header or ''}</p>
     
-    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
+    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
 
     <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
             ]]></field>
@@ -168,15 +168,15 @@
                 style="font-weight:bold;"
             % endif
             >
-            <td>${goal.type_id.name}</td>
+            <td>${goal.definition_id.name}</td>
             <td>${goal.target_goal}
-            % if goal.type_suffix:
-                ${goal.type_suffix}
+            % if goal.definition_suffix:
+                ${goal.definition_suffix}
             % endif
             </td>
             <td>${goal.current}
-            % if goal.type_suffix:
-                ${goal.type_suffix}
+            % if goal.definition_suffix:
+                ${goal.definition_suffix}
             % endif
             </td>
             <td>${goal.completeness} %</td>
@@ -193,10 +193,10 @@
     </header>
     <p class="oe_grey">${object.report_header or ''}</p>
 
-    % for planline in ctx['planlines_boards']:
+    % for line in ctx['lines_boards']:
         <table width="100%" border="1">
             <tr>
-                <th colspan="4">${planline.goal_type.name}</th>
+                <th colspan="4">${line.goal_definition.name}</th>
             </tr>
             <tr>
                 <th>#</th>
@@ -204,7 +204,7 @@
                 <th>Completeness</th>
                 <th>Current</th>
             </tr>
-            % for idx, goal in planline.board_goals:
+            % for idx, goal in line.board_goals:
                 % if idx < 3 or goal.user_id.id == user.id:
                     <tr
                         % if goal.completeness >= 100:
@@ -215,8 +215,8 @@
                         <td>${goal.user_id.name}</td>
                         <td>${goal.completeness}%</td>
                         <td>${goal.current}/${goal.target_goal}
-                        % if goal.type_suffix:
-                            ${goal.type_suffix}
+                        % if goal.definition_suffix:
+                            ${goal.definition_suffix}
                         % endif
                         </td>
                     </tr>
diff --git a/addons/gamification/goal_type_data.py b/addons/gamification/data/goal_definition.py
similarity index 89%
rename from addons/gamification/goal_type_data.py
rename to addons/gamification/data/goal_definition.py
index 3fef79f9a79..937168fc0a2 100644
--- a/addons/gamification/goal_type_data.py
+++ b/addons/gamification/data/goal_definition.py
@@ -22,14 +22,14 @@
 from openerp.osv import osv
 
 
-class gamification_goal_type_data(osv.Model):
-    """Goal type data
+class gamification_goal_definition_data(osv.Model):
+    """Goal definition data
 
     Methods for more complex goals not possible with the 'sum' and 'count' mode.
     Each method should return the value that will be set in the 'current' field
-    of a user's goal. The return type must be a float or integer.
+    of a user's goal. The return definition must be a float or integer.
     """
-    _inherit = 'gamification.goal.type'
+    _inherit = 'gamification.goal.definition'
 
     def number_following(self, cr, uid, xml_id="mail.thread", context=None):
         """Return the number of 'xml_id' objects the user is following
diff --git a/addons/gamification/models/__init__.py b/addons/gamification/models/__init__.py
new file mode 100644
index 00000000000..812a08b1e19
--- /dev/null
+++ b/addons/gamification/models/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import goal
+import challenge
+import res_users
+import badge
diff --git a/addons/gamification/badge.py b/addons/gamification/models/badge.py
similarity index 98%
rename from addons/gamification/badge.py
rename to addons/gamification/models/badge.py
index 8e09a2a397b..6aa2f89e74e 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/models/badge.py
@@ -141,11 +141,11 @@ class gamification_badge(osv.Model):
         'remaining_sending': fields.function(_remaining_sending_calc, type='integer',
             string='Remaining Sending Allowed', help="If a maxium is set"),
 
-        'plan_ids': fields.one2many('gamification.goal.plan', 'reward_id',
+        'challenge_ids': fields.one2many('gamification.challenge', 'reward_id',
             string="Reward of Challenges"),
 
-        'goal_type_ids': fields.many2many('gamification.goal.type',
-            string='Goals Linked',
+        'goal_definition_ids': fields.many2many('gamification.goal.definition', 'badge_unlocked_definition_rel',
+            string='Rewarded by',
             help="The users that have succeeded theses goals will receive automatically the badge."),
 
         'owner_ids': fields.one2many('gamification.badge.user', 'badge_id',
diff --git a/addons/gamification/plan.py b/addons/gamification/models/challenge.py
similarity index 61%
rename from addons/gamification/plan.py
rename to addons/gamification/models/challenge.py
index 80631518b3d..f0873a368d7 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/models/challenge.py
@@ -61,19 +61,19 @@ def start_end_date_for_period(period, default_start_date=False, default_end_date
         return (start_date, end_date)
 
 
-class gamification_goal_plan(osv.Model):
-    """Gamification goal plan
+class gamification_challenge(osv.Model):
+    """Gamification challenge
 
-    Set of predifined goals to be able to automate goal settings or
-    quickly apply several goals manually to a group of users
+    Set of predifined objectives assigned to people with rules for recurrence and
+    rewards
 
     If 'user_ids' is defined and 'period' is different than 'one', the set will
     be assigned to the users for each period (eg: every 1st of each month if
     'monthly' is selected)
     """
 
-    _name = 'gamification.goal.plan'
-    _description = 'Gamification goal plan'
+    _name = 'gamification.challenge'
+    _description = 'Gamification challenge'
     _inherit = 'mail.thread'
 
     def _get_next_report_date(self, cr, uid, ids, field_name, arg, context=None):
@@ -82,32 +82,27 @@ class gamification_goal_plan(osv.Model):
 
         :return: a string in DEFAULT_SERVER_DATE_FORMAT representing the date"""
         res = {}
-        for plan in self.browse(cr, uid, ids, context):
-            last = datetime.strptime(plan.last_report_date, DF).date()
-            if plan.report_message_frequency == 'daily':
+        for challenge in self.browse(cr, uid, ids, context):
+            last = datetime.strptime(challenge.last_report_date, DF).date()
+            if challenge.report_message_frequency == 'daily':
                 next = last + timedelta(days=1)
-                res[plan.id] = next.strftime(DF)
-            elif plan.report_message_frequency == 'weekly':
+                res[challenge.id] = next.strftime(DF)
+            elif challenge.report_message_frequency == 'weekly':
                 next = last + timedelta(days=7)
-                res[plan.id] = next.strftime(DF)
-            elif plan.report_message_frequency == 'monthly':
+                res[challenge.id] = next.strftime(DF)
+            elif challenge.report_message_frequency == 'monthly':
                 month_range = calendar.monthrange(last.year, last.month)
                 next = last.replace(day=month_range[1]) + timedelta(days=1)
-                res[plan.id] = next.strftime(DF)
-            elif plan.report_message_frequency == 'yearly':
-                res[plan.id] = last.replace(year=last.year + 1).strftime(DF)
+                res[challenge.id] = next.strftime(DF)
+            elif challenge.report_message_frequency == 'yearly':
+                res[challenge.id] = last.replace(year=last.year + 1).strftime(DF)
             # frequency == 'once', reported when closed only
             else:
-                res[plan.id] = False
+                res[challenge.id] = False
 
         return res
 
-    def _planline_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict.fromkeys(ids, 0)
-        for plan in self.browse(cr, uid, ids, context):
-            res[plan.id] = len(plan.planline_ids)
-        return res
-
+    _sort = 'end_date, start_date, name, id'
     _columns = {
         'name': fields.char('Challenge Name', required=True, translate=True),
         'description': fields.text('Description', translate=True),
@@ -123,10 +118,10 @@ class gamification_goal_plan(osv.Model):
 
         'user_ids': fields.many2many('res.users', 'user_ids',
             string='Users',
-            help="List of users to which the goal will be set"),
+            help="List of users participating to the challenge"),
         'autojoin_group_id': fields.many2one('res.groups',
             string='Auto-subscription Group',
-            help='Group of users whose members will automatically be added to the users'),
+            help='Group of users whose members will be automatically added to user_ids once the challenge is started'),
 
         'period': fields.selection([
                 ('once', 'Non recurring'),
@@ -143,14 +138,13 @@ class gamification_goal_plan(osv.Model):
         'end_date': fields.date('End Date',
             help="The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."),
 
-        'proposed_user_ids': fields.many2many('res.users', 'proposed_user_ids',
+        'invited_user_ids': fields.many2many('res.users', 'invited_user_ids',
             string="Suggest to users"),
 
-        'planline_ids': fields.one2many('gamification.goal.planline', 'plan_id',
-            string='Planline',
+        'line_ids': fields.one2many('gamification.challenge.line', 'challenge_id',
+            string='Lines',
             help="List of goals that will be set",
             required=True),
-        'planline_count': fields.function(_planline_count, type='integer', string="Planlines"),
 
         'reward_id': fields.many2one('gamification.badge', string="For Every Succeding User"),
         'reward_first_id': fields.many2one('gamification.badge', string="For 1st user"),
@@ -202,70 +196,53 @@ class gamification_goal_plan(osv.Model):
         'reward_failure': False,
     }
 
-    _sort = 'end_date, start_date, name'
-
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
         context = context or {}
         if not ids:
             return True
 
-        # unsubscribe removed users from the plan
-        # users are not able to manually unsubscribe to challenges so should
-        # do it for them when not concerned anymore
-        if vals.get('user_ids'):
-            for action_tuple in vals['user_ids']:
-                if action_tuple[0] == 3:
-                    # form (3, ID), remove one
-                    self.message_unsubscribe_users(cr, uid, ids, [action_tuple[1]], context=context)
-                if action_tuple[0] == 5:
-                    # form (5,), remove all
-                    for plan in self.browse(cr, uid, ids, context=context):
-                        self.message_unsubscribe_users(cr, uid, [plan.id], [user.id for user in plan.user_ids], context=context)
-                if action_tuple[0] == 6:
-                    # form (6, False, [IDS]), replace by IDS
-                    for plan in self.browse(cr, uid, ids, context=context):
-                        removed_users = set([user.id for user in plan.user_ids]) - set(action_tuple[2])
-                        self.message_unsubscribe_users(cr, uid, [plan.id], list(removed_users), context=context)
-
-        write_res = super(gamification_goal_plan, self).write(cr, uid, ids, vals, context=context)
-
         # add users when change the group auto-subscription
-        if 'autojoin_group_id' in vals:
+        if vals.get('autojoin_group_id'):
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
-            group_user_ids = [user.id for user in new_group.users]
-            for plan in self.browse(cr, uid, ids, context=context):
-                self.write(cr, uid, [plan.id], {'user_ids': [(4, user) for user in group_user_ids]}, context=context)
 
-        # subscribe new users to the plan
-        if 'user_ids' in vals:
-            for plan in self.browse(cr, uid, ids, context=context):
-                self.message_subscribe_users(cr, uid, ids, [user.id for user in plan.user_ids], context=context)
+            if 'user_ids' not in vals:
+                vals['user_ids'] = []
+            vals['user_ids'] += [(4, user.id) for user in new_group.users]
+
+        write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
+
+        # subscribe new users to the challenge
+        if vals.get('user_ids'):
+            # done with browse after super if changes in groups
+            for challenge in self.browse(cr, uid, ids, context=context):
+                self.message_subscribe_users(cr, uid, [challenge.id], [user.id for user in challenge.user_ids], context=context)
+
         return write_res
 
+
     ##### Update #####
 
     def _cron_update(self, cr, uid, context=None, ids=False):
         """Daily cron check.
 
-        Start planned plans (in draft and with start_date = today)
-        Create the goals for planlines not linked to goals (eg: modified the
-            plan to add planlines)
-        Update every plan running
+        - Start planned challenges (in draft and with start_date = today)
+        - Create the missing goals (eg: modified the challenge to add lines)
+        - Update every running challenge
         """
         if not context: context = {}
 
-        # start planned plans
-        planned_plan_ids = self.search(cr, uid, [
+        # start planned challenges
+        planned_challenge_ids = self.search(cr, uid, [
             ('state', '=', 'draft'),
             ('start_date', '<=', fields.date.today())])
-        self.action_start(cr, uid, planned_plan_ids, context=context)
+        self.action_start(cr, uid, planned_challenge_ids, context=context)
 
-        # close planned plans
-        planned_plan_ids = self.search(cr, uid, [
+        # close planned challenges
+        planned_challenge_ids = self.search(cr, uid, [
             ('state', '=', 'inprogress'),
             ('end_date', '>=', fields.date.today())])
-        self.action_close(cr, uid, planned_plan_ids, context=context)
+        self.action_close(cr, uid, planned_challenge_ids, context=context)
 
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')], context=context)
@@ -273,17 +250,17 @@ class gamification_goal_plan(osv.Model):
         return self._update_all(cr, uid, ids, context=context)
 
     def _update_all(self, cr, uid, ids, context=None):
-        """Update the plans and related goals
+        """Update the challenges and related goals
 
-        :param list(int) ids: the ids of the plans to update, if False will
-        update only plans in progress."""
+        :param list(int) ids: the ids of the challenges to update, if False will
+        update only challenges in progress."""
         if not context: context = {}
         goal_obj = self.pool.get('gamification.goal')
 
         # we use yesterday to update the goals that just ended
         yesterday = date.today() - timedelta(days=1)
         goal_ids = goal_obj.search(cr, uid, [
-            ('plan_id', 'in', ids),
+            ('challenge_id', 'in', ids),
             '|',
                 ('state', 'in', ('inprogress', 'inprogress_update')),
                 '&',
@@ -292,121 +269,123 @@ class gamification_goal_plan(osv.Model):
                         ('end_date', '>=', yesterday.strftime(DF)),
                         ('end_date', '=', False)
         ], context=context)
-        # update every running goal already generated linked to selected plans
+        # update every running goal already generated linked to selected challenges
         goal_obj.update(cr, uid, goal_ids, context=context)
 
-        for plan in self.browse(cr, uid, ids, context=context):
-            if plan.autojoin_group_id:
-                # check in case of new users in plan, this happens if manager removed users in plan manually
-                self.write(cr, uid, [plan.id], {'user_ids': [(4, user.id) for user in plan.autojoin_group_id.users]}, context=context)
-            self.generate_goals_from_plan(cr, uid, [plan.id], context=context)
+        for challenge in self.browse(cr, uid, ids, context=context):
+            if challenge.autojoin_group_id:
+                # check in case of new users in challenge, this happens if manager removed users in challenge manually
+                self.write(cr, uid, [challenge.id], {'user_ids': [(4, user.id) for user in challenge.autojoin_group_id.users]}, context=context)
+            self.generate_goals_from_challenge(cr, uid, [challenge.id], context=context)
 
             # goals closed but still opened at the last report date
             closed_goals_to_report = goal_obj.search(cr, uid, [
-                ('plan_id', '=', plan.id),
-                ('start_date', '>=', plan.last_report_date),
-                ('end_date', '<=', plan.last_report_date)
+                ('challenge_id', '=', challenge.id),
+                ('start_date', '>=', challenge.last_report_date),
+                ('end_date', '<=', challenge.last_report_date)
             ])
 
             if len(closed_goals_to_report) > 0:
                 # some goals need a final report
-                self.report_progress(cr, uid, plan, subset_goal_ids=closed_goals_to_report, context=context)
+                self.report_progress(cr, uid, challenge, subset_goal_ids=closed_goals_to_report, context=context)
 
-            if fields.date.today() == plan.next_report_date:
-                self.report_progress(cr, uid, plan, context=context)
+            if fields.date.today() == challenge.next_report_date:
+                self.report_progress(cr, uid, challenge, context=context)
 
         self.check_challenge_reward(cr, uid, ids, context=context)
         return True
 
-    def quick_update(self, cr, uid, plan_id, context=None):
-        """Update all the goals of a plan, no generation of new goals"""
+    def quick_update(self, cr, uid, challenge_id, context=None):
+        """Update all the goals of a challenge, no generation of new goals"""
         if not context: context = {}
-        goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('plan_id', '=', plan_id)], context=context)
+        goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', '=', challenge_id)], context=context)
         self.pool.get('gamification.goal').update(cr, uid, goal_ids, context=context)
         return True
 
+
     ##### User actions #####
 
     def action_start(self, cr, uid, ids, context=None):
-        """Start a draft goal plan
+        """Start a draft challenge
 
-        Change the state of the plan to in progress and generate related goals
+        Change the state of the challenge to in progress and generate related goals
         """
         # subscribe users if autojoin group
-        for plan in self.browse(cr, uid, ids, context=context):
-            if plan.autojoin_group_id:
-                self.write(cr, uid, [plan.id], {'user_ids': [(4, user.id) for user in plan.autojoin_group_id.users]}, context=context)
+        for challenge in self.browse(cr, uid, ids, context=context):
+            if challenge.autojoin_group_id:
+                self.write(cr, uid, [challenge.id], {'user_ids': [(4, user.id) for user in challenge.autojoin_group_id.users]}, context=context)
 
-            self.write(cr, uid, plan.id, {'state': 'inprogress'}, context=context)
-            self.message_post(cr, uid, plan.id, body="New challenge started.", context=context)
-        return self.generate_goals_from_plan(cr, uid, ids, context=context)
+            self.write(cr, uid, challenge.id, {'state': 'inprogress'}, context=context)
+            self.message_post(cr, uid, challenge.id, body="New challenge started.", context=context)
+        return self.generate_goals_from_challenge(cr, uid, ids, context=context)
 
     def action_check(self, cr, uid, ids, context=None):
-        """Check a goal plan
+        """Check a challenge
 
-        Create goals that haven't been created yet (eg: if added users of planlines)
+        Create goals that haven't been created yet (eg: if added users)
         Recompute the current value for each goal related"""
         return self._update_all(cr, uid, ids=ids, context=context)
 
     def action_close(self, cr, uid, ids, context=None):
-        """Close a plan in progress
+        """Close a challenge in progress
 
-        Change the state of the plan to in done
+        Change the state of the challenge to in done
         Does NOT close the related goals, this is handled by the goal itself"""
         self.check_challenge_reward(cr, uid, ids, force=True, context=context)
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def action_reset(self, cr, uid, ids, context=None):
-        """Reset a closed goal plan
+        """Reset a closed challenge
 
-        Change the state of the plan to in progress
-        Closing a plan does not affect the goals so neither does reset"""
+        Change the state of the challenge to in progress
+        Closing a challenge does not affect the goals so neither does reset"""
         return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
     def action_cancel(self, cr, uid, ids, context=None):
-        """Cancel a plan in progress
+        """Cancel a challenge in progress
 
-        Change the state of the plan to draft
+        Change the state of the challenge to draft
         Cancel the related goals"""
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
-        goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('plan_id', 'in', ids)], context=context)
+        goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', 'in', ids)], context=context)
         self.pool.get('gamification.goal').write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
 
         return True
 
     def action_report_progress(self, cr, uid, ids, context=None):
         """Manual report of a goal, does not influence automatic report frequency"""
-        for plan in self.browse(cr, uid, ids, context):
-            self.report_progress(cr, uid, plan, context=context)
+        for challenge in self.browse(cr, uid, ids, context):
+            self.report_progress(cr, uid, challenge, context=context)
         return True
 
+
     ##### Automatic actions #####
 
-    def generate_goals_from_plan(self, cr, uid, ids, context=None):
-        """Generate the list of goals linked to a plan.
+    def generate_goals_from_challenge(self, cr, uid, ids, context=None):
+        """Generate the goals for each line and user.
 
-        If goals already exist for this planline, the planline is skipped. This
-        can be called after each change in the user or planline list.
-        :param list(int) ids: the list of plan concerned"""
+        If goals already exist for this line and user, the line is skipped. This
+        can be called after each change in the list of users or lines.
+        :param list(int) ids: the list of challenge concerned"""
 
-        for plan in self.browse(cr, uid, ids, context):
-            (start_date, end_date) = start_end_date_for_period(plan.period)
+        for challenge in self.browse(cr, uid, ids, context):
+            (start_date, end_date) = start_end_date_for_period(challenge.period)
 
-            # if no periodicity, use plan dates
-            if not start_date and plan.start_date:
-                start_date = plan.start_date
-            if not end_date and plan.end_date:
-                end_date = plan.end_date
+            # if no periodicity, use challenge dates
+            if not start_date and challenge.start_date:
+                start_date = challenge.start_date
+            if not end_date and challenge.end_date:
+                end_date = challenge.end_date
 
-            for planline in plan.planline_ids:
-                for user in plan.user_ids:
+            for line in challenge.line_ids:
+                for user in challenge.user_ids:
 
                     goal_obj = self.pool.get('gamification.goal')
-                    domain = [('planline_id', '=', planline.id), ('user_id', '=', user.id)]
+                    domain = [('line_id', '=', line.id), ('user_id', '=', user.id)]
                     if start_date:
                         domain.append(('start_date', '=', start_date))
 
-                    # goal already existing for this planline ?
+                    # goal already existing for this line ?
                     if len(goal_obj.search(cr, uid, domain, context=context)) > 0:
 
                         # resume canceled goals
@@ -419,10 +398,10 @@ class gamification_goal_plan(osv.Model):
                         continue
 
                     values = {
-                        'type_id': planline.type_id.id,
-                        'planline_id': planline.id,
+                        'definition_id': line.definition_id.id,
+                        'line_id': line.id,
                         'user_id': user.id,
-                        'target_goal': planline.target_goal,
+                        'target_goal': line.target_goal,
                         'state': 'inprogress',
                     }
 
@@ -431,8 +410,8 @@ class gamification_goal_plan(osv.Model):
                     if end_date:
                         values['end_date'] = end_date
 
-                    if planline.plan_id.remind_update_delay:
-                        values['remind_update_delay'] = planline.plan_id.remind_update_delay
+                    if challenge.remind_update_delay:
+                        values['remind_update_delay'] = challenge.remind_update_delay
 
                     new_goal_id = goal_obj.create(cr, uid, values, context)
 
@@ -442,17 +421,17 @@ class gamification_goal_plan(osv.Model):
 
     ##### JS utilities #####
 
-    def get_board_goal_info(self, cr, uid, plan, subset_goal_ids=False, context=None):
-        """Get the list of latest goals for a plan, sorted by user ranking for each planline"""
+    def get_board_goal_info(self, cr, uid, challenge, subset_goal_ids=False, context=None):
+        """Get the list of latest goals for a challenge, sorted by user ranking for each line"""
 
         goal_obj = self.pool.get('gamification.goal')
-        planlines_boards = []
-        (start_date, end_date) = start_end_date_for_period(plan.period)
+        lines_boards = []
+        (start_date, end_date) = start_end_date_for_period(challenge.period)
 
-        for planline in plan.planline_ids:
+        for line in challenge.line_ids:
 
             domain = [
-                ('planline_id', '=', planline.id),
+                ('line_id', '=', line.id),
                 ('state', 'in', ('inprogress', 'inprogress_update',
                                  'reached', 'failed')),
             ]
@@ -471,24 +450,24 @@ class gamification_goal_plan(osv.Model):
             board_goals = [goal for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context)]
 
             if len(board_goals) == 0:
-                # planline has no generated goals
+                # line has no generated goals
                 continue
 
             # most complete first, current if same percentage (eg: if several 100%)
             sorted_board = enumerate(sorted(board_goals, key=lambda k: (k.completeness, k.current), reverse=True))
-            planlines_boards.append({'goal_type': planline.type_id, 'board_goals': sorted_board, 'target_goal': planline.target_goal})
-        return planlines_boards
+            lines_boards.append({'goal_definition': line.definition_id, 'board_goals': sorted_board, 'target_goal': line.target_goal})
+        return lines_boards
 
-    def get_indivual_goal_info(self, cr, uid, user_id, plan, subset_goal_ids=False, context=None):
-        """Get the list of latest goals of a user for a plan"""
+    def get_indivual_goal_info(self, cr, uid, user_id, challenge, subset_goal_ids=False, context=None):
+        """Get the list of latest goals of a user for a challenge"""
         domain = [
-            ('plan_id', '=', plan.id),
+            ('challenge_id', '=', challenge.id),
             ('user_id', '=', user_id),
             ('state', 'in', ('inprogress', 'inprogress_update',
                              'reached', 'failed')),
         ]
         goal_obj = self.pool.get('gamification.goal')
-        (start_date, end_date) = start_end_date_for_period(plan.period)
+        (start_date, end_date) = start_end_date_for_period(challenge.period)
 
         if subset_goal_ids:
             # use the domain for safety, don't want irrelevant report if wrong argument
@@ -510,7 +489,7 @@ class gamification_goal_plan(osv.Model):
         for goal in goal_obj.browse(cr, uid, related_goal_ids, context=context):
             if goal.end_date:
                 if goal.end_date < fields.date.today():
-                    # do not include goals of previous plan run
+                    # do not include goals of previous challenge run
                     continue
                 else:
                     all_done = False
@@ -521,24 +500,24 @@ class gamification_goal_plan(osv.Model):
             goals.append(goal)
 
         if all_done:
-            # skip plans where all goal are done or failed
+            # skip challenges where all goal are done or failed
             return False
         else:
             return goals
 
     ##### Reporting #####
 
-    def report_progress(self, cr, uid, plan, context=None, users=False, subset_goal_ids=False):
+    def report_progress(self, cr, uid, challenge, context=None, users=False, subset_goal_ids=False):
         """Post report about the progress of the goals
 
-        :param plan: the plan object that need to be reported
+        :param challenge: the challenge object that need to be reported
         :param users: the list(res.users) of users that are concerned by
           the report. If False, will send the report to every user concerned
-          (goal users and group that receive a copy). Only used for plan with
+          (goal users and group that receive a copy). Only used for challenge with
           a visibility mode set to 'personal'.
-        :param goal_ids: the list(int) of goal ids linked to the plan for
-          the report. If not specified, use the goals for the current plan
-          period. This parameter can be used to produce report for previous plan
+        :param goal_ids: the list(int) of goal ids linked to the challenge for
+          the report. If not specified, use the goals for the current challenge
+          period. This parameter can be used to produce report for previous challenge
           periods.
         :param subset_goal_ids: a list(int) of goal ids to restrict the report
         """
@@ -547,81 +526,81 @@ class gamification_goal_plan(osv.Model):
         # template_env = TemplateHelper()
         temp_obj = self.pool.get('email.template')
         ctx = context.copy()
-        if plan.visibility_mode == 'board':
-            planlines_boards = self.get_board_goal_info(cr, uid, plan, subset_goal_ids, context)
+        if challenge.visibility_mode == 'board':
+            lines_boards = self.get_board_goal_info(cr, uid, challenge, subset_goal_ids, context)
 
-            ctx.update({'planlines_boards': planlines_boards})
+            ctx.update({'lines_boards': lines_boards})
             template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_group', context)
-            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.goal.plan', plan.id, context=context)
+            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.challenge', challenge.id, context=context)
 
-            # body_html = template_env.get_template('group_progress.mako').render({'object': plan, 'planlines_boards': planlines_boards, 'uid': uid})
+            # body_html = template_env.get_template('group_progress.mako').render({'object': challenge, 'lines_boards': lines_boards, 'uid': uid})
 
-            # send to every follower of the plan
-            self.message_post(cr, uid, plan.id,
+            # send to every follower of the challenge
+            self.message_post(cr, uid, challenge.id,
                 body=body_html,
                 context=context,
                 subtype='mail.mt_comment')
-            if plan.report_message_group_id:
-                self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+            if challenge.report_message_group_id:
+                self.pool.get('mail.group').message_post(cr, uid, challenge.report_message_group_id.id,
                     body=body_html,
                     context=context,
                     subtype='mail.mt_comment')
 
         else:
             # generate individual reports
-            for user in users or plan.user_ids:
-                goals = self.get_indivual_goal_info(cr, uid, user.id, plan, subset_goal_ids, context=context)
+            for user in users or challenge.user_ids:
+                goals = self.get_indivual_goal_info(cr, uid, user.id, challenge, subset_goal_ids, context=context)
                 if not goals:
                     continue
 
                 ctx.update({'goals': goals})
                 template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_perso', context)
-                body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.goal.plan', plan.id, context=context)
+                body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.challenge', challenge.id, context=context)
                 # send message only to users
                 self.message_post(cr, uid, 0,
                                   body=body_html,
                                   partner_ids=[(4, user.partner_id.id)],
                                   context=context,
                                   subtype='mail.mt_comment')
-                if plan.report_message_group_id:
-                    self.pool.get('mail.group').message_post(cr, uid, plan.report_message_group_id.id,
+                if challenge.report_message_group_id:
+                    self.pool.get('mail.group').message_post(cr, uid, challenge.report_message_group_id.id,
                                                              body=body_html,
                                                              context=context,
                                                              subtype='mail.mt_comment')
-        return self.write(cr, uid, plan.id, {'last_report_date': fields.date.today()}, context=context)
+        return self.write(cr, uid, challenge.id, {'last_report_date': fields.date.today()}, context=context)
 
     ##### Challenges #####
 
-    def accept_challenge(self, cr, uid, plan_ids, context=None, user_id=None):
+    def accept_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user accept the suggested challenge"""
         context = context or {}
         user_id = user_id or uid
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
-        self.message_post(cr, uid, plan_ids, body=message, context=context)
-        self.write(cr, uid, plan_ids, {'proposed_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
-        return self.generate_goals_from_plan(cr, uid, plan_ids, context=context)
+        self.message_post(cr, uid, challenge_ids, body=message, context=context)
+        self.write(cr, uid, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
+        return self.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
 
-    def discard_challenge(self, cr, uid, plan_ids, context=None, user_id=None):
+    def discard_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user discard the suggested challenge"""
         context = context or {}
         user_id = user_id or uid
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has refused the challenge" % user.name
-        self.message_post(cr, uid, plan_ids, body=message, context=context)
-        return self.write(cr, uid, plan_ids, {'proposed_user_ids': (3, user_id)}, context=context)
+        self.message_post(cr, uid, challenge_ids, body=message, context=context)
+        return self.write(cr, uid, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
 
-    def reply_challenge_wizard(self, cr, uid, plan_id, context=None):
+    def reply_challenge_wizard(self, cr, uid, challenge_id, context=None):
         context = context or {}
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         result = mod_obj.get_object_reference(cr, uid, 'gamification', 'challenge_wizard')
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['res_id'] = plan_id
+        result['res_id'] = challenge_id
         return result
 
-    def check_challenge_reward(self, cr, uid, plan_ids, force=False, context=None):
+    def check_challenge_reward(self, cr, uid, challenge_ids, force=False, context=None):
         """Actions for the end of a challenge
 
         If a reward was selected, grant it to the correct users.
@@ -632,55 +611,55 @@ class gamification_goal_plan(osv.Model):
         (if no end date, a running challenge is never rewarded)
         """
         context = context or {}
-        for plan in self.browse(cr, uid, plan_ids, context=context):
-            (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
+        for challenge in self.browse(cr, uid, challenge_ids, context=context):
+            (start_date, end_date) = start_end_date_for_period(challenge.period, challenge.start_date, challenge.end_date)
             yesterday = date.today() - timedelta(days=1)
             if end_date == yesterday.strftime(DF) or force:
                 # open chatter message
-                message_body = _("The challenge %s is finished." % plan.name)
+                message_body = _("The challenge %s is finished." % challenge.name)
 
                 # reward for everybody succeeding
                 rewarded_users = []
-                if plan.reward_id:
-                    for user in plan.user_ids:
+                if challenge.reward_id:
+                    for user in challenge.user_ids:
                         reached_goal_ids = self.pool.get('gamification.goal').search(cr, uid, [
-                            ('plan_id', '=', plan.id),
+                            ('challenge_id', '=', challenge.id),
                             ('user_id', '=', user.id),
                             ('start_date', '=', start_date),
                             ('end_date', '=', end_date),
                             ('state', '=', 'reached')
                         ], context=context)
-                        if len(reached_goal_ids) == len(plan.planline_ids):
-                            self.reward_user(cr, uid, user.id, plan.reward_id.id, context)
+                        if len(reached_goal_ids) == len(challenge.line_ids):
+                            self.reward_user(cr, uid, user.id, challenge.reward_id.id, context)
                             rewarded_users.append(user)
 
                     if rewarded_users:
-                        message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (plan.reward_id.name, ", ".join([user.name for user in rewarded_users])))
+                        message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([user.name for user in rewarded_users])))
                     else:
                         message_body += _("<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge.")
 
                 # reward bests
-                if plan.reward_first_id:
-                    (first_user, second_user, third_user) = self.get_top3_users(cr, uid, plan, context)
+                if challenge.reward_first_id:
+                    (first_user, second_user, third_user) = self.get_top3_users(cr, uid, challenge, context)
                     if first_user:
-                        self.reward_user(cr, uid, first_user.id, plan.reward_first_id.id, context)
+                        self.reward_user(cr, uid, first_user.id, challenge.reward_first_id.id, context)
                         message_body += _("<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :")
-                        message_body += "<br/> 1. %s - %s" % (first_user.name, plan.reward_first_id.name)
+                        message_body += "<br/> 1. %s - %s" % (first_user.name, challenge.reward_first_id.name)
                     else:
                         message_body += _("Nobody reached the required conditions to receive special badges.")
 
-                    if second_user and plan.reward_second_id:
-                        self.reward_user(cr, uid, second_user.id, plan.reward_second_id.id, context)
-                        message_body += "<br/> 2. %s - %s" % (second_user.name, plan.reward_second_id.name)
-                    if third_user and plan.reward_third_id:
-                        self.reward_user(cr, uid, third_user.id, plan.reward_second_id.id, context)
-                        message_body += "<br/> 3. %s - %s" % (third_user.name, plan.reward_third_id.name)
+                    if second_user and challenge.reward_second_id:
+                        self.reward_user(cr, uid, second_user.id, challenge.reward_second_id.id, context)
+                        message_body += "<br/> 2. %s - %s" % (second_user.name, challenge.reward_second_id.name)
+                    if third_user and challenge.reward_third_id:
+                        self.reward_user(cr, uid, third_user.id, challenge.reward_second_id.id, context)
+                        message_body += "<br/> 3. %s - %s" % (third_user.name, challenge.reward_third_id.name)
 
-                self.message_post(cr, uid, plan.id, body=message_body, context=context)
+                self.message_post(cr, uid, challenge.id, body=message_body, context=context)
         return True
 
-    def get_top3_users(self, cr, uid, plan, context=None):
-        """Get the top 3 users for a defined plan
+    def get_top3_users(self, cr, uid, challenge, context=None):
+        """Get the top 3 users for a defined challenge
 
         Ranking criterias:
             1. succeed every goal of the challenge
@@ -694,14 +673,14 @@ class gamification_goal_plan(osv.Model):
         higher one (eg: if 'second' == False, 'third' will be False)
         """
         goal_obj = self.pool.get('gamification.goal')
-        (start_date, end_date) = start_end_date_for_period(plan.period, plan.start_date, plan.end_date)
+        (start_date, end_date) = start_end_date_for_period(challenge.period, challenge.start_date, challenge.end_date)
         challengers = []
-        for user in plan.user_ids:
+        for user in challenge.user_ids:
             all_reached = True
             total_completness = 0
             # every goal of the user for the running period
             goal_ids = goal_obj.search(cr, uid, [
-                ('plan_id', '=', plan.id),
+                ('challenge_id', '=', challenge.id),
                 ('user_id', '=', user.id),
                 ('start_date', '=', start_date),
                 ('end_date', '=', end_date)
@@ -709,7 +688,7 @@ class gamification_goal_plan(osv.Model):
             for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
                 if goal.state != 'reached':
                     all_reached = False
-                if goal.type_condition == 'higher':
+                if goal.definition_condition == 'higher':
                     # can be over 100
                     total_completness += 100.0 * goal.current / goal.target_goal
                 elif goal.state == 'reached':
@@ -719,13 +698,13 @@ class gamification_goal_plan(osv.Model):
             challengers.append({'user': user, 'all_reached': all_reached, 'total_completness': total_completness})
         sorted_challengers = sorted(challengers, key=lambda k: (k['all_reached'], k['total_completness']), reverse=True)
 
-        if len(sorted_challengers) == 0 or (not plan.reward_failure and not sorted_challengers[0]['all_reached']):
+        if len(sorted_challengers) == 0 or (not challenge.reward_failure and not sorted_challengers[0]['all_reached']):
             # nobody succeeded
             return (False, False, False)
-        if len(sorted_challengers) == 1 or (not plan.reward_failure and not sorted_challengers[1]['all_reached']):
+        if len(sorted_challengers) == 1 or (not challenge.reward_failure and not sorted_challengers[1]['all_reached']):
             # only one user succeeded
             return (sorted_challengers[0]['user'], False, False)
-        if len(sorted_challengers) == 2 or (not plan.reward_failure and not sorted_challengers[2]['all_reached']):
+        if len(sorted_challengers) == 2 or (not challenge.reward_failure and not sorted_challengers[2]['all_reached']):
             # only one user succeeded
             return (sorted_challengers[0]['user'], sorted_challengers[1]['user'], False)
         return (sorted_challengers[0]['user'], sorted_challengers[1]['user'], sorted_challengers[2]['user'])
@@ -736,66 +715,50 @@ class gamification_goal_plan(osv.Model):
         return self.pool.get('gamification.badge').send_badge(cr, uid, badge_id, [user_badge_id], user_from=None, context=context)
 
 
-class gamification_goal_planline(osv.Model):
-    """Gamification goal planline
+class gamification_challenge_line(osv.Model):
+    """Gamification challenge line
 
-    Predifined goal for 'gamification_goal_plan'
+    Predifined goal for 'gamification_challenge'
     These are generic list of goals with only the target goal defined
-    Should only be created for the gamification_goal_plan object
+    Should only be created for the gamification_challenge object
     """
 
-    _name = 'gamification.goal.planline'
-    _description = 'Gamification generic goal for plan'
-    _order = "sequence, sequence_type, id"
+    _name = 'gamification.challenge.line'
+    _description = 'Gamification generic goal for challenge'
+    _order = "sequence, id"
 
-    def _get_planline_types(self, cr, uid, ids, context=None):
-        """Return the ids of planline items related to the gamification.goal.type
-        objects in 'ids (used to update the value of 'sequence_type')'"""
-
-        result = {}
-        for goal_type in self.pool.get('gamification.goal.type').browse(cr, uid, ids, context=context):
-            domain = [('type_id', '=', goal_type.id)]
-            planline_ids = self.pool.get('gamification.goal.planline').search(cr, uid, domain, context=context)
-            for p_id in planline_ids:
-                result[p_id] = True
-        return result.keys()
-
-    def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
-        goal_type = self.pool.get('gamification.goal.type')
-        if not type_id:
-            return {'value': {'type_id': False}}
-        goal_type = goal_type.browse(cr, uid, type_id, context=context)
-        ret = {'value': {
-            'type_condition': goal_type.condition,
-            'type_full_suffix': goal_type.full_suffix}}
+    def on_change_definition_id(self, cr, uid, ids, definition_id=False, context=None):
+        goal_definition = self.pool.get('gamification.goal.definition')
+        if not definition_id:
+            return {'value': {'definition_id': False}}
+        goal_definition = goal_definition.browse(cr, uid, definition_id, context=context)
+        ret = {
+            'value': {
+                'definition_condition': goal_definition.condition,
+                'definition_full_suffix': goal_definition.full_suffix
+            }
+        }
         return ret
 
     _columns = {
-        'name': fields.related('type_id', 'name', string="Name"),
-        'plan_id': fields.many2one('gamification.goal.plan',
-            string='Plan',
+        'name': fields.related('definition_id', 'name', string="Name"),
+        'challenge_id': fields.many2one('gamification.challenge',
+            string='Challenge',
             required=True,
             ondelete="cascade"),
-        'type_id': fields.many2one('gamification.goal.type',
-            string='Goal Type',
+        'definition_id': fields.many2one('gamification.goal.definition',
+            string='Goal Definition',
             required=True,
             ondelete="cascade"),
         'target_goal': fields.float('Target Value to Reach',
             required=True),
         'sequence': fields.integer('Sequence',
             help='Sequence number for ordering'),
-        'sequence_type': fields.related('type_id', 'sequence',
-            type='integer',
-            string='Sequence',
-            readonly=True,
-            store={
-                'gamification.goal.type': (_get_planline_types, ['sequence'], 10),
-                }),
-        'type_condition': fields.related('type_id', 'condition', type="selection",
+        'definition_condition': fields.related('definition_id', 'condition', type="selection",
             readonly=True, string="Condition", selection=[('lower', '<='), ('higher', '>=')]),
-        'type_suffix': fields.related('type_id', 'suffix', type="char", readonly=True, string="Unit"),
-        'type_monetary': fields.related('type_id', 'monetary', type="boolean", readonly=True, string="Monetary"),
-        'type_full_suffix': fields.related('type_id', 'full_suffix', type="char", readonly=True, string="Suffix"),
+        'definition_suffix': fields.related('definition_id', 'suffix', type="char", readonly=True, string="Unit"),
+        'definition_monetary': fields.related('definition_id', 'monetary', type="boolean", readonly=True, string="Monetary"),
+        'definition_full_suffix': fields.related('definition_id', 'full_suffix', type="char", readonly=True, string="Suffix"),
     }
 
     _default = {
diff --git a/addons/gamification/goal.py b/addons/gamification/models/goal.py
similarity index 80%
rename from addons/gamification/goal.py
rename to addons/gamification/models/goal.py
index 11a3b2517ff..5a170a904c6 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/models/goal.py
@@ -32,16 +32,15 @@ import logging
 _logger = logging.getLogger(__name__)
 
 
-class gamification_goal_type(osv.Model):
-    """Goal type definition
+class gamification_goal_definition(osv.Model):
+    """Goal definition
 
-    A goal type defining a way to set an objective and evaluate it
+    A goal definition contains the way to evaluate an objective
     Each module wanting to be able to set goals to the users needs to create
-    a new gamification_goal_type
+    a new gamification_goal_definition
     """
-    _name = 'gamification.goal.type'
-    _description = 'Gamification goal type'
-    _order = 'sequence'
+    _name = 'gamification.goal.definition'
+    _description = 'Gamification goal definition'
 
     def _get_suffix(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, '')
@@ -60,7 +59,7 @@ class gamification_goal_type(osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Goal Type', required=True, translate=True),
+        'name': fields.char('Goal Definition', required=True, translate=True),
         'description': fields.text('Goal Description'),
         'monetary': fields.boolean('Monetary Value', help="The target and current value are defined in the company currency."),
         'suffix': fields.char('Suffix', help="The unit of the target and current values", translate=True),
@@ -92,7 +91,7 @@ class gamification_goal_type(osv.Model):
             help="Technical filters rules to apply. Use 'user.id' (without marks) to limit the search to the evaluated user.",
             required=True),
         'compute_code': fields.char('Compute Code',
-            help="The name of the python method that will be executed to compute the current value. See the file gamification/goal_type_data.py for examples."),
+            help="The name of the python method that will be executed to compute the current value. See the file gamification/goal_definition_data.py for examples."),
         'condition': fields.selection([
                 ('higher', 'The higher the better'),
                 ('lower', 'The lower the better')
@@ -100,7 +99,6 @@ class gamification_goal_type(osv.Model):
             string='Goal Performance',
             help='A goal is considered as completed when the current value is compared to the value to reach',
             required=True),
-        'sequence': fields.integer('Sequence', help='Sequence number for ordering', required=True),
         'action_id': fields.many2one('ir.actions.act_window', string="Action",
             help="The action that will be called to update the goal value."),
         'res_id_field': fields.char("ID Field of user",
@@ -108,7 +106,6 @@ class gamification_goal_type(osv.Model):
     }
 
     _defaults = {
-        'sequence': 1,
         'condition': 'higher',
         'computation_mode': 'manually',
         'domain': "[]",
@@ -130,7 +127,7 @@ class gamification_goal(osv.Model):
         """Return the percentage of completeness of the goal, between 0 and 100"""
         res = dict.fromkeys(ids, 0.0)
         for goal in self.browse(cr, uid, ids, context=context):
-            if goal.type_condition == 'higher':
+            if goal.definition_condition == 'higher':
                 if goal.current >= goal.target_goal:
                     res[goal.id] = 100.0
                 else:
@@ -142,21 +139,21 @@ class gamification_goal(osv.Model):
                 res[goal.id] = 0.0
         return res
 
-    def on_change_type_id(self, cr, uid, ids, type_id=False, context=None):
-        goal_type = self.pool.get('gamification.goal.type')
-        if not type_id:
-            return {'value': {'type_id': False}}
-        goal_type = goal_type.browse(cr, uid, type_id, context=context)
-        return {'value': {'computation_mode': goal_type.computation_mode, 'type_condition': goal_type.condition}}
+    def on_change_definition_id(self, cr, uid, ids, definition_id=False, context=None):
+        goal_definition = self.pool.get('gamification.goal.definition')
+        if not definition_id:
+            return {'value': {'definition_id': False}}
+        goal_definition = goal_definition.browse(cr, uid, definition_id, context=context)
+        return {'value': {'computation_mode': goal_definition.computation_mode, 'definition_condition': goal_definition.condition}}
 
     _columns = {
-        'type_id': fields.many2one('gamification.goal.type', string='Goal Type', required=True, ondelete="cascade"),
+        'definition_id': fields.many2one('gamification.goal.definition', string='Goal Definition', required=True, ondelete="cascade"),
         'user_id': fields.many2one('res.users', string='User', required=True),
-        'planline_id': fields.many2one('gamification.goal.planline', string='Goal Planline', ondelete="cascade"),
-        'plan_id': fields.related('planline_id', 'plan_id',
-            string="Plan",
+        'line_id': fields.many2one('gamification.challenge.line', string='Goal Line', ondelete="cascade"),
+        'challenge_id': fields.related('line_id', 'challenge_id',
+            string="Challenge",
             type='many2one',
-            relation='gamification.goal.plan',
+            relation='gamification.challenge',
             store=True),
         'start_date': fields.date('Start Date'),
         'end_date': fields.date('End Date'),  # no start and end = always active
@@ -177,16 +174,16 @@ class gamification_goal(osv.Model):
             required=True,
             track_visibility='always'),
 
-        'computation_mode': fields.related('type_id', 'computation_mode', type='char', string="Type computation mode"),
+        'computation_mode': fields.related('definition_id', 'computation_mode', type='char', string="Computation mode"),
         'remind_update_delay': fields.integer('Remind delay',
             help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."),
         'last_update': fields.date('Last Update',
-            help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."),
+            help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in challenge). Ignored in case of non-manual goal or goal not linked to a challenge."),
 
-        'type_description': fields.related('type_id', 'description', type='char', string='Type Description', readonly=True),
-        'type_condition': fields.related('type_id', 'condition', type='char', string='Type Condition', readonly=True),
-        'type_suffix': fields.related('type_id', 'full_suffix', type="char", string="Suffix", readonly=True),
-        'type_display': fields.related('type_id', 'display_mode', type="char", string="Display Mode", readonly=True),
+        'definition_description': fields.related('definition_id', 'description', type='char', string='Definition Description', readonly=True),
+        'definition_condition': fields.related('definition_id', 'condition', type='char', string='Definition Condition', readonly=True),
+        'definition_suffix': fields.related('definition_id', 'full_suffix', type="char", string="Suffix", readonly=True),
+        'definition_display': fields.related('definition_id', 'display_mode', type="char", string="Display Mode", readonly=True),
     }
 
     _defaults = {
@@ -194,7 +191,7 @@ class gamification_goal(osv.Model):
         'state': 'draft',
         'start_date': fields.date.today,
     }
-    _order = 'create_date desc, end_date desc, type_id, id'
+    _order = 'create_date desc, end_date desc, definition_id, id'
 
     def _check_remind_delay(self, cr, uid, goal, context=None):
         """Verify if a goal has not been updated for some time and send a
@@ -230,26 +227,26 @@ class gamification_goal(osv.Model):
                 # skip if goal draft or canceled
                 continue
 
-            if goal.type_id.computation_mode == 'manually':
+            if goal.definition_id.computation_mode == 'manually':
                 towrite.update(self._check_remind_delay(cr, uid, goal, context))
 
-            elif goal.type_id.computation_mode == 'python':
+            elif goal.definition_id.computation_mode == 'python':
                 # execute the chosen method
-                values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.type')}
-                result = safe_eval(goal.type_id.compute_code, values, {})
+                values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.definition')}
+                result = safe_eval(goal.definition_id.compute_code, values, {})
 
                 if type(result) in (float, int, long) and result != goal.current:
                     towrite['current'] = result
                 else:
-                    _logger.exception(_('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
-                    # raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(goal.type_id.compute_code)))
+                    _logger.exception(_('Unvalid return content from the evaluation of %s' % str(goal.definition_id.compute_code)))
+                    # raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(goal.definition_id.compute_code)))
 
             else:  # count or sum
-                obj = self.pool.get(goal.type_id.model_id.model)
-                field_date_name = goal.type_id.field_date_id.name
+                obj = self.pool.get(goal.definition_id.model_id.model)
+                field_date_name = goal.definition_id.field_date_id.name
 
                 # eval the domain with user replaced by goal user object
-                domain = safe_eval(goal.type_id.domain, {'user': goal.user_id})
+                domain = safe_eval(goal.definition_id.domain, {'user': goal.user_id})
 
                 #add temporal clause(s) to the domain if fields are filled on the goal
                 if goal.start_date and field_date_name:
@@ -257,8 +254,8 @@ class gamification_goal(osv.Model):
                 if goal.end_date and field_date_name:
                     domain.append((field_date_name, '<=', goal.end_date))
 
-                if goal.type_id.computation_mode == 'sum':
-                    field_name = goal.type_id.field_id.name
+                if goal.definition_id.computation_mode == 'sum':
+                    field_name = goal.definition_id.field_id.name
                     res = obj.read_group(cr, uid, domain, [field_name], [''], context=context)
                     new_value = res and res[0][field_name] or 0.0
 
@@ -270,7 +267,7 @@ class gamification_goal(osv.Model):
                     towrite['current'] = new_value
 
             # check goal target reached
-            if (goal.type_id.condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.type_id.condition == 'lower' and towrite.get('current', goal.current) <= goal.target_goal):
+            if (goal.definition_id.condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.definition_id.condition == 'lower' and towrite.get('current', goal.current) <= goal.target_goal):
                 towrite['state'] = 'reached'
 
             # check goal failure
@@ -323,7 +320,7 @@ class gamification_goal(osv.Model):
         vals['last_update'] = fields.date.today()
         result = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         for goal in self.browse(cr, uid, ids, context=context):
-            if goal.state != "draft" and ('type_id' in vals or 'user_id' in vals):
+            if goal.state != "draft" and ('definition_id' in vals or 'user_id' in vals):
                 # avoid drag&drop in kanban view
                 raise osv.except_osv(_('Error!'), _('Can not modify the configuration of a started goal'))
 
@@ -332,8 +329,8 @@ class gamification_goal(osv.Model):
                     # new goals should not be reported
                     continue
 
-                if goal.plan_id and goal.plan_id.report_message_frequency == 'onchange':
-                    self.pool.get('gamification.goal.plan').report_progress(cr, SUPERUSER_ID, goal.plan_id, users=[goal.user_id], context=context)
+                if goal.challenge_id and goal.challenge_id.report_message_frequency == 'onchange':
+                    self.pool.get('gamification.challenge').report_progress(cr, SUPERUSER_ID, goal.challenge_id, users=[goal.user_id], context=context)
         return result
 
     def get_action(self, cr, uid, goal_id, context=None):
@@ -344,13 +341,13 @@ class gamification_goal(osv.Model):
         """
         goal = self.browse(cr, uid, goal_id, context=context)
 
-        if goal.type_id.action_id:
+        if goal.definition_id.action_id:
             #open a the action linked on the goal
-            action = goal.type_id.action_id.read()[0]
+            action = goal.definition_id.action_id.read()[0]
 
-            if goal.type_id.res_id_field:
+            if goal.definition_id.res_id_field:
                 current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-                action['res_id'] = safe_eval(goal.type_id.res_id_field, {'user': current_user})
+                action['res_id'] = safe_eval(goal.definition_id.res_id_field, {'user': current_user})
 
                 # if one element to display, should see it in form mode if possible
                 views = action['views']
@@ -364,7 +361,7 @@ class gamification_goal(osv.Model):
         if goal.computation_mode == 'manually':
             #open a wizard window to update the value manually
             action = {
-                'name': _("Update %s") % goal.type_id.name,
+                'name': _("Update %s") % goal.definition_id.name,
                 'id': goal_id,
                 'type': 'ir.actions.act_window',
                 'views': [[False, 'form']],
@@ -378,7 +375,7 @@ class gamification_goal(osv.Model):
 
 
 class goal_manual_wizard(osv.TransientModel):
-    """Wizard type to update a manual goal"""
+    """Wizard to update a manual goal"""
     _name = 'gamification.goal.wizard'
     _columns = {
         'goal_id': fields.many2one("gamification.goal", string='Goal', required=True),
diff --git a/addons/gamification/res_users.py b/addons/gamification/models/res_users.py
similarity index 56%
rename from addons/gamification/res_users.py
rename to addons/gamification/models/res_users.py
index 3450dc1492c..38e784247fd 100644
--- a/addons/gamification/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -24,7 +24,7 @@ from openerp.osv import osv
 
 class res_users_gamification_group(osv.Model):
     """ Update of res.users class
-        - if adding groups to an user, check gamification.goal.plan linked to
+        - if adding groups to an user, check gamification.challenge linked to
         this group, and the user. This is done by overriding the write method.
     """
     _name = 'res.users'
@@ -37,62 +37,62 @@ class res_users_gamification_group(osv.Model):
             user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4]
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
 
-            goal_plan_obj = self.pool.get('gamification.goal.plan')
-            plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
-            if plan_ids:
-                goal_plan_obj.write(cr, uid, plan_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
+            challenge_obj = self.pool.get('gamification.challenge')
+            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
+            if challenge_ids:
+                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
 
         if vals.get('image'):
-            goal_type_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'type_base_avatar', context)
-            goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('type_id', '=', goal_type_id.id), ('user_id', 'in', ids)], context=context)
+            goal_definition_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'definition_base_avatar', context)
+            goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('definition_id', '=', goal_definition_id.id), ('user_id', 'in', ids)], context=context)
             values = {'state': 'reached', 'current': 1}
             self.pool.get('gamification.goal').write(cr, uid, goal_ids, values, context=context)
         return write_res
 
     def get_goals_todo_info(self, cr, uid, context=None):
-        """Return the list of goals assigned to the user, grouped by plan
+        """Return the list of goals assigned to the user, grouped by challenge
 
         This method intends to return processable data in javascript in the
         goal_list_to_do template. The output format is not constant as the
         required information is different between individual and board goal
-        types
+        definitions
         :return: list of dictionnaries for each goal to display
         """
         all_goals_info = []
-        plan_obj = self.pool.get('gamification.goal.plan')
+        challenge_obj = self.pool.get('gamification.challenge')
 
-        plan_ids = plan_obj.search(cr, uid, [('user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
-        for plan in plan_obj.browse(cr, uid, plan_ids, context=context):
+        challenge_ids = challenge_obj.search(cr, uid, [('user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
+        for challenge in challenge_obj.browse(cr, uid, challenge_ids, context=context):
             # serialize goals info to be able to use it in javascript
             serialized_goals_info = {
-                'id': plan.id,
-                'name': plan.name,
-                'visibility_mode': plan.visibility_mode,
+                'id': challenge.id,
+                'name': challenge.name,
+                'visibility_mode': challenge.visibility_mode,
             }
             user = self.browse(cr, uid, uid, context=context)
             serialized_goals_info['currency'] = user.company_id.currency_id.id
 
-            if plan.visibility_mode == 'board':
-                # board report should be grouped by planline for all users
-                goals_info = plan_obj.get_board_goal_info(cr, uid, plan, subset_goal_ids=False, context=context)
+            if challenge.visibility_mode == 'board':
+                # board report should be grouped by line for all users
+                goals_info = challenge_obj.get_board_goal_info(cr, uid, challenge, subset_goal_ids=False, context=context)
 
                 if len(goals_info) == 0:
-                    # plan with no valid planlines
+                    # challenge with no valid lines
                     continue
 
-                serialized_goals_info['planlines'] = []
-                for planline_board in goals_info:
-                    vals = {'type_name': planline_board['goal_type'].name,
-                            'type_description': planline_board['goal_type'].description,
-                            'type_condition': planline_board['goal_type'].condition,
-                            'computation_mode': planline_board['goal_type'].computation_mode,
-                            'type_monetary': planline_board['goal_type'].monetary,
-                            'type_suffix': planline_board['goal_type'].suffix,
-                            'type_action': True if planline_board['goal_type'].action_id else False,
-                            'type_display': planline_board['goal_type'].display_mode,
-                            'target_goal': planline_board['target_goal'],
+                serialized_goals_info['lines'] = []
+                for line_board in goals_info:
+                    vals = {'definition_name': line_board['goal_definition'].name,
+                            'definition_description': line_board['goal_definition'].description,
+                            'definition_condition': line_board['goal_definition'].condition,
+                            'computation_mode': line_board['goal_definition'].computation_mode,
+                            'definition_monetary': line_board['goal_definition'].monetary,
+                            'definition_suffix': line_board['goal_definition'].suffix,
+                            'definition_action': True if line_board['goal_definition'].action_id else False,
+                            'definition_display': line_board['goal_definition'].display_mode,
+                            'target_goal': line_board['target_goal'],
                             'goals': []}
-                    for goal in planline_board['board_goals']:
+                    for goal in line_board['board_goals']:
                         # Keep only the Top 3 and the current user
                         if goal[0] > 2 and goal[1].user_id.id != uid:
                             continue
@@ -109,11 +109,11 @@ class res_users_gamification_group(osv.Model):
                         })
                         if uid == goal[1].user_id.id:
                             vals['own_goal_id'] = goal[1].id
-                    serialized_goals_info['planlines'].append(vals)
+                    serialized_goals_info['lines'].append(vals)
 
             else:
                 # individual report are simply a list of goal
-                goals_info = plan_obj.get_indivual_goal_info(cr, uid, uid, plan, subset_goal_ids=False, context=context)
+                goals_info = challenge_obj.get_indivual_goal_info(cr, uid, uid, challenge, subset_goal_ids=False, context=context)
 
                 if not goals_info:
                     continue
@@ -122,13 +122,13 @@ class res_users_gamification_group(osv.Model):
                 for goal in goals_info:
                     serialized_goals_info['goals'].append({
                         'id': goal.id,
-                        'type_name': goal.type_id.name,
-                        'type_description': goal.type_description,
-                        'type_condition': goal.type_id.condition,
-                        'type_monetary': goal.type_id.monetary,
-                        'type_suffix': goal.type_id.suffix,
-                        'type_action': True if goal.type_id.action_id else False,
-                        'type_display': goal.type_id.display_mode,
+                        'definition_name': goal.definition_id.name,
+                        'definition_description': goal.definition_description,
+                        'definition_condition': goal.definition_id.condition,
+                        'definition_monetary': goal.definition_id.monetary,
+                        'definition_suffix': goal.definition_id.suffix,
+                        'definition_action': True if goal.definition_id.action_id else False,
+                        'definition_display': goal.definition_id.display_mode,
                         'state': goal.state,
                         'completeness': goal.completeness,
                         'computation_mode': goal.computation_mode,
@@ -140,23 +140,23 @@ class res_users_gamification_group(osv.Model):
         return all_goals_info
 
     def get_challenge_suggestions(self, cr, uid, context=None):
-        """Return the list of goal plans suggested to the user"""
-        plan_info = []
-        goal_plan_obj = self.pool.get('gamification.goal.plan')
-        plan_ids = goal_plan_obj.search(cr, uid, [('proposed_user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
-        for plan in goal_plan_obj.browse(cr, uid, plan_ids, context=context):
+        """Return the list of challenges suggested to the user"""
+        challenge_info = []
+        challenge_obj = self.pool.get('gamification.challenge')
+        challenge_ids = challenge_obj.search(cr, uid, [('invited_user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
+        for challenge in challenge_obj.browse(cr, uid, challenge_ids, context=context):
             values = {
-                'id': plan.id,
-                'name': plan.name,
-                'description': plan.description,
+                'id': challenge.id,
+                'name': challenge.name,
+                'description': challenge.description,
             }
-            plan_info.append(values)
-        return plan_info
+            challenge_info.append(values)
+        return challenge_info
 
 
 class res_groups_gamification_group(osv.Model):
     """ Update of res.groups class
-        - if adding users from a group, check gamification.goal.plan linked to
+        - if adding users from a group, check gamification.challenge linked to
         this group, and the user. This is done by overriding the write method.
     """
     _name = 'res.groups'
@@ -169,9 +169,9 @@ class res_groups_gamification_group(osv.Model):
             user_ids = [command[1] for command in vals['users'] if command[0] == 4]
             user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
 
-            goal_plan_obj = self.pool.get('gamification.goal.plan')
-            plan_ids = goal_plan_obj.search(cr, uid, [('autojoin_group_id', 'in', ids)], context=context)
-            if plan_ids:
-                goal_plan_obj.write(cr, uid, plan_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
+            challenge_obj = self.pool.get('gamification.challenge')
+            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', ids)], context=context)
+            if challenge_ids:
+                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
         return write_res
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 9baf2131505..c783828c7ae 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -13,7 +13,7 @@
         </record>
 
         <record id="goal_user_visibility" model="ir.rule">
-            <field name="name">User can only see his/her goals or goal from the same plan in board visibility</field>
+            <field name="name">User can only see his/her goals or goal from the same challenge in board visibility</field>
             <field name="model_id" ref="model_gamification_goal"/>
             <field name="groups" eval="[(4, ref('base.group_user'))]"/>
             <field name="perm_read" eval="True"/>
@@ -24,8 +24,8 @@
                 '|',
                     ('user_id','=',user.id),
                     '&amp;',
-                        ('plan_id.user_ids','in',user.id),
-                        ('plan_id.visibility_mode','=','board')]</field>
+                        ('challenge_id.user_ids','in',user.id),
+                        ('challenge_id.visibility_mode','=','board')]</field>
         </record>
 
         <record id="goal_gamification_manager_visibility" model="ir.rule">
diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv
index 3ea86d2c25b..932c5d97c62 100644
--- a/addons/gamification/security/ir.model.access.csv
+++ b/addons/gamification/security/ir.model.access.csv
@@ -3,14 +3,14 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 goal_employee,"Goal Employee",model_gamification_goal,base.group_user,1,1,0,0
 goal_manager,"Goal Manager",model_gamification_goal,group_goal_manager,1,1,1,1
 
-goal_type_employee,"Goal Type Employee",model_gamification_goal_type,base.group_user,1,0,0,0
-goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1
+goal_definition_employee,"Goal Definition Employee",model_gamification_goal_definition,base.group_user,1,0,0,0
+goal_definition_manager,"Goal Definition Manager",model_gamification_goal_definition,group_goal_manager,1,1,1,1
 
-plan_employee,"Goal Plan Employee",model_gamification_goal_plan,base.group_user,1,0,0,0
-plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1
+challenge_employee,"Goal Challenge Employee",model_gamification_challenge,base.group_user,1,0,0,0
+challenge_manager,"Goal Challenge Manager",model_gamification_challenge,group_goal_manager,1,1,1,1
 
-planline_employee,"Goal Planline Employee",model_gamification_goal_planline,base.group_user,1,0,0,0
-planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1
+challenge_line_employee,"Challenge Line Employee",model_gamification_challenge_line,base.group_user,1,0,0,0
+challenge_line_manager,"Challenge Line Manager",model_gamification_challenge_line,group_goal_manager,1,1,1,1
 
 badge_employee,"Badge Employee",model_gamification_badge,base.group_user,1,0,0,0
 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index ccd5204b2ba..9e34d8f09fc 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -12,11 +12,11 @@ openerp.gamification = function(instance) {
             this.challenge_suggestions = {};
         },
         events: {
-            // update a plan and related goals
-            'click a.oe_update_plan': function(event) {
+            // update a challenge and related goals
+            'click a.oe_update_challenge': function(event) {
                 var self = this;
-                var plan_id = parseInt(event.currentTarget.id, 10);
-                var goals_updated = new instance.web.Model('gamification.goal.plan').call('quick_update', [plan_id]);
+                var challenge_id = parseInt(event.currentTarget.id, 10);
+                var goals_updated = new instance.web.Model('gamification.challenge').call('quick_update', [challenge_id]);
                 $.when(goals_updated).done(function() {
                     self.get_goal_todo_info();
                 });
@@ -40,12 +40,12 @@ openerp.gamification = function(instance) {
             // get more info about a challenge request
             'click a.oe_challenge_reply': function(event) {
                 var self = this;
-                var plan_id = parseInt(event.currentTarget.id, 10);
-                var plan_action = new instance.web.Model('gamification.goal.plan').call('reply_challenge_wizard', [plan_id]).then(function(res) {
-                    plan_action['action'] = res;
+                var challenge_id = parseInt(event.currentTarget.id, 10);
+                var challenge_action = new instance.web.Model('gamification.challenge').call('reply_challenge_wizard', [challenge_id]).then(function(res) {
+                    challenge_action['action'] = res;
                 });
-                $.when(plan_action).done(function() {
-                    self.do_action(plan_action.action).done(function () {
+                $.when(challenge_action).done(function() {
+                    self.do_action(challenge_action.action).done(function () {
                         self.get_goal_todo_info();
                     });
                 });
@@ -132,7 +132,7 @@ openerp.gamification = function(instance) {
     instance.web_kanban.KanbanRecord.include({
         // open related goals when clicking on challenge kanban view
         on_card_clicked: function() {
-            if (this.view.dataset.model === 'gamification.goal.plan') {
+            if (this.view.dataset.model === 'gamification.challenge') {
                 this.$('.oe_kanban_project_list a').first().click();
             } else {
                 this._super.apply(this, arguments);
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 9f6bc1c81e9..6bfd4c2ffc9 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,37 +4,37 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
-        <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
+        <div t-foreach="widget.goals_info.info" t-as="challenge" class="oe_goal">
             <div>
-                <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-                <h4><t t-esc="plan.name" /></h4>
+                <a class="oe_update_challenge oe_e" rol="button" t-attf-id="{challenge.id}">e</a>
+                <h4><t t-esc="challenge.name" /></h4>
             </div>
 
-            <t t-if="plan.visibility_mode == 'progressbar'">
+            <t t-if="challenge.visibility_mode == 'progressbar'">
                 <div class="oe_table oe_goals_list">
-                    <div t-foreach="plan.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="goal.type_display == 'progress'">
+                    <div t-foreach="challenge.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.definition_display != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="goal.definition_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{goal.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                                 <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
                             </t>
                             <div class="oe_cell">
-                                <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
-                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
+                                <t t-if="goal.computation_mode != 'manually' and !goal.definition_action">
+                                    <span t-att-title="goal.definition_description"><t t-esc="goal.definition_name" /></span>
                                 </t>
-                                <t t-if="goal.type_action or goal.computation_mode == 'manually'">
-                                    <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
+                                <t t-if="goal.definition_action or goal.computation_mode == 'manually'">
+                                    <span t-att-title="goal.definition_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.definition_name" /></a></span>
                                 </t>
-                                <t t-if="goal.type_display == 'progress'"><br/>
+                                <t t-if="goal.definition_display == 'progress'"><br/>
                                     <div class="oe_grey">
-                                        <t t-if="goal.type_condition == 'higher'">
+                                        <t t-if="goal.definition_condition == 'higher'">
                                             Target:
                                         </t>
-                                        <t t-if="goal.type_condition == 'lower'">
+                                        <t t-if="goal.definition_condition == 'lower'">
                                             Target: &lt;=
                                         </t>
-                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.type_suffix"><t t-esc="goal.type_suffix"/></t>
+                                        <span t-attf-class="#{goal.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                        <t t-if="goal.definition_suffix"><t t-esc="goal.definition_suffix"/></t>
                                     </div>
                                 </t>
                             </div>
@@ -42,52 +42,52 @@
                 </div>
             </t>
 
-            <t t-if="plan.visibility_mode == 'board'">
-                <div t-foreach="plan.planlines" t-as="planline" class="oe_goals_list oe_table">
+            <t t-if="challenge.visibility_mode == 'board'">
+                <div t-foreach="challenge.lines" t-as="line" class="oe_goals_list oe_table">
                     <div class="oe_row">
-                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <strong><t t-esc="planline.type_name"/></strong>
+                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.definition_description ? line.definition_description : ''}">
+                            <strong><t t-esc="line.definition_name"/></strong>
                             <br/>
                             <div class="oe_grey">
-                                <t t-if="planline.type_condition == 'higher'">
+                                <t t-if="line.definition_condition == 'higher'">
                                     Target:
                                 </t>
-                                <t t-if="planline.type_condition == 'lower'">
+                                <t t-if="line.definition_condition == 'lower'">
                                     Target: &lt;=
                                 </t>
-                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
+                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="line.target_goal" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
                             </div>
                         </div>
                     </div>
-                    <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{planline.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="planline.type_display == 'progress'">
+                    <div t-foreach="line.goals" t-as="goal" t-attf-class="#{goal.id == line.own_goal_id ? 'oe_bold' : ''}">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{line.definition_display != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="line.definition_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{line.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
                             
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
                                 <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
-                                    <t t-if="planline.type_display == 'progress'">
+                                    <t t-if="line.definition_display == 'progress'">
                                         <!-- progress, action on current value -->
                                         <t t-esc="goal.user_name"/><br/>
-                                        <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
-                                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
+                                            <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
                                         </t>
-                                        <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
-                                            <a class="oe_goal_action" t-att-id="planline.own_goal_id">
-                                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
+                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="line.own_goal_id">
+                                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
                                             </a>
                                         </t>
                                     </t>
-                                    <t t-if="planline.type_display != 'progress'">
+                                    <t t-if="line.definition_display != 'progress'">
                                         <!-- not progress, action on user name -->
-                                        <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
                                             <t t-esc="goal.user_name"/>
                                         </t>
-                                        <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
-                                            <a class="oe_goal_action" t-att-id="planline.own_goal_id"><t t-esc="goal.user_name"/></a>
+                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="line.own_goal_id"><t t-esc="goal.user_name"/></a>
                                         </t>
                                     </t>
                                 </div>
@@ -100,7 +100,7 @@
 
     <t t-name="gamification.challenge_suggestions">
         <div class="oe_goal">
-            <h4>Proposed Challenges</h4>
+            <h4>Invited Challenges</h4>
             <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
                 <li>
                     <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>
diff --git a/addons/gamification/templates.py b/addons/gamification/templates.py
deleted file mode 100644
index b6d071c8f3a..00000000000
--- a/addons/gamification/templates.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# We use a jinja2 sandboxed environment to render mako templates.
-# Note that the rendering does not cover all the mako syntax, in particular
-# arbitrary Python statements are not accepted, and not all expressions are
-# allowed: only "public" attributes (not starting with '_') of objects may
-# be accessed.
-# This is done on purpose: it prevents incidental or malicious execution of
-# Python code that may break the security of the server.
-
-from jinja2.sandbox import SandboxedEnvironment
-from jinja2 import FileSystemLoader
-
-from urllib import urlencode, quote as quote
-import os.path
-
-#TODO: to check: new dependancies in openerp? fine or not?
-#TODO: to check: if it's ok, i think it would be better directly in the server (tools) so that other modules that doesn't depend on gamification can use it
-#TODO; someone else should check this code, i'm not the good one
-
-class TemplateHelper(SandboxedEnvironment):
-
-    GAMIFICATION_PATH = os.path.dirname(os.path.abspath(__file__))
-
-    def __init__(self):
-
-        super(TemplateHelper, self).__init__(
-            loader=FileSystemLoader(os.path.join(self.GAMIFICATION_PATH, 'templates/')),
-            block_start_string="<%",
-            block_end_string="%>",
-            variable_start_string="${",
-            variable_end_string="}",
-            comment_start_string="<%doc>",
-            comment_end_string="</%doc>",
-            line_statement_prefix="%",
-            line_comment_prefix="##",
-            trim_blocks=True,               # do not output newline after blocks
-            autoescape=True,                # XML/HTML automatic escaping
-        )
-        self.globals.update({
-            'str': str,
-            'quote': quote,
-            'urlencode': urlencode,
-        })
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
index 00751f98134..5d71c36032f 100644
--- a/addons/gamification/templates/group_progress.mako
+++ b/addons/gamification/templates/group_progress.mako
@@ -1,10 +1,10 @@
 <% extends 'base.mako' %>
 
 <% block body %>
-	% for planline in planlines_boards: 
+	% for line in lines_boards: 
         <table width="100%" border="1">
         	<tr>
-        		<th colspan="4">${planline.goal_type.name}</th>
+        		<th colspan="4">${line.goal_definition.name}</th>
         	</tr>
         	<tr>
 	            <th>#</th>
@@ -12,7 +12,7 @@
 	            <th>Completeness</th>
 	            <th>Current</th>
 	        </tr>
-	        % for idx, goal in planline.board_goals:
+	        % for idx, goal in line.board_goals:
                 % if idx < 3 or goal.user_id.id == uid:
     	            <tr
     	                % if goal.completeness >= 100:
@@ -23,8 +23,8 @@
     	                <td>${goal.user_id.name}</td>
     	                <td>${goal.completeness}%</td>
     	                <td>${goal.current}/${goal.target_goal}
-                        % if goal.type_suffix:
-                            ${goal.type_suffix}
+                        % if goal.definition_suffix:
+                            ${goal.definition_suffix}
                         % endif
                         </td>
     	            </tr>
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
index bd744bb63a5..85d2fbb2b16 100644
--- a/addons/gamification/templates/personal_progress.mako
+++ b/addons/gamification/templates/personal_progress.mako
@@ -13,15 +13,15 @@
                 style="font-weight:bold;"
             % endif
             >
-            <td>${goal.type_id.name}</td>
+            <td>${goal.definition_id.name}</td>
             <td>${goal.target_goal}
-            % if goal.type_suffix:
-                ${goal.type_suffix}
+            % if goal.definition_suffix:
+                ${goal.definition_suffix}
             % endif
             </td>
             <td>${goal.current}
-            % if goal.type_suffix:
-                ${goal.type_suffix}
+            % if goal.definition_suffix:
+                ${goal.definition_suffix}
             % endif
             </td>
             <td>${goal.completeness} %</td>
diff --git a/addons/gamification/templates/reminder.mako b/addons/gamification/templates/reminder.mako
index d3f8a584a03..4d44861a0bc 100644
--- a/addons/gamification/templates/reminder.mako
+++ b/addons/gamification/templates/reminder.mako
@@ -10,7 +10,7 @@
 
 	<p class="oe_grey">${object.report_header or ''}</p>
     
-    <p>You have not updated your progress for the goal ${object.type_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
+    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
 
     <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
 </body>
diff --git a/addons/gamification/test/goal_demo.yml b/addons/gamification/test/goal_demo.yml
index bfa8240fb50..1efc6cc7e74 100644
--- a/addons/gamification/test/goal_demo.yml
+++ b/addons/gamification/test/goal_demo.yml
@@ -1,29 +1,29 @@
 -
-  In order to test process of the Goals, I assign the discovery goal plan to all users
+  In order to test process of the Goals, I assign the discovery challenge to all users
 -
-  !record {model: gamification.goal.plan, id: plan_base_discover}:
+  !record {model: gamification.challenge, id: challenge_base_discover}:
     autojoin_group_id: base.group_user
 -
   I verify that the users of the group are added (at least admin and demo)
 -
-  !assert {model: gamification.goal.plan, id: plan_base_discover, string: The autojoin function was not successful}:
+  !assert {model: gamification.challenge, id: challenge_base_discover, string: The autojoin function was not successful}:
     - len(user_ids) >= 2
 -
-  I start the goal plan and verify the change of state
+  I start the challenge and verify the change of state
 -
-  !python {model: gamification.goal.plan}: |
-    plan = self.browse(cr, uid, ref('plan_base_discover'))
-    self.action_start(cr, uid, [plan.id], context=context)
-    assert plan.state == 'inprogress', "Plan failed the change of state"
+  !python {model: gamification.challenge}: |
+    challenge = self.browse(cr, uid, ref('challenge_base_discover'))
+    self.action_start(cr, uid, [challenge.id], context=context)
+    assert challenge.state == 'inprogress', "Challenge failed the change of state"
 -
   I verify the goals are generated correctly
 -
   !python {model: gamification.goal}: |
-    goal_ids = self.search(cr, uid, [('plan_id', '=', ref('plan_base_discover'))], context=context)
+    goal_ids = self.search(cr, uid, [('challenge_id', '=', ref('challenge_base_discover'))], context=context)
     assert len(goal_ids) >= 4, "Not enough goals have been generated"
     for goal in self.browse(cr, uid, goal_ids, context=context):
       assert goal.state != 'draft', "Draft goal have been generated"
-      assert goal.planline_id.plan_id.id == ref('plan_base_discover'), "Linked planline incorrect"
+      assert goal.line_id.challenge_id.id == ref('challenge_base_discover'), "Linked line incorrect"
 -
   I change timezone for demo user
 -
@@ -33,21 +33,21 @@
   I check the goal for demo user is successful
 -
   !python {model: gamification.goal}: |
-    goal_ids = self.search(cr, uid, [('user_id', '=', ref('base.user_demo')),('type_id','=',ref('type_base_timezone'))])
+    goal_ids = self.search(cr, uid, [('user_id', '=', ref('base.user_demo')),('definition_id','=',ref('definition_base_timezone'))])
     self.update(cr, uid, goal_ids, context=context)
     for goal in self.browse(cr, uid, goal_ids, context=context):
       assert goal.state == "reached", "Goal not successful %s" % goal.state
 -
   I add a reward to the challenge
 -
-  !record {model: gamification.goal.plan, id: plan_base_discover}:
+  !record {model: gamification.challenge, id: challenge_base_discover}:
     reward_first_id: gamification.badge_good_job
     reward_failure: True
 -
   I check the demo user received the badge
 -
-  !python {model: gamification.goal.plan}: |
-    plan = self.browse(cr, uid, ref('plan_base_discover'), context=context)
-    self.action_close(cr, uid, [plan.id])
+  !python {model: gamification.challenge}: |
+    challenge = self.browse(cr, uid, ref('challenge_base_discover'), context=context)
+    self.action_close(cr, uid, [challenge.id])
     badge_ids = self.pool.get('gamification.badge.user').search(cr, uid, [('badge_id', '=', ref('badge_good_job')), ('user_id', '=', ref('base.user_demo'))])
     assert badge_ids, "Demo users didn't received the badge"
\ No newline at end of file
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/views/badge.xml
similarity index 99%
rename from addons/gamification/badge_view.xml
rename to addons/gamification/views/badge.xml
index 3f2199d1a2b..af401b1f7de 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/views/badge.xml
@@ -101,7 +101,7 @@
                             </div>
                         </group>
                         <group string="Rewards for challenges">
-                            <field name="plan_ids" widget="many2many_kanban" nolabel="1" />
+                            <field name="challenge_ids" widget="many2many_kanban" nolabel="1" />
                         </group>
                         <group string="Statistics">
                             <group>
diff --git a/addons/gamification/plan_view.xml b/addons/gamification/views/challenge.xml
similarity index 79%
rename from addons/gamification/plan_view.xml
rename to addons/gamification/views/challenge.xml
index 1f0a872acf5..45cc58056d2 100644
--- a/addons/gamification/plan_view.xml
+++ b/addons/gamification/views/challenge.xml
@@ -2,11 +2,11 @@
 <openerp>
     <data>
 
-        <record id="goal_plan_list_view" model="ir.ui.view">
+        <record id="challenge_list_view" model="ir.ui.view">
             <field name="name">Challenges List</field>
-            <field name="model">gamification.goal.plan</field>
+            <field name="model">gamification.challenge</field>
             <field name="arch" type="xml">
-                <tree string="Goal types" colors="blue:state == 'draft';grey:state == 'done'">
+                <tree string="Goal definitions" colors="blue:state == 'draft';grey:state == 'done'">
                     <field name="name"/>
                     <field name="period"/>
                     <field name="manager_id"/>
@@ -15,11 +15,11 @@
             </field>
         </record>
 
-        <record id="goals_from_plan_act" model="ir.actions.act_window">
+        <record id="goals_from_challenge_act" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
             <field name="name">Related Goals</field>
             <field name="view_mode">kanban,tree</field>
-            <field name="context">{'search_default_group_by_type': True, 'search_default_inprogress': True, 'search_default_plan_id': active_id, 'default_plan_id': active_id}</field>
+            <field name="context">{'search_default_group_by_definition': True, 'search_default_inprogress': True, 'search_default_challenge_id': active_id, 'default_challenge_id': active_id}</field>
             <field name="help" type="html">
               <p>
                 There is no goals associated to this challenge matching your search.
@@ -28,11 +28,11 @@
             </field>
         </record>
 
-        <record id="goal_plan_form_view" model="ir.ui.view">
+        <record id="challenge_form_view" model="ir.ui.view">
             <field name="name">Challenge Form</field>
-            <field name="model">gamification.goal.plan</field>
+            <field name="model">gamification.challenge</field>
             <field name="arch" type="xml">
-                <form string="Goal types" version="7.0">
+                <form string="Goal definitions" version="7.0">
                     <header>
                         <button string="Start Now" type="object" name="action_start" states="draft" class="oe_highlight"/>
                         <button string="Refresh Challenge" type="object" name="action_check" states="inprogress"/>
@@ -57,7 +57,7 @@
 
                         <!-- action buttons -->
                         <div class="oe_right oe_button_box">
-                            <button type="action" name="%(goals_from_plan_act)d" string="Related Goals" attrs="{'invisible': [('state','=','draft')]}" />
+                            <button type="action" name="%(goals_from_challenge_act)d" string="Related Goals" attrs="{'invisible': [('state','=','draft')]}" />
                         </div>
                         <group>
                             <group>
@@ -72,13 +72,13 @@
                         </group>
                         <notebook>
                             <page string="Goals">
-                                <field name="planline_ids" nolabel="1" colspan="4">
-                                    <tree string="Planline List" version="7.0" editable="bottom" >
+                                <field name="line_ids" nolabel="1" colspan="4">
+                                    <tree string="Line List" version="7.0" editable="bottom" >
                                         <field name="sequence" widget="handle"/>
-                                        <field name="type_id" on_change="on_change_type_id(type_id)" />
-                                        <field name="type_condition"/>
+                                        <field name="definition_id" on_change="on_change_definition_id(definition_id)" />
+                                        <field name="definition_condition"/>
                                         <field name="target_goal"/>
-                                        <field name="type_full_suffix"/>
+                                        <field name="definition_full_suffix"/>
                                     </tree>
                                 </field>
                                 <field name="description" placeholder="Describe the challenge: what is does, who it targets, why it matters..."/>
@@ -98,7 +98,7 @@
                             <page string="Advanced Options">
                                 <group string="Subscriptions">
                                     <field name="autojoin_group_id" />
-                                    <field name="proposed_user_ids" widget="many2many_tags" />
+                                    <field name="invited_user_ids" widget="many2many_tags" />
                                 </group>
                                 <group string="Notification Messages">
                                     <field name="report_message_frequency" />
@@ -126,13 +126,12 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_goal_plan_kanban">
+        <record model="ir.ui.view" id="view_challenge_kanban">
             <field name="name">Challenge Kanban</field>
-            <field name="model">gamification.goal.plan</field>
+            <field name="model">gamification.challenge</field>
             <field name="arch" type="xml">
-                <kanban version="7.0" class="oe_background_grey">
-                    <field name="planline_ids"/>
-                    <field name="planline_count"/>
+                <kanban string="Challenges" class="oe_background_grey" version="7.0">
+                    <field name="line_ids"/>
                     <field name="user_ids"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -147,9 +146,9 @@
 
                                     <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a type="action" name="%(goals_from_plan_act)d" style="margin-right: 10px"> 
-                                            <span t-if="record.planline_count.raw_value gt 1"><field name="planline_count"/> Goals</span>
-                                            <span t-if="record.planline_count.raw_value lt 2"><field name="planline_count"/> Goal</span>
+                                        <a type="action" name="%(goals_from_challenge_act)d" style="margin-right: 10px"> 
+                                            <span t-if="record.line_ids.length gt 1"><t t-esc="record.line_ids.length"/> Goals</span>
+                                            <span t-if="record.line_ids.length lt 2"><t t-esc="record.line_ids.length"/> Goal</span>
                                         </a>
                                     </div>
                                     <div class="oe_kanban_badge_avatars">
@@ -165,9 +164,9 @@
             </field>
         </record>
 
-        <record id="goal_plan_list_action" model="ir.actions.act_window">
+        <record id="challenge_list_action" model="ir.actions.act_window">
             <field name="name">Challenges</field>
-            <field name="res_model">gamification.goal.plan</field>
+            <field name="res_model">gamification.challenge</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
             <field name="help" type="html">
@@ -182,40 +181,40 @@
             </field>
         </record>
         <!-- Specify form view ID to avoid selecting view_challenge_wizard -->
-        <record id="goal_plan_list_action_view1" model="ir.actions.act_window.view">
+        <record id="challenge_list_action_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">kanban</field>
-            <field name="act_window_id" ref="goal_plan_list_action"/>
-            <field name="view_id" ref="view_goal_plan_kanban"/>
+            <field name="act_window_id" ref="challenge_list_action"/>
+            <field name="view_id" ref="view_challenge_kanban"/>
         </record>
-        <record id="goal_plan_list_action_view2" model="ir.actions.act_window.view">
+        <record id="challenge_list_action_view2" model="ir.actions.act_window.view">
             <field eval="10" name="sequence"/>
             <field name="view_mode">form</field>
-            <field name="act_window_id" ref="goal_plan_list_action"/>
-            <field name="view_id" ref="goal_plan_form_view"/>
+            <field name="act_window_id" ref="challenge_list_action"/>
+            <field name="view_id" ref="challenge_form_view"/>
         </record>
 
-        <!-- Planline -->
-        <record id="goal_planline_list_view" model="ir.ui.view">
-            <field name="name">Goal planline list</field>
-            <field name="model">gamification.goal.planline</field>
+        <!-- Line -->
+        <record id="challenge_line_list_view" model="ir.ui.view">
+            <field name="name">Challenge line list</field>
+            <field name="model">gamification.challenge.line</field>
             <field name="arch" type="xml">
-                <tree string="planline list" >
-                    <field name="type_id"/>
+                <tree string="Challenge Lines" >
+                    <field name="definition_id"/>
                     <field name="target_goal"/>
                 </tree>
             </field>
         </record>
 
 
-        <record id="goal_plan_search_view" model="ir.ui.view">
+        <record id="challenge_search_view" model="ir.ui.view">
             <field name="name">Challenge Search</field>
-            <field name="model">gamification.goal.plan</field>
+            <field name="model">gamification.challenge</field>
             <field name="arch" type="xml">
                 <search string="Search Challenges">
                     <filter name="inprogress" string="Running Challenges"
                         domain="[('state', '=', 'inprogress')]"/>
-                    <filter name="hr_plans" string="HR Challenges"
+                    <filter name="hr_challenges" string="HR Challenges"
                         domain="[('category', '=', 'hr')]"/>
                     <field name="name"/>
                     <group expand="0" string="Group By...">
@@ -229,7 +228,7 @@
 
         <record id="view_challenge_wizard" model="ir.ui.view">
             <field name="name">Challenge Wizard</field>
-            <field name="model">gamification.goal.plan</field>
+            <field name="model">gamification.challenge</field>
             <field name="arch" type="xml">
                 <form string="Challenge" version="7.0">
                     <field name="reward_failure" invisible="1"/>
@@ -241,16 +240,16 @@
                         <field name="start_date" readonly="1" />
                         <field name="end_date" readonly="1" />
                         <field name="user_ids" string="Participating" readonly="1" widget="many2many_tags" />
-                        <field name="proposed_user_ids" string="Invited" readonly="1" widget="many2many_tags" />
+                        <field name="invited_user_ids" string="Invited" readonly="1" widget="many2many_tags" />
                     </group>
                     <group string="Goals">
-                        <field name="planline_ids" nolabel="1" readonly="1" colspan="4">
-                            <tree string="Planline List" version="7.0" editable="bottom" >
+                        <field name="line_ids" nolabel="1" readonly="1" colspan="4">
+                            <tree string="Challenge Lines" version="7.0" editable="bottom" >
                                 <field name="sequence" widget="handle"/>
-                                <field name="type_id"/>
-                                <field name="type_condition"/>
+                                <field name="definition_id"/>
+                                <field name="definition_condition"/>
                                 <field name="target_goal"/>
-                                <field name="type_full_suffix"/>
+                                <field name="definition_full_suffix"/>
                             </tree>
                         </field>
                     </group>
@@ -281,7 +280,7 @@
 
         <record id="challenge_wizard" model="ir.actions.act_window">
             <field name="name">Challenge Description</field>
-            <field name="res_model">gamification.goal.plan</field>
+            <field name="res_model">gamification.challenge</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_challenge_wizard"/>
             <field name="target">new</field>
diff --git a/addons/gamification/goal_view.xml b/addons/gamification/views/goal.xml
similarity index 82%
rename from addons/gamification/goal_view.xml
rename to addons/gamification/views/goal.xml
index ab12a3f4ade..8fa792c0b5a 100644
--- a/addons/gamification/goal_view.xml
+++ b/addons/gamification/views/goal.xml
@@ -7,14 +7,14 @@
             <field name="name">Goals</field>
             <field name="res_model">gamification.goal</field>
             <field name="view_mode">tree,form,kanban</field>
-            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
+            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_definition': True}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal. 
                 </p>
                 <p>
-                    A goal is defined by a user and a goal type.
-                    Goals can be created automatically by using goal plans.
+                    A goal is defined by a user and a goal definition.
+                    Goals can be created automatically by using challenges.
                 </p>
             </field>
         </record>
@@ -24,7 +24,7 @@
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <tree string="Goal List" colors="red:state == 'failed';green:state == 'reached';grey:state == 'canceled'"> 
-                    <field name="type_id" invisible="1" />
+                    <field name="definition_id" invisible="1" />
                     <field name="user_id" invisible="1" />
                     <field name="start_date"/>
                     <field name="end_date"/>
@@ -32,7 +32,7 @@
                     <field name="target_goal"/>
                     <field name="completeness" widget="progressbar"/>
                     <field name="state" invisible="1"/>
-                    <field name="planline_id" invisible="1"/>
+                    <field name="line_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -53,9 +53,9 @@
                     <sheet>
                         <group>
                             <group string="Reference">
-                                <field name="type_id" on_change="on_change_type_id(type_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="definition_id" on_change="on_change_definition_id(definition_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="plan_id" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="challenge_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group string="Schedule">
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -73,14 +73,14 @@
                                 <label for="target_goal" />
                                 <div>
                                     <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}" class="oe_inline"/>
-                                    <field name="type_suffix" class="oe_inline"/>
+                                    <field name="definition_suffix" class="oe_inline"/>
                                 </div>
                                 <label for="current" />
                                 <div>
                                     <field name="current" class="oe_inline"/>
                                     <button string="refresh" type="object" name="update" class="oe_link" attrs="{'invisible':['|',('computation_mode', '=', 'manually'),('state', '=', 'draft')]}" />
-                                    <div class="oe_grey" attrs="{'invisible':[('type_id', '=', False)]}">
-                                        Reached when current value is <strong><field name="type_condition" class="oe_inline"/></strong> than the target.
+                                    <div class="oe_grey" attrs="{'invisible':[('definition_id', '=', False)]}">
+                                        Reached when current value is <strong><field name="definition_condition" class="oe_inline"/></strong> than the target.
                                     </div>
                                 </div>
                             </group>
@@ -112,11 +112,11 @@
                     <separator/>
 
                     <field name="user_id"/>
-                    <field name="type_id"/>
-                    <field name="plan_id"/>
+                    <field name="definition_id"/>
+                    <field name="challenge_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_by_user" string="User" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter name="group_by_type" string="Goal Type" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter name="group_by_definition" string="Goal Definition" domain="[]" context="{'group_by':'definition_id'}"/>
                         <filter string="State" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="End Date" domain="[]" context="{'group_by':'end_date'}"/>
                     </group>
@@ -129,43 +129,43 @@
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_background_grey">
-                    <field name="type_id"/>
+                    <field name="definition_id"/>
                     <field name="user_id"/>
                     <field name="current"/>
                     <field name="completeness"/>
                     <field name="state"/>
                     <field name="target_goal"/>
-                    <field name="type_condition"/>
-                    <field name="type_suffix"/>
-                    <field name="type_display"/>
+                    <field name="definition_condition"/>
+                    <field name="definition_suffix"/>
+                    <field name="definition_display"/>
                     <field name="start_date"/>
                     <field name="end_date"/>
                     <field name="last_update"/>
                     <templates>
                         <t t-name="kanban-tooltip">
-                           <field name="type_description"/>
+                           <field name="definition_description"/>
                         </t>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_card oe_gamification_goal oe_kanban_goal #{record.end_date.raw_value &lt; record.last_update.raw_value &amp; record.state.raw_value == 'failed' ? 'oe_kanban_color_2' : ''} #{record.end_date.raw_value &lt; record.last_update.raw_value &amp; record.state.raw_value == 'reached' ? 'oe_kanban_color_5' : ''}">
                                 <div class="oe_kanban_content">
-                                    <p><h4 class="oe_goal_name" tooltip="kanban-tooltip"><field name="type_id" /></h4></p>
+                                    <p><h4 class="oe_goal_name" tooltip="kanban-tooltip"><field name="definition_id" /></h4></p>
                                     <div class="oe_kanban_left">
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
                                     </div>
                                     <field name="user_id" />
                                     <div class="oe_goal_state_block">
-                                        <t t-if="record.type_display.raw_value == 'checkbox'">
+                                        <t t-if="record.definition_display.raw_value == 'checkbox'">
                                             <div class="oe_goal_state oe_e">
                                                 <t t-if="record.state.raw_value=='reached'"><span class="oe_green" title="Goal Reached">W</span></t>
                                                 <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'"><span title="Goal in Progress">N</span></t>
                                                 <t t-if="record.state.raw_value=='failed'"><span class="oe_red" title="Goal Failed">X</span></t>
                                             </div>
                                         </t>
-                                        <t t-if="record.type_display.raw_value == 'progress'">
-                                            <t t-if="record.type_condition.raw_value =='higher'">
-                                                <field name="current" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}" />
+                                        <t t-if="record.definition_display.raw_value == 'progress'">
+                                            <t t-if="record.definition_condition.raw_value =='higher'">
+                                                <field name="current" widget="gauge" style="width:160px; height: 120px;" options="{'max_field': 'target_goal', 'label_field': 'definition_suffix'}" />
                                             </t>
-                                            <t t-if="record.type_condition.raw_value != 'higher'">
+                                            <t t-if="record.definition_condition.raw_value != 'higher'">
                                                 <div t-attf-class="oe_goal_state #{record.current.raw_value == record.target_goal.raw_value+1 ? 'oe_orange' : record.current.raw_value &gt; record.target_goal.raw_value ? 'oe_red' : 'oe_green'}">
                                                     <t t-esc="record.current.raw_value" />
                                                 </div>
@@ -191,29 +191,28 @@
         </record>
 
 
-        <!-- Goal types view -->
+        <!-- Goal definitions view -->
         
-        <record id="goal_type_list_action" model="ir.actions.act_window">
-            <field name="name">Goal Types</field>
-            <field name="res_model">gamification.goal.type</field>
+        <record id="goal_definition_list_action" model="ir.actions.act_window">
+            <field name="name">Goal Definitions</field>
+            <field name="res_model">gamification.goal.definition</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
-                    Click to create a goal type. 
+                    Click to create a goal definition. 
                 </p>
                 <p>
-                    A goal type is a technical model of goal defining a condition to reach.
+                    A goal definition is a technical model of goal defining a condition to reach.
                     The dates, values to reach or users are defined in goal instance.
                 </p>
             </field>
         </record>
 
-        <record id="goal_type_list_view" model="ir.ui.view">
-            <field name="name">Goal Types List</field>
-            <field name="model">gamification.goal.type</field>
+        <record id="goal_definition_list_view" model="ir.ui.view">
+            <field name="name">Goal Definitions List</field>
+            <field name="model">gamification.goal.definition</field>
             <field name="arch" type="xml">
-                <tree string="Goal types">
-                    <field name="sequence" widget="handle"/>
+                <tree string="Goal Definitions">
                     <field name="name"/>
                     <field name="computation_mode"/>
                 </tree>
@@ -221,11 +220,11 @@
         </record>
 
 
-        <record id="goal_type_form_view" model="ir.ui.view">
-            <field name="name">Goal Types Form</field>
-            <field name="model">gamification.goal.type</field>
+        <record id="goal_definition_form_view" model="ir.ui.view">
+            <field name="name">Goal Definitions Form</field>
+            <field name="model">gamification.goal.definition</field>
             <field name="arch" type="xml">
-                <form string="Goal types" version="7.0">
+                <form string="Goal definitions" version="7.0">
                     <sheet>
                             <label for="name" class="oe_edit_only"/>
                             <h1>
@@ -263,11 +262,11 @@
             </field>
         </record>
 
-        <record id="goal_type_search_view" model="ir.ui.view">
-            <field name="name">Goal Type Search</field>
-            <field name="model">gamification.goal.type</field>
+        <record id="goal_definition_search_view" model="ir.ui.view">
+            <field name="name">Goal Definition Search</field>
+            <field name="model">gamification.goal.definition</field>
             <field name="arch" type="xml">
-                <search string="Search Goal Types">
+                <search string="Search Goal Definitions">
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="field_id"/>
@@ -302,8 +301,8 @@
         <!-- menus in settings - technical feature required -->
         <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration" groups="base.group_no_one" />
             <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
-            <menuitem id="gamification_plan_menu" parent="gamification_menu" action="goal_plan_list_action" sequence="10"/>
-            <menuitem id="gamification_type_menu" parent="gamification_menu" action="goal_type_list_action" sequence="20"/>
+            <menuitem id="gamification_challenge_menu" parent="gamification_menu" action="challenge_list_action" sequence="10"/>
+            <menuitem id="gamification_definition_menu" parent="gamification_menu" action="goal_definition_list_action" sequence="20"/>
             <menuitem id="gamification_badge_menu" parent="gamification_menu" action="badge_list_action" sequence="30"/>
 
     </data>
diff --git a/addons/gamification_sale_crm/__openerp__.py b/addons/gamification_sale_crm/__openerp__.py
index 23152cb9f7a..b2ec9a10428 100644
--- a/addons/gamification_sale_crm/__openerp__.py
+++ b/addons/gamification_sale_crm/__openerp__.py
@@ -24,7 +24,7 @@
     'author': 'OpenERP SA',
     'category': 'hidden',
     'depends': ['gamification','sale_crm'],
-    'description': """Example of goal types and plans that can be used related to the usage of the CRM Sale module.""",
+    'description': """Example of goal definitions and challenges that can be used related to the usage of the CRM Sale module.""",
 
     'data': ['sale_crm_goals.xml'],
     'demo': ['sale_crm_goals_demo.xml'],
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index a90825e3671..cc2283d7944 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <!-- goal types -->
-        <record model="gamification.goal.type" id="type_crm_tot_invoices">
+        <!-- goal definitions -->
+        <record model="gamification.goal.definition" id="definition_crm_tot_invoices">
             <field name="name">Total Invoiced</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
@@ -14,7 +14,7 @@
             <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
 
-        <record model="gamification.goal.type" id="type_crm_nbr_new_leads">
+        <record model="gamification.goal.definition" id="definition_crm_nbr_new_leads">
             <field name="name">New Leads</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
@@ -25,7 +25,7 @@
             <field name="domain">[('user_id','=',user.id), '|', ('type', '=', 'lead'), ('type', '=', 'opportunity')]</field>
         </record>
 
-        <record model="gamification.goal.type" id="type_crm_lead_delay_open">
+        <record model="gamification.goal.definition" id="definition_crm_lead_delay_open">
             <field name="name">Time to Qualify a Lead</field>
             <field name="description">The average number of days to open the case (lower than)</field>
             <field name="computation_mode">sum</field>
@@ -37,7 +37,7 @@
             <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
         </record> 
 
-        <record model="gamification.goal.type" id="type_crm_lead_delay_close">
+        <record model="gamification.goal.definition" id="definition_crm_lead_delay_close">
             <field name="name">Days to Close a Deal</field>
             <field name="description">The average number of days to close the case (lower than)</field>
             <field name="computation_mode">sum</field>
@@ -50,7 +50,7 @@
         </record> 
 
 
-        <record model="gamification.goal.type" id="type_crm_nbr_call">
+        <record model="gamification.goal.definition" id="definition_crm_nbr_call">
             <field name="name">Logged Calls</field>
             <field name="description">Log a certain number of calls to reach this goal</field>
             <field name="computation_mode">count</field>
@@ -60,7 +60,7 @@
             <field name="domain">[('user_id','=',user.id),('state','=','done')]</field>
         </record> 
 
-        <record model="gamification.goal.type" id="type_crm_nbr_new_opportunities">
+        <record model="gamification.goal.definition" id="definition_crm_nbr_new_opportunities">
             <field name="name">New Opportunities</field>
             <field name="description">Based on the opening date</field>
             <field name="computation_mode">count</field>
@@ -70,7 +70,7 @@
             <field name="domain">[('user_id','=',user.id),('type','=','opportunity')]</field>
         </record>
 
-        <record model="gamification.goal.type" id="type_crm_nbr_sale_order_created">
+        <record model="gamification.goal.definition" id="definition_crm_nbr_sale_order_created">
             <field name="name">New Sales Orders</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
@@ -80,7 +80,7 @@
             <field name="domain">[('user_id','=',user.id),('state','not in',('draft', 'sent', 'cancel'))]</field>
         </record>
 
-        <record model="gamification.goal.type" id="type_crm_nbr_paid_sale_order">
+        <record model="gamification.goal.definition" id="definition_crm_nbr_paid_sale_order">
             <field name="name">Paid Sales Orders</field>
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
@@ -89,7 +89,7 @@
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','=','paid'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
-        <record model="gamification.goal.type" id="type_crm_tot_paid_sale_order">
+        <record model="gamification.goal.definition" id="definition_crm_tot_paid_sale_order">
             <field name="name">Total Paid Sales Orders</field>
             <field name="description">Based on the invoice date</field>
             <field name="computation_mode">count</field>
@@ -101,7 +101,7 @@
         </record>
 
 
-        <record model="gamification.goal.type" id="type_crm_nbr_customer_refunds">
+        <record model="gamification.goal.definition" id="definition_crm_nbr_customer_refunds">
             <field name="name">Customer Refunds</field>
             <field name="description">Refund the least customers (lower than)</field>
             <field name="computation_mode">count</field>
@@ -111,7 +111,7 @@
             <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_refund')]</field>
         </record>
-        <record model="gamification.goal.type" id="type_crm_tot_customer_refunds">
+        <record model="gamification.goal.definition" id="definition_crm_tot_customer_refunds">
             <field name="name">Total Customer Refunds</field>
             <field name="description">The total refunded value is a negative value. Validated when higher (min refunded).</field>
             <field name="computation_mode">sum</field>
@@ -125,8 +125,8 @@
 
 
 
-        <!-- plans -->
-        <record model="gamification.goal.plan" id="plan_crm_sale">
+        <!-- challenges -->
+        <record model="gamification.challenge" id="challenge_crm_sale">
             <field name="name">Monthly Sales Targets</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">board</field>
@@ -135,7 +135,7 @@
             <field name="report_header">The following message contains the current progress of the sale team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
         </record>
 
-        <record model="gamification.goal.plan" id="plan_crm_marketing">
+        <record model="gamification.challenge" id="challenge_crm_marketing">
             <field name="name">Lead Acquisition</field>
             <field name="period">monthly</field>
             <field name="visibility_mode">progressbar</field>
@@ -144,30 +144,30 @@
             <field name="report_header">The following message contains the current progress of the marketing team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
         </record>
 
-         <!-- planlines -->
-        <record model="gamification.goal.planline" id="planline_crm_sale1">
-            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
+         <!-- lines -->
+        <record model="gamification.challenge.line" id="line_crm_sale1">
+            <field name="definition_id" eval="ref('definition_crm_tot_invoices')" />
             <field name="target_goal">20000</field>
-            <field name="plan_id" eval="ref('plan_crm_sale')" />
+            <field name="challenge_id" eval="ref('challenge_crm_sale')" />
         </record>
 
 
-        <record model="gamification.goal.planline" id="planline_crm_marketing1">
-            <field name="type_id" eval="ref('type_crm_nbr_new_leads')" />
+        <record model="gamification.challenge.line" id="line_crm_marketing1">
+            <field name="definition_id" eval="ref('definition_crm_nbr_new_leads')" />
             <field name="target_goal">7</field>
-            <field name="plan_id" eval="ref('plan_crm_marketing')" />
+            <field name="challenge_id" eval="ref('challenge_crm_marketing')" />
             <field name="sequence">1</field>
         </record>
-        <record model="gamification.goal.planline" id="planline_crm_marketing2">
-            <field name="type_id" eval="ref('type_crm_lead_delay_open')" />
+        <record model="gamification.challenge.line" id="line_crm_marketing2">
+            <field name="definition_id" eval="ref('definition_crm_lead_delay_open')" />
             <field name="target_goal">15</field>
-            <field name="plan_id" eval="ref('plan_crm_marketing')" />
+            <field name="challenge_id" eval="ref('challenge_crm_marketing')" />
             <field name="sequence">2</field>
         </record>
-        <record model="gamification.goal.planline" id="planline_crm_marketing3">
-            <field name="type_id" eval="ref('type_crm_nbr_new_opportunities')" />
+        <record model="gamification.challenge.line" id="line_crm_marketing3">
+            <field name="definition_id" eval="ref('definition_crm_nbr_new_opportunities')" />
             <field name="target_goal">5</field>
-            <field name="plan_id" eval="ref('plan_crm_marketing')" />
+            <field name="challenge_id" eval="ref('challenge_crm_marketing')" />
             <field name="sequence">3</field>
         </record>
 
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index f38e1ae75bf..5f57c7ecd36 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -2,17 +2,17 @@
 <openerp>
     <data>
 
-        <!-- plans -->
-        <record model="gamification.goal.plan" id="plan_crm_sale">
+        <!-- challenges -->
+        <record model="gamification.challenge" id="challenge_crm_sale">
             <field name="user_ids" eval="[(4,ref('base.user_demo'))]" />
             <field name="state">inprogress</field>
         </record>
 
         <!-- goals -->
         <record model="gamification.goal" id="goal_crm_sale1">
-            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
+            <field name="definition_id" eval="ref('definition_crm_tot_invoices')" />
             <field name="user_id" eval="ref('base.user_demo')" />
-            <field name="planline_id" eval="ref('planline_crm_sale1')" />
+            <field name="line_id" eval="ref('line_crm_sale1')" />
             <field name="start_date" eval="time.strftime('2013-03-01')" />
             <field name="end_date" eval="time.strftime('2013-03-31')" />
             <field name="target_goal">2000</field>
diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/gamification.py
index 73ae0b6cfe3..d6fbc1ce38b 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/gamification.py
@@ -131,7 +131,7 @@ class hr_employee(osv.osv):
         """Return the list of goals assigned to the employee"""
         res = {}
         for employee in self.browse(cr, uid, ids, context=context):
-            res[employee.id] = self.pool.get('gamification.goal').search(cr,uid,[('user_id', '=', employee.user_id.id), ('plan_id.category', '=', 'hr')], context=context)
+            res[employee.id] = self.pool.get('gamification.goal').search(cr,uid,[('user_id', '=', employee.user_id.id), ('challenge_id.category', '=', 'hr')], context=context)
         return res
 
     def _get_employee_badges(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/hr_gamification/gamification_view.xml b/addons/hr_gamification/gamification_view.xml
index 57e77dc22eb..406d1b71a4f 100644
--- a/addons/hr_gamification/gamification_view.xml
+++ b/addons/hr_gamification/gamification_view.xml
@@ -93,22 +93,22 @@
             <field name="name">Goals History</field>
             <field name="view_mode">tree,kanban</field>
             <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
-            <field name="domain">[('plan_id.category', '=', 'hr')]</field>
+            <field name="domain">[('challenge_id.category', '=', 'hr')]</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to create a goal. 
                 </p>
                 <p>
                     A goal is defined by a user and a goal type.
-                    Goals can be created automatically by using goal plans.
+                    Goals can be created automatically by using challenges.
                 </p>
             </field>
         </record>
 
 
-        <record id="goal_plan_list_action2" model="ir.actions.act_window">
+        <record id="challenge_list_action2" model="ir.actions.act_window">
             <field name="name">Challenges</field>
-            <field name="res_model">gamification.goal.plan</field>
+            <field name="res_model">gamification.challenge</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="domain">[('category', '=', 'hr')]</field>
             <field name="context">{'search_default_inprogress':True, 'default_inprogress':True}</field>
@@ -123,23 +123,23 @@
                 </p>
             </field>
         </record>
-        <record id="goal_plan_list_action2_view1" model="ir.actions.act_window.view">
+        <record id="challenge_list_action2_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">kanban</field>
-            <field name="act_window_id" ref="goal_plan_list_action2"/>
-            <field name="view_id" ref="gamification.view_goal_plan_kanban"/>
+            <field name="act_window_id" ref="challenge_list_action2"/>
+            <field name="view_id" ref="gamification.view_challenge_kanban"/>
         </record>
-        <record id="goal_plan_list_action2_view2" model="ir.actions.act_window.view">
+        <record id="challenge_list_action2_view2" model="ir.actions.act_window.view">
             <field eval="10" name="sequence"/>
             <field name="view_mode">form</field>
-            <field name="act_window_id" ref="goal_plan_list_action2"/>
-            <field name="view_id" ref="gamification.goal_plan_form_view"/>
+            <field name="act_window_id" ref="challenge_list_action2"/>
+            <field name="view_id" ref="gamification.challenge_form_view"/>
         </record>
 
         <menuitem id="menu_hr_gamification" parent="hr.menu_hr_root" name="Engagement" sequence="40"/>
 
         <menuitem id="gamification_badge_menu_hr" parent="menu_hr_gamification" action="gamification.badge_list_action" />
-        <menuitem id="gamification_plan_menu_hr" parent="menu_hr_gamification" action="goal_plan_list_action2" groups="base.group_hr_user"/>
+        <menuitem id="gamification_challenge_menu_hr" parent="menu_hr_gamification" action="challenge_list_action2" groups="base.group_hr_user"/>
         <menuitem id="gamification_goal_menu_hr" parent="menu_hr_gamification" action="goals_menu_groupby_action2" groups="base.group_hr_user"/>
 
     </data>
diff --git a/addons/hr_gamification/security/ir.model.access.csv b/addons/hr_gamification/security/ir.model.access.csv
index a2a9cf3010b..b89db7cd104 100644
--- a/addons/hr_gamification/security/ir.model.access.csv
+++ b/addons/hr_gamification/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-plan_officer,"Goal Plan Officer",gamification.model_gamification_goal_plan,base.group_hr_user,1,1,1,1
-planline_officer,"Goal Planline Officer",gamification.model_gamification_goal_planline,base.group_hr_user,1,1,1,1
+challenge_officer,"Challenge Officer",gamification.model_gamification_challenge,base.group_hr_user,1,1,1,1
+challenge_line_officer,"Challenge Line Officer",gamification.model_gamification_challenge_line,base.group_hr_user,1,1,1,1
 badge_officer,"Badge Officer",gamification.model_gamification_badge,base.group_hr_user,1,1,1,1
 badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,base.group_hr_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/portal_gamification/security/ir.model.access.csv b/addons/portal_gamification/security/ir.model.access.csv
index 963053df0de..4f21669cf55 100644
--- a/addons/portal_gamification/security/ir.model.access.csv
+++ b/addons/portal_gamification/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 goal_portal,"Goal Portal",gamification.model_gamification_goal,portal.group_portal,1,1,0,0
-goal_type_portal,"Goal Type Portal",gamification.model_gamification_goal_type,portal.group_portal,1,0,0,0
-plan_portal,"Goal Plan Portal",gamification.model_gamification_goal_plan,portal.group_portal,1,0,0,0
-planline_portal,"Goal Planline Portal",gamification.model_gamification_goal_planline,portal.group_portal,1,0,0,0
+goal_definition_portal,"Goal Definition Portal",gamification.model_gamification_goal_definition,portal.group_portal,1,0,0,0
+challenge_portal,"Goal Challenge Portal",gamification.model_gamification_challenge,portal.group_portal,1,0,0,0
+challenge_line_portal,"Challenge Line Portal",gamification.model_gamification_challenge_line,portal.group_portal,1,0,0,0
 badge_portal,"Badge Portal",gamification.model_gamification_badge,portal.group_portal,1,0,0,0
 badge_user_portal,"Badge-user Portal",gamification.model_gamification_badge_user,portal.group_portal,1,1,1,0

From c184adab447610a8191fde58c522e881e9d9bbf3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 17 Dec 2013 17:46:19 +0100
Subject: [PATCH 486/547] [REF] gamification

bzr revid: mat@openerp.com-20131217164619-ewgj8cclza3u44pp
---
 addons/gamification/models/challenge.py | 12 ++----------
 addons/gamification/models/res_users.py |  2 +-
 addons/gamification/views/challenge.xml |  4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index f0873a368d7..73ad5f4d982 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -198,7 +198,6 @@ class gamification_challenge(osv.Model):
 
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
-        context = context or {}
         if not ids:
             return True
 
@@ -230,8 +229,6 @@ class gamification_challenge(osv.Model):
         - Create the missing goals (eg: modified the challenge to add lines)
         - Update every running challenge
         """
-        if not context: context = {}
-
         # start planned challenges
         planned_challenge_ids = self.search(cr, uid, [
             ('state', '=', 'draft'),
@@ -254,7 +251,6 @@ class gamification_challenge(osv.Model):
 
         :param list(int) ids: the ids of the challenges to update, if False will
         update only challenges in progress."""
-        if not context: context = {}
         goal_obj = self.pool.get('gamification.goal')
 
         # we use yesterday to update the goals that just ended
@@ -297,7 +293,6 @@ class gamification_challenge(osv.Model):
 
     def quick_update(self, cr, uid, challenge_id, context=None):
         """Update all the goals of a challenge, no generation of new goals"""
-        if not context: context = {}
         goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', '=', challenge_id)], context=context)
         self.pool.get('gamification.goal').update(cr, uid, goal_ids, context=context)
         return True
@@ -521,8 +516,8 @@ class gamification_challenge(osv.Model):
           periods.
         :param subset_goal_ids: a list(int) of goal ids to restrict the report
         """
-
-        context = context or {}
+        if context is None:
+            context = {}
         # template_env = TemplateHelper()
         temp_obj = self.pool.get('email.template')
         ctx = context.copy()
@@ -573,7 +568,6 @@ class gamification_challenge(osv.Model):
 
     def accept_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user accept the suggested challenge"""
-        context = context or {}
         user_id = user_id or uid
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
@@ -583,7 +577,6 @@ class gamification_challenge(osv.Model):
 
     def discard_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user discard the suggested challenge"""
-        context = context or {}
         user_id = user_id or uid
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has refused the challenge" % user.name
@@ -591,7 +584,6 @@ class gamification_challenge(osv.Model):
         return self.write(cr, uid, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
 
     def reply_challenge_wizard(self, cr, uid, challenge_id, context=None):
-        context = context or {}
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         result = mod_obj.get_object_reference(cr, uid, 'gamification', 'challenge_wizard')
diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index 38e784247fd..0f0144e0710 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -76,7 +76,7 @@ class res_users_gamification_group(osv.Model):
                 # board report should be grouped by line for all users
                 goals_info = challenge_obj.get_board_goal_info(cr, uid, challenge, subset_goal_ids=False, context=context)
 
-                if len(goals_info) == 0:
+                if not goals_info:
                     # challenge with no valid lines
                     continue
 
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index 45cc58056d2..5403630b5b6 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -147,8 +147,8 @@
                                     <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
                                         <a type="action" name="%(goals_from_challenge_act)d" style="margin-right: 10px"> 
-                                            <span t-if="record.line_ids.length gt 1"><t t-esc="record.line_ids.length"/> Goals</span>
-                                            <span t-if="record.line_ids.length lt 2"><t t-esc="record.line_ids.length"/> Goal</span>
+                                            <span t-if="record.line_ids.raw_value.length gt 1"><t t-esc="record.line_ids.raw_value.length"/> Goals</span>
+                                            <span t-if="record.line_ids.raw_value.length lt 2"><t t-esc="record.line_ids.raw_value.length"/> Goal</span>
                                         </a>
                                     </div>
                                     <div class="oe_kanban_badge_avatars">

From 4bc29b9ffae6177dfcc42c69216f29e482c0716e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 17 Dec 2013 18:02:32 +0100
Subject: [PATCH 487/547] [REF] gamification

bzr revid: mat@openerp.com-20131217170232-e0zruxzl1wlycaji
---
 addons/gamification/data/goal_base.xml        |  4 ++--
 addons/gamification/models/challenge.py       | 21 ++++++++++---------
 addons/gamification/models/res_users.py       |  2 +-
 .../security/gamification_security.xml        |  2 +-
 .../static/src/xml/gamification.xml           |  4 ++--
 .../gamification_sale_crm/sale_crm_goals.xml  |  4 ++--
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 60000ec2805..8241da8ac3a 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -81,7 +81,7 @@
         <record model="gamification.challenge" id="challenge_base_discover">
             <field name="name">Complete your Profile</field>
             <field name="period">once</field>
-            <field name="visibility_mode">progressbar</field>
+            <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="autojoin_group_id" eval="ref('base.group_user')" />
             <field name="state">inprogress</field>
@@ -91,7 +91,7 @@
         <record model="gamification.challenge" id="challenge_base_configure">
             <field name="name">Setup your Company</field>
             <field name="period">once</field>
-            <field name="visibility_mode">progressbar</field>
+            <field name="visibility_mode">personal</field>
             <field name="report_message_frequency">never</field>
             <field name="user_ids" eval="[(4, ref('base.user_root'))]" />
             <field name="state">inprogress</field>
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 73ad5f4d982..31a22584787 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -101,6 +101,11 @@ class gamification_challenge(osv.Model):
                 res[challenge.id] = False
 
         return res
+    def _get_categories(self, cr, uid, context=None):
+            return [
+                ('hr', 'Human Ressources / Engagement'),
+                ('other', 'Settings / Gamification Tools'),
+            ]
 
     _sort = 'end_date, start_date, name, id'
     _columns = {
@@ -153,8 +158,8 @@ class gamification_challenge(osv.Model):
         'reward_failure': fields.boolean('Reward Bests if not Succeeded?'),
 
         'visibility_mode': fields.selection([
-                ('progressbar', 'Individual Goals'),
-                ('board', 'Leader Board (Group Ranking)'),
+                ('personal', 'Individual Goals'),
+                ('ranking', 'Leader Board (Group Ranking)'),
             ],
             string="Display Mode", required=True),
         'report_message_frequency': fields.selection([
@@ -174,20 +179,16 @@ class gamification_challenge(osv.Model):
             help="Never reminded if no value or zero is specified."),
         'last_report_date': fields.date('Last Report Date'),
         'next_report_date': fields.function(_get_next_report_date,
-            type='date',
-            string='Next Report Date'),
+            type='date', string='Next Report Date', store=True),
 
-        'category': fields.selection([
-                ('hr', 'Human Ressources / Engagement'),
-                ('other', 'Settings / Gamification Tools'),
-            ],
+        'category': fields.selection(lambda s, *a, **k: s._get_categories(*a, **k),
             string="Appears in", help="Define the visibility of the challenge through menus", required=True),
         }
 
     _defaults = {
         'period': 'once',
         'state': 'draft',
-        'visibility_mode': 'progressbar',
+        'visibility_mode': 'personal',
         'report_message_frequency': 'never',
         'last_report_date': fields.date.today,
         'start_date': fields.date.today,
@@ -521,7 +522,7 @@ class gamification_challenge(osv.Model):
         # template_env = TemplateHelper()
         temp_obj = self.pool.get('email.template')
         ctx = context.copy()
-        if challenge.visibility_mode == 'board':
+        if challenge.visibility_mode == 'ranking':
             lines_boards = self.get_board_goal_info(cr, uid, challenge, subset_goal_ids, context)
 
             ctx.update({'lines_boards': lines_boards})
diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index 0f0144e0710..ef544c95692 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -72,7 +72,7 @@ class res_users_gamification_group(osv.Model):
             user = self.browse(cr, uid, uid, context=context)
             serialized_goals_info['currency'] = user.company_id.currency_id.id
 
-            if challenge.visibility_mode == 'board':
+            if challenge.visibility_mode == 'ranking':
                 # board report should be grouped by line for all users
                 goals_info = challenge_obj.get_board_goal_info(cr, uid, challenge, subset_goal_ids=False, context=context)
 
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index c783828c7ae..904ba50721e 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -25,7 +25,7 @@
                     ('user_id','=',user.id),
                     '&amp;',
                         ('challenge_id.user_ids','in',user.id),
-                        ('challenge_id.visibility_mode','=','board')]</field>
+                        ('challenge_id.visibility_mode','=','ranking')]</field>
         </record>
 
         <record id="goal_gamification_manager_visibility" model="ir.rule">
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 6bfd4c2ffc9..19c622dcb97 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,7 +10,7 @@
                 <h4><t t-esc="challenge.name" /></h4>
             </div>
 
-            <t t-if="challenge.visibility_mode == 'progressbar'">
+            <t t-if="challenge.visibility_mode == 'personal'">
                 <div class="oe_table oe_goals_list">
                     <div t-foreach="challenge.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.definition_display != 'progress' ? 'oe_no_progress' : ''}">
                             <t t-if="goal.definition_display == 'progress'">
@@ -42,7 +42,7 @@
                 </div>
             </t>
 
-            <t t-if="challenge.visibility_mode == 'board'">
+            <t t-if="challenge.visibility_mode == 'ranking'">
                 <div t-foreach="challenge.lines" t-as="line" class="oe_goals_list oe_table">
                     <div class="oe_row">
                         <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.definition_description ? line.definition_description : ''}">
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index cc2283d7944..b3dc7e37890 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -129,7 +129,7 @@
         <record model="gamification.challenge" id="challenge_crm_sale">
             <field name="name">Monthly Sales Targets</field>
             <field name="period">monthly</field>
-            <field name="visibility_mode">board</field>
+            <field name="visibility_mode">ranking</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
             <field name="report_message_frequency">weekly</field>
             <field name="report_header">The following message contains the current progress of the sale team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
@@ -138,7 +138,7 @@
         <record model="gamification.challenge" id="challenge_crm_marketing">
             <field name="name">Lead Acquisition</field>
             <field name="period">monthly</field>
-            <field name="visibility_mode">progressbar</field>
+            <field name="visibility_mode">ranking</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
             <field name="report_message_frequency">weekly</field>
             <field name="report_header">The following message contains the current progress of the marketing team based on several criterias. The progress is reinitialised each month and shared weekly.</field>

From d23b68540b3323d10375a0e021839461c8c74385 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 18 Dec 2013 05:53:30 +0000
Subject: [PATCH 488/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131218055330-dvkrpp97rqo7gcf2
---
 addons/account/i18n/hu.po                | 12 ++++++++++--
 addons/account_analytic_plans/i18n/hu.po | 12 ++++++------
 addons/account_report_company/i18n/hu.po | 10 ++++++----
 addons/hr/i18n/hu.po                     |  8 ++++----
 addons/portal_project/i18n/hu.po         | 10 +++++-----
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 20001edfe29..94b7a459375 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-12-16 21:23+0000\n"
+"PO-Revision-Date: 2013-12-17 19:31+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-17 06:13+0000\n"
+"X-Launchpad-Export-Date: 2013-12-18 05:53+0000\n"
 "X-Generator: Launchpad (build 16869)\n"
 
 #. module: account
@@ -751,6 +751,12 @@ msgid ""
 "either the user pressed the button \"Nothing more to reconcile\" during the "
 "manual reconciliation process."
 msgstr ""
+"A főkönyvi számla utolsó teljes párosításának dátuma. Ez eltérő dátum lesz a "
+"partnerrel legutóbb elvégzett párosítástól, mivel itt vázoljuk annak a "
+"tényét, hogy ekkor semmivel több párosításra nem került sor. Ez "
+"kétféleképpen lehetséges: vagy az utolsó párosítatlan tartozás/követelés "
+"partner tétel lett párosítva, vagy a felhasználó megnyomta a \"Nincs több "
+"párosítható\" gombot a kézi párosítási műveleteknél."
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
@@ -805,6 +811,8 @@ msgid ""
 "The amount expressed in the secondary currency must be positive when the "
 "journal item is a debit and negative when if it is a credit."
 msgstr ""
+"A második pénznemben kifejezett értéknek pozitívnak kell lennie ha a napló "
+"tétel egy tartozás (vásárlói) és negatívnak ha egy követelés (beszállítótól)."
 
 #. module: account
 #: constraint:account.move:0
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index 59f66dcddb5..f488de06f5f 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-04-11 23:02+0000\n"
+"PO-Revision-Date: 2013-12-17 20:14+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-18 05:53+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -101,7 +101,7 @@ msgstr "Analitikus felosztási modellek"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "Gyűjtőkód megnevezése"
+msgstr "Főkönyvi számla megnevezése"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -127,7 +127,7 @@ msgstr "Nyomtatás dátuma"
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
 msgid "Dont show empty lines"
-msgstr "Ne mutassa az üres sorokat"
+msgstr "Ne mutassa az üres tételsorokat"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
@@ -149,7 +149,7 @@ msgstr "vagy"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Gyűjtőkód tételsor"
+msgstr "Analitikus gyűjtőkód tételsor"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_report_company/i18n/hu.po b/addons/account_report_company/i18n/hu.po
index cc79cf82d7a..0a4b6c034f4 100644
--- a/addons/account_report_company/i18n/hu.po
+++ b/addons/account_report_company/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-12 12:27+0000\n"
+"PO-Revision-Date: 2013-12-17 20:09+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:38+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-18 05:53+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: account_report_company
 #: field:res.partner,display_name:0
@@ -26,7 +26,7 @@ msgstr "Név"
 #: field:account.invoice,commercial_partner_id:0
 #: help:account.invoice.report,commercial_partner_id:0
 msgid "Commercial Entity"
-msgstr ""
+msgstr "Értékesítő személy"
 
 #. module: account_report_company
 #: field:account.invoice.report,commercial_partner_id:0
@@ -60,3 +60,5 @@ msgstr "Igaz"
 msgid ""
 "The commercial entity that will be used on Journal Entries for this invoice"
 msgstr ""
+"Az az értékesítő személy aki a számlához tartozó napló bejegyzéseknél fel "
+"lesz tüntetve"
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index 188b8ceefea..eccacedf666 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-12 11:12+0000\n"
+"PO-Revision-Date: 2013-12-17 18:59+0000\n"
 "Last-Translator: tdombos <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:10+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-18 05:53+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -353,7 +353,7 @@ msgstr "HR vezérlőpult"
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr "Munka"
+msgstr "Beosztás"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
diff --git a/addons/portal_project/i18n/hu.po b/addons/portal_project/i18n/hu.po
index f0e8126662d..82aab2fedb4 100644
--- a/addons/portal_project/i18n/hu.po
+++ b/addons/portal_project/i18n/hu.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-02-01 10:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-17 20:10+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-18 05:53+0000\n"
+"X-Generator: Launchpad (build 16869)\n"
 
 #. module: portal_project
 #: model:ir.model,name:portal_project.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project

From b63950e0dc49220bed8e9e2c1a7f922f5300b490 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 18 Dec 2013 09:59:07 +0100
Subject: [PATCH 489/547] [REF] gamification: mode to adequate folders

bzr revid: mat@openerp.com-20131218085907-6501sfdif2rk4a0b
---
 addons/gamification/__openerp__.py            |  2 +
 addons/gamification/models/badge.py           | 38 -----------
 addons/gamification/models/goal.py            | 24 -------
 addons/gamification/models/res_users.py       |  4 +-
 addons/gamification/views/badge.xml           | 28 --------
 addons/gamification/views/goal.xml            | 20 ------
 addons/gamification/wizard/__init__.py        | 23 +++++++
 addons/gamification/wizard/grant_badge.py     | 58 +++++++++++++++++
 addons/gamification/wizard/grant_badge.xml    | 33 ++++++++++
 addons/gamification/wizard/update_goal.py     | 44 +++++++++++++
 addons/gamification/wizard/update_goal.xml    | 24 +++++++
 addons/hr_gamification/__init__.py            |  3 +-
 addons/hr_gamification/__openerp__.py         |  3 +-
 addons/hr_gamification/models/__init__.py     | 22 +++++++
 .../{ => models}/gamification.py              | 45 +------------
 .../{ => views}/gamification_view.xml         | 42 ------------
 addons/hr_gamification/wizard/__init__.py     | 22 +++++++
 addons/hr_gamification/wizard/grant_badge.py  | 65 +++++++++++++++++++
 addons/hr_gamification/wizard/grant_badge.xml | 46 +++++++++++++
 19 files changed, 346 insertions(+), 200 deletions(-)
 create mode 100644 addons/gamification/wizard/__init__.py
 create mode 100644 addons/gamification/wizard/grant_badge.py
 create mode 100644 addons/gamification/wizard/grant_badge.xml
 create mode 100644 addons/gamification/wizard/update_goal.py
 create mode 100644 addons/gamification/wizard/update_goal.xml
 create mode 100644 addons/hr_gamification/models/__init__.py
 rename addons/hr_gamification/{ => models}/gamification.py (74%)
 rename addons/hr_gamification/{ => views}/gamification_view.xml (72%)
 create mode 100644 addons/hr_gamification/wizard/__init__.py
 create mode 100644 addons/hr_gamification/wizard/grant_badge.py
 create mode 100644 addons/hr_gamification/wizard/grant_badge.xml

diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 0bf31601876..3780b334cb1 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -46,6 +46,8 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
         'security/ir.model.access.csv',
         'data/goal_base.xml',
         'data/badge.xml',
+        'wizard/update_goal.xml',
+        'wizard/grant_badge.xml',
     ],
     'test': [
         'test/goal_demo.yml'
diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 6aa2f89e74e..ad3767cbbc4 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -24,7 +24,6 @@ from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
 
-# from templates import TemplateHelper
 from datetime import date
 import logging
 
@@ -111,7 +110,6 @@ class gamification_badge(osv.Model):
         'name': fields.char('Badge', required=True, translate=True),
         'description': fields.text('Description'),
         'image': fields.binary("Image", help="This field holds the image used for the badge, limited to 256x256"),
-        # image_select: selection with a on_change to fill image with predefined picts
         'rule_auth': fields.selection([
                 ('everyone', 'Everyone'),
                 ('users', 'A selected list of users'),
@@ -261,39 +259,3 @@ class gamification_badge(osv.Model):
 
         # badge.rule_auth == 'everyone' -> no check
         return 1
-
-
-class grant_badge_wizard(osv.TransientModel):
-    """ Wizard allowing to grant a badge to a user"""
-
-    _name = 'gamification.badge.user.wizard'
-    _columns = {
-        'user_id': fields.many2one("res.users", string='User', required=True),
-        'badge_id': fields.many2one("gamification.badge", string='Badge', required=True),
-        'comment': fields.text('Comment'),
-    }
-
-    def action_grant_badge(self, cr, uid, ids, context=None):
-        """Wizard action for sending a badge to a chosen user"""
-
-        badge_obj = self.pool.get('gamification.badge')
-        badge_user_obj = self.pool.get('gamification.badge.user')
-
-        for wiz in self.browse(cr, uid, ids, context=context):
-            if uid == wiz.user_id.id:
-                raise osv.except_osv(_('Warning!'), _('You can not grant a badge to yourself'))
-
-            #check if the badge granting is legitimate
-            if badge_obj.check_granting(cr, uid, user_from_id=uid, badge_id=wiz.badge_id.id, context=context):
-                #create the badge
-                values = {
-                    'user_id': wiz.user_id.id,
-                    'badge_id': wiz.badge_id.id,
-                    'comment': wiz.comment,
-                }
-                badge_user = badge_user_obj.create(cr, uid, values, context=context)
-                #notify the user
-                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
-
-        return result
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 5a170a904c6..529f706fecd 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -372,27 +372,3 @@ class gamification_goal(osv.Model):
             return action
 
         return False
-
-
-class goal_manual_wizard(osv.TransientModel):
-    """Wizard to update a manual goal"""
-    _name = 'gamification.goal.wizard'
-    _columns = {
-        'goal_id': fields.many2one("gamification.goal", string='Goal', required=True),
-        'current': fields.float('Current'),
-    }
-
-    def action_update_current(self, cr, uid, ids, context=None):
-        """Wizard action for updating the current value"""
-
-        goal_obj = self.pool.get('gamification.goal')
-
-        for wiz in self.browse(cr, uid, ids, context=context):
-            towrite = {
-                'current': wiz.current,
-                'goal_id': wiz.goal_id.id,
-            }
-            goal_obj.write(cr, uid, [wiz.goal_id.id], towrite, context=context)
-            goal_obj.update(cr, uid, [wiz.goal_id.id], context=context)
-        return {}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index ef544c95692..6c8ca7646b3 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -61,6 +61,7 @@ class res_users_gamification_group(osv.Model):
         all_goals_info = []
         challenge_obj = self.pool.get('gamification.challenge')
 
+        user = self.browse(cr, uid, uid, context=context)
         challenge_ids = challenge_obj.search(cr, uid, [('user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
         for challenge in challenge_obj.browse(cr, uid, challenge_ids, context=context):
             # serialize goals info to be able to use it in javascript
@@ -68,9 +69,8 @@ class res_users_gamification_group(osv.Model):
                 'id': challenge.id,
                 'name': challenge.name,
                 'visibility_mode': challenge.visibility_mode,
+                'currency': user.company_id.currency_id.id
             }
-            user = self.browse(cr, uid, uid, context=context)
-            serialized_goals_info['currency'] = user.company_id.currency_id.id
 
             if challenge.visibility_mode == 'ranking':
                 # board report should be grouped by line for all users
diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml
index af401b1f7de..f0ee1a8423d 100644
--- a/addons/gamification/views/badge.xml
+++ b/addons/gamification/views/badge.xml
@@ -19,34 +19,6 @@
             </field>
         </record>
 
-
-        <record id="view_badge_wizard_grant" model="ir.ui.view">
-            <field name="name">Grant Badge User Form</field>
-            <field name="model">gamification.badge.user.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Grant Badge To" version="7.0">
-                    Who would you like to reward?
-                    <group>
-                        <field name="user_id" nolabel="1" />
-                        <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding" />
-                    </group>
-                    <footer>
-                        <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <act_window domain="[]" id="action_grant_wizard"
-            name="Grant Badge"
-            target="new"
-            res_model="gamification.badge.user.wizard"
-            context="{'default_badge_id': active_id, 'badge_id': active_id}"
-            view_type="form" view_mode="form"
-            view_id="gamification.view_badge_wizard_grant" />
-
         <record id="badge_list_view" model="ir.ui.view">
             <field name="name">Badge List</field>
             <field name="model">gamification.badge</field>
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml
index 8fa792c0b5a..dbb208ad5fd 100644
--- a/addons/gamification/views/goal.xml
+++ b/addons/gamification/views/goal.xml
@@ -278,26 +278,6 @@
             </field>
         </record>
 
-
-        <record id="view_goal_wizard_update_current" model="ir.ui.view">
-            <field name="name">Update the current value of the Goal</field>
-            <field name="model">gamification.goal.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Grant Badge To" version="7.0">
-                    Set the current value you have reached for this goal
-                    <group>
-                        <field name="goal_id" invisible="1"/>
-                        <field name="current" />
-                    </group>
-                    <footer>
-                        <button string="Update" type="object" name="action_update_current" class="oe_highlight" /> or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-
         <!-- menus in settings - technical feature required -->
         <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration" groups="base.group_no_one" />
             <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
diff --git a/addons/gamification/wizard/__init__.py b/addons/gamification/wizard/__init__.py
new file mode 100644
index 00000000000..638fbef4373
--- /dev/null
+++ b/addons/gamification/wizard/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import update_goal
+import grant_badge
diff --git a/addons/gamification/wizard/grant_badge.py b/addons/gamification/wizard/grant_badge.py
new file mode 100644
index 00000000000..725512a55bb
--- /dev/null
+++ b/addons/gamification/wizard/grant_badge.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+
+class grant_badge_wizard(osv.TransientModel):
+    """ Wizard allowing to grant a badge to a user"""
+
+    _name = 'gamification.badge.user.wizard'
+    _columns = {
+        'user_id': fields.many2one("res.users", string='User', required=True),
+        'badge_id': fields.many2one("gamification.badge", string='Badge', required=True),
+        'comment': fields.text('Comment'),
+    }
+
+    def action_grant_badge(self, cr, uid, ids, context=None):
+        """Wizard action for sending a badge to a chosen user"""
+
+        badge_obj = self.pool.get('gamification.badge')
+        badge_user_obj = self.pool.get('gamification.badge.user')
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            if uid == wiz.user_id.id:
+                raise osv.except_osv(_('Warning!'), _('You can not grant a badge to yourself'))
+
+            #check if the badge granting is legitimate
+            if badge_obj.check_granting(cr, uid, user_from_id=uid, badge_id=wiz.badge_id.id, context=context):
+                #create the badge
+                values = {
+                    'user_id': wiz.user_id.id,
+                    'badge_id': wiz.badge_id.id,
+                    'comment': wiz.comment,
+                }
+                badge_user = badge_user_obj.create(cr, uid, values, context=context)
+                #notify the user
+                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
+
+        return result
diff --git a/addons/gamification/wizard/grant_badge.xml b/addons/gamification/wizard/grant_badge.xml
new file mode 100644
index 00000000000..e03dbac4096
--- /dev/null
+++ b/addons/gamification/wizard/grant_badge.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_badge_wizard_grant" model="ir.ui.view">
+            <field name="name">Grant Badge User Form</field>
+            <field name="model">gamification.badge.user.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Grant Badge To" version="7.0">
+                    Who would you like to reward?
+                    <group>
+                        <field name="user_id" nolabel="1" />
+                        <field name="badge_id" invisible="1"/>
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding" />
+                    </group>
+                    <footer>
+                        <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <act_window domain="[]" id="action_grant_wizard"
+            name="Grant Badge"
+            target="new"
+            res_model="gamification.badge.user.wizard"
+            context="{'default_badge_id': active_id, 'badge_id': active_id}"
+            view_type="form" view_mode="form"
+            view_id="gamification.view_badge_wizard_grant" />
+
+    </data>
+</openerp>
diff --git a/addons/gamification/wizard/update_goal.py b/addons/gamification/wizard/update_goal.py
new file mode 100644
index 00000000000..cbda3fefbce
--- /dev/null
+++ b/addons/gamification/wizard/update_goal.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+class goal_manual_wizard(osv.TransientModel):
+    """Wizard to update a manual goal"""
+    _name = 'gamification.goal.wizard'
+    _columns = {
+        'goal_id': fields.many2one("gamification.goal", string='Goal', required=True),
+        'current': fields.float('Current'),
+    }
+
+    def action_update_current(self, cr, uid, ids, context=None):
+        """Wizard action for updating the current value"""
+
+        goal_obj = self.pool.get('gamification.goal')
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            towrite = {
+                'current': wiz.current,
+                'goal_id': wiz.goal_id.id,
+            }
+            goal_obj.write(cr, uid, [wiz.goal_id.id], towrite, context=context)
+            goal_obj.update(cr, uid, [wiz.goal_id.id], context=context)
+        return {}
diff --git a/addons/gamification/wizard/update_goal.xml b/addons/gamification/wizard/update_goal.xml
new file mode 100644
index 00000000000..793efab90ff
--- /dev/null
+++ b/addons/gamification/wizard/update_goal.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_goal_wizard_update_current" model="ir.ui.view">
+            <field name="name">Update the current value of the Goal</field>
+            <field name="model">gamification.goal.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Grant Badge To" version="7.0">
+                    Set the current value you have reached for this goal
+                    <group>
+                        <field name="goal_id" invisible="1"/>
+                        <field name="current" />
+                    </group>
+                    <footer>
+                        <button string="Update" type="object" name="action_update_current" class="oe_highlight" /> or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/hr_gamification/__init__.py b/addons/hr_gamification/__init__.py
index 51cf01dfa09..1896704c7fc 100644
--- a/addons/hr_gamification/__init__.py
+++ b/addons/hr_gamification/__init__.py
@@ -19,4 +19,5 @@
 #
 ##############################################################################
 
-import gamification
+import models
+import wizard
\ No newline at end of file
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index d5d79dba074..2d29ccbc60a 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -33,7 +33,8 @@ Badge received are displayed on the user profile.
     'data': [
         'security/ir.model.access.csv',
         'security/gamification_security.xml',
-        'gamification_view.xml',
+        'views/gamification.xml',
+        'wizard/grant_badge.xml',
     ],
     'js': ['static/src/js/gamification.js'],
 }
diff --git a/addons/hr_gamification/models/__init__.py b/addons/hr_gamification/models/__init__.py
new file mode 100644
index 00000000000..51cf01dfa09
--- /dev/null
+++ b/addons/hr_gamification/models/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import gamification
diff --git a/addons/hr_gamification/gamification.py b/addons/hr_gamification/models/gamification.py
similarity index 74%
rename from addons/hr_gamification/gamification.py
rename to addons/hr_gamification/models/gamification.py
index d6fbc1ce38b..3c92514f338 100644
--- a/addons/hr_gamification/gamification.py
+++ b/addons/hr_gamification/models/gamification.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 
 
@@ -54,7 +53,7 @@ class gamification_badge(osv.Model):
         """Overwrite the message_post method to send the badge to the employee"""
         # badge_user included in the send_badge method and 'badge_id' in the wizard view
         if 'badge_user' in context and 'badge_id' in context:
-            badge = self.browse(cr, uid, context['badge_id'], context=context)
+            # badge = self.browse(cr, uid, context['badge_id'], context=context)
             badge_user = context['badge_user']
             if badge_user.employee_id:
                 return self.pool.get('hr.employee').message_post(cr, SUPERUSER_ID,
@@ -80,48 +79,6 @@ class gamification_badge(osv.Model):
             'domain': [('id', 'in', employee_ids)]
         }
 
-class hr_grant_badge_wizard(osv.TransientModel):
-    _name = 'gamification.badge.user.wizard'
-    _inherit = ['gamification.badge.user.wizard']
-
-    _columns = {
-        'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
-        'user_id': fields.related("employee_id", "user_id",
-                                  type="many2one", relation="res.users",
-                                  store=True, string='User')
-    }
-
-    def action_grant_badge(self, cr, uid, ids, context=None):
-        """Wizard action for sending a badge to a chosen employee"""
-        if context is None:
-            context = {}
-
-        badge_obj = self.pool.get('gamification.badge')
-        badge_user_obj = self.pool.get('gamification.badge.user')
-
-        for wiz in self.browse(cr, uid, ids, context=context):
-            if not wiz.user_id:
-                raise osv.except_osv(_('Warning!'), _('You can send badges only to employees linked to a user.'))
-
-            if uid == wiz.user_id.id:
-                raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
-
-            if badge_obj.check_granting(cr, uid,
-                                         user_from_id=uid,
-                                         badge_id=wiz.badge_id.id,
-                                         context=context):
-
-                values = {
-                    'user_id': wiz.user_id.id,
-                    'badge_id': wiz.badge_id.id,
-                    'employee_id': wiz.employee_id.id,
-                    'comment': wiz.comment,
-                }
-                badge_user = badge_user_obj.create(cr, uid, values, context=context)
-
-                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
-        return result
-
 
 class hr_employee(osv.osv):
     _name = "hr.employee"
diff --git a/addons/hr_gamification/gamification_view.xml b/addons/hr_gamification/views/gamification_view.xml
similarity index 72%
rename from addons/hr_gamification/gamification_view.xml
rename to addons/hr_gamification/views/gamification_view.xml
index 406d1b71a4f..e2d45948b95 100644
--- a/addons/hr_gamification/gamification_view.xml
+++ b/addons/hr_gamification/views/gamification_view.xml
@@ -2,48 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Wizard -->
-
-        <record id="view_badge_wizard_grant_employee" model="ir.ui.view">
-            <field name="name">Grant Badge Employee Form</field>
-            <field name="model">gamification.badge.user.wizard</field>
-            <field name="inherit_id" ref="gamification.view_badge_wizard_grant" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='user_id']" position="replace">
-                        <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False),('user_id', '!=', uid)]" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <record id="view_badge_wizard_reward" model="ir.ui.view">
-            <field name="name">Reward Employee Badge Form</field>
-            <field name="model">gamification.badge.user.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Reward Employee with" version="7.0">
-                    What are you thank for?
-                    <group>
-                        <field name="employee_id" invisible="1" />
-                        <field name="badge_id" nolabel="1" colspan="4" />
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
-                    </group>
-                    <footer>
-                        <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <act_window domain="[]" id="action_reward_wizard"
-            name="Reward Employee"
-            target="new"
-            res_model="gamification.badge.user.wizard"
-            context="{'default_employee_id': active_id, 'employee_id': active_id}"
-            view_type="form" view_mode="form"
-            view_id="view_badge_wizard_reward"/>
-
         <record id="hr_badge_form_view" model="ir.ui.view">
             <field name="name">Badge Form</field>
             <field name="model">gamification.badge</field>
diff --git a/addons/hr_gamification/wizard/__init__.py b/addons/hr_gamification/wizard/__init__.py
new file mode 100644
index 00000000000..bb521f011bb
--- /dev/null
+++ b/addons/hr_gamification/wizard/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import grant_badge
\ No newline at end of file
diff --git a/addons/hr_gamification/wizard/grant_badge.py b/addons/hr_gamification/wizard/grant_badge.py
new file mode 100644
index 00000000000..95efe444114
--- /dev/null
+++ b/addons/hr_gamification/wizard/grant_badge.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+class hr_grant_badge_wizard(osv.TransientModel):
+    _name = 'gamification.badge.user.wizard'
+    _inherit = ['gamification.badge.user.wizard']
+
+    _columns = {
+        'employee_id': fields.many2one("hr.employee", string='Employee', required=True),
+        'user_id': fields.related("employee_id", "user_id",
+                                  type="many2one", relation="res.users",
+                                  store=True, string='User')
+    }
+
+    def action_grant_badge(self, cr, uid, ids, context=None):
+        """Wizard action for sending a badge to a chosen employee"""
+        if context is None:
+            context = {}
+
+        badge_obj = self.pool.get('gamification.badge')
+        badge_user_obj = self.pool.get('gamification.badge.user')
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            if not wiz.user_id:
+                raise osv.except_osv(_('Warning!'), _('You can send badges only to employees linked to a user.'))
+
+            if uid == wiz.user_id.id:
+                raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
+
+            if badge_obj.check_granting(cr, uid,
+                                         user_from_id=uid,
+                                         badge_id=wiz.badge_id.id,
+                                         context=context):
+
+                values = {
+                    'user_id': wiz.user_id.id,
+                    'badge_id': wiz.badge_id.id,
+                    'employee_id': wiz.employee_id.id,
+                    'comment': wiz.comment,
+                }
+                badge_user = badge_user_obj.create(cr, uid, values, context=context)
+
+                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
+        return result
\ No newline at end of file
diff --git a/addons/hr_gamification/wizard/grant_badge.xml b/addons/hr_gamification/wizard/grant_badge.xml
new file mode 100644
index 00000000000..6dcf2d2e7c4
--- /dev/null
+++ b/addons/hr_gamification/wizard/grant_badge.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_badge_wizard_grant_employee" model="ir.ui.view">
+            <field name="name">Grant Badge Employee Form</field>
+            <field name="model">gamification.badge.user.wizard</field>
+            <field name="inherit_id" ref="gamification.view_badge_wizard_grant" />
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='user_id']" position="replace">
+                        <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False),('user_id', '!=', uid)]" />
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="view_badge_wizard_reward" model="ir.ui.view">
+            <field name="name">Reward Employee Badge Form</field>
+            <field name="model">gamification.badge.user.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Reward Employee with" version="7.0">
+                    What are you thank for?
+                    <group>
+                        <field name="employee_id" invisible="1" />
+                        <field name="badge_id" nolabel="1" colspan="4" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
+                    </group>
+                    <footer>
+                        <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <act_window domain="[]" id="action_reward_wizard"
+            name="Reward Employee"
+            target="new"
+            res_model="gamification.badge.user.wizard"
+            context="{'default_employee_id': active_id, 'employee_id': active_id}"
+            view_type="form" view_mode="form"
+            view_id="view_badge_wizard_reward"/>
+
+    </data>
+</openerp>

From bf324b417cda1f1e56c078d651aa8c5d6387ca99 Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@openerp.com>
Date: Wed, 18 Dec 2013 12:12:14 +0100
Subject: [PATCH 490/547] [FIX] base: make explicit, that res.users reified
 fields are not selectable

bzr revid: xal@openerp.com-20131218111214-543cjhkp6k0steyi
---
 openerp/addons/base/res/res_users.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 4eb8d873f48..995d6a59cf9 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -838,6 +838,7 @@ class users_view(osv.osv):
                     'selection': [(False, '')] + [(g.id, g.name) for g in gs],
                     'help': '\n'.join(tips),
                     'exportable': False,
+                    'selectable': False,
                 }
             else:
                 # boolean group fields
@@ -847,6 +848,7 @@ class users_view(osv.osv):
                         'string': g.name,
                         'help': g.comment,
                         'exportable': False,
+                        'selectable': False,
                     }
         return res
 

From e7887b8b8f892832c5b65b82358d022496a2729d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 18 Dec 2013 12:12:43 +0100
Subject: [PATCH 491/547] [REF] gamification: python tests and other
 improvements

bzr revid: mat@openerp.com-20131218111243-npnauv6mxhb4nttg
---
 addons/gamification/__init__.py             |  1 +
 addons/gamification/__openerp__.py          |  9 +--
 addons/gamification/data/goal_base.xml      | 16 ----
 addons/gamification/models/challenge.py     | 39 +++++++--
 addons/gamification/models/goal.py          |  5 +-
 addons/gamification/models/res_users.py     | 20 +++--
 addons/gamification/test/goal_demo.yml      | 53 ------------
 addons/gamification/tests/__init__.py       | 26 ++++++
 addons/gamification/tests/test_challenge.py | 89 +++++++++++++++++++++
 9 files changed, 171 insertions(+), 87 deletions(-)
 delete mode 100644 addons/gamification/test/goal_demo.yml
 create mode 100644 addons/gamification/tests/__init__.py
 create mode 100644 addons/gamification/tests/test_challenge.py

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index d644a612108..5fff27fedfe 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -20,4 +20,5 @@
 ##############################################################################
 
 import models
+import wizard
 import data
diff --git a/addons/gamification/__openerp__.py b/addons/gamification/__openerp__.py
index 3780b334cb1..c522e287725 100644
--- a/addons/gamification/__openerp__.py
+++ b/addons/gamification/__openerp__.py
@@ -38,19 +38,16 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
 """,
 
     'data': [
-        'views/challenge.xml',
+        'wizard/update_goal.xml',
+        'wizard/grant_badge.xml',
         'views/badge.xml',
+        'views/challenge.xml',
         'views/goal.xml',
         'data/cron.xml',
         'security/gamification_security.xml',
         'security/ir.model.access.csv',
         'data/goal_base.xml',
         'data/badge.xml',
-        'wizard/update_goal.xml',
-        'wizard/grant_badge.xml',
-    ],
-    'test': [
-        'test/goal_demo.yml'
     ],
     'installable': True,
     'application': True,
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 8241da8ac3a..2b21fbc947f 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -14,17 +14,6 @@
             <field name="res_id_field">user.id</field>
         </record>
 
-        <record model="gamification.goal.definition" id="definition_base_avatar">
-            <field name="name">Set your Avatar</field>
-            <field name="description">In your user preference</field>
-            <field name="computation_mode">manually</field>
-            <field name="display_mode">checkbox</field>
-            <!-- problem : default avatar != False -> manually + check in write function -->
-            <field name="action_id" eval="ref('base.action_res_users_my')" />
-            <field name="res_id_field">user.id</field>
-        </record>
-
-
         <record model="gamification.goal.definition" id="definition_base_company_data">
             <field name="name">Set your Company Data</field>
             <field name="description">Write some information about your company (specify at least a name)</field>
@@ -104,11 +93,6 @@
             <field name="target_goal">1</field>
             <field name="challenge_id" eval="ref('challenge_base_discover')" />
         </record>
-        <record model="gamification.challenge.line" id="line_base_discover2">
-            <field name="definition_id" eval="ref('definition_base_avatar')" />
-            <field name="target_goal">1</field>
-            <field name="challenge_id" eval="ref('challenge_base_discover')" />
-        </record>
 
         <record model="gamification.challenge.line" id="line_base_admin2">
             <field name="definition_id" eval="ref('definition_base_company_logo')" />
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 31a22584787..4d34fe7b640 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -197,11 +197,30 @@ class gamification_challenge(osv.Model):
         'reward_failure': False,
     }
 
+
+    def create(self, cr, uid, vals, context=None):
+        """Overwrite the create method to add the user of groups"""
+
+        # add users when change the group auto-subscription
+        if vals.get('autojoin_group_id'):
+            new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
+
+            if 'user_ids' not in vals:
+                vals['user_ids'] = []
+            vals['user_ids'] += [(4, user.id) for user in new_group.users]
+
+        create_res = super(gamification_challenge, self).create(cr, uid, vals, context=context)
+
+        # subscribe new users to the challenge
+        if vals.get('user_ids'):
+            # done with browse after super to be sure catch all after orm process
+            challenge = self.browse(cr, uid, create_res, context=context)
+            self.message_subscribe_users(cr, uid, [challenge.id], [user.id for user in challenge.user_ids], context=context)
+
+        return create_res
+
     def write(self, cr, uid, ids, vals, context=None):
         """Overwrite the write method to add the user of groups"""
-        if not ids:
-            return True
-
         # add users when change the group auto-subscription
         if vals.get('autojoin_group_id'):
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
@@ -306,6 +325,8 @@ class gamification_challenge(osv.Model):
 
         Change the state of the challenge to in progress and generate related goals
         """
+        if isinstance(ids, (int,long)):
+            ids = [ids]
         # subscribe users if autojoin group
         for challenge in self.browse(cr, uid, ids, context=context):
             if challenge.autojoin_group_id:
@@ -320,6 +341,8 @@ class gamification_challenge(osv.Model):
 
         Create goals that haven't been created yet (eg: if added users)
         Recompute the current value for each goal related"""
+        if isinstance(ids, (int,long)):
+            ids = [ids]
         return self._update_all(cr, uid, ids=ids, context=context)
 
     def action_close(self, cr, uid, ids, context=None):
@@ -342,6 +365,8 @@ class gamification_challenge(osv.Model):
 
         Change the state of the challenge to draft
         Cancel the related goals"""
+        if isinstance(ids, (int,long)):
+            ids = [ids]
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', 'in', ids)], context=context)
         self.pool.get('gamification.goal').write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
@@ -350,6 +375,8 @@ class gamification_challenge(osv.Model):
 
     def action_report_progress(self, cr, uid, ids, context=None):
         """Manual report of a goal, does not influence automatic report frequency"""
+        if isinstance(ids, (int,long)):
+            ids = [ids]
         for challenge in self.browse(cr, uid, ids, context):
             self.report_progress(cr, uid, challenge, context=context)
         return True
@@ -593,7 +620,7 @@ class gamification_challenge(osv.Model):
         result['res_id'] = challenge_id
         return result
 
-    def check_challenge_reward(self, cr, uid, challenge_ids, force=False, context=None):
+    def check_challenge_reward(self, cr, uid, ids, force=False, context=None):
         """Actions for the end of a challenge
 
         If a reward was selected, grant it to the correct users.
@@ -603,8 +630,10 @@ class gamification_challenge(osv.Model):
             - when a challenge is manually closed
         (if no end date, a running challenge is never rewarded)
         """
+        if isinstance(ids, (int,long)):
+            ids = [ids]
         context = context or {}
-        for challenge in self.browse(cr, uid, challenge_ids, context=context):
+        for challenge in self.browse(cr, uid, ids, context=context):
             (start_date, end_date) = start_end_date_for_period(challenge.period, challenge.start_date, challenge.end_date)
             yesterday = date.today() - timedelta(days=1)
             if end_date == yesterday.strftime(DF) or force:
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 529f706fecd..5464b51a4ea 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -307,7 +307,8 @@ class gamification_goal(osv.Model):
 
     def create(self, cr, uid, vals, context=None):
         """Overwrite the create method to add a 'no_remind_goal' field to True"""
-        context = context or {}
+        if context is None:
+            context = {}
         context['no_remind_goal'] = True
         return super(gamification_goal, self).create(cr, uid, vals, context=context)
 
@@ -317,6 +318,8 @@ class gamification_goal(osv.Model):
         If the current value is changed and the report frequency is set to On
         change, a report is generated
         """
+        if context is None:
+            context = {}
         vals['last_update'] = fields.date.today()
         result = super(gamification_goal, self).write(cr, uid, ids, vals, context=context)
         for goal in self.browse(cr, uid, ids, context=context):
diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index 6c8ca7646b3..d831ab2ea25 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -31,6 +31,7 @@ class res_users_gamification_group(osv.Model):
     _inherit = ['res.users']
 
     def write(self, cr, uid, ids, vals, context=None):
+        """Overwrite to autosubscribe users if added to a group marked as autojoin, user will be added to challenge"""
         write_res = super(res_users_gamification_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('groups_id'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
@@ -41,12 +42,20 @@ class res_users_gamification_group(osv.Model):
             challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
             if challenge_ids:
                 challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
+        return write_res
 
-        if vals.get('image'):
-            goal_definition_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'definition_base_avatar', context)
-            goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('definition_id', '=', goal_definition_id.id), ('user_id', 'in', ids)], context=context)
-            values = {'state': 'reached', 'current': 1}
-            self.pool.get('gamification.goal').write(cr, uid, goal_ids, values, context=context)
+    def create(self, cr, uid, vals, context=None):
+        """Overwrite to autosubscribe users if added to a group marked as autojoin, user will be added to challenge"""
+        write_res = super(res_users_gamification_group, self).create(cr, uid, vals, context=context)
+        if vals.get('groups_id'):
+            # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
+            user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4]
+            user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
+
+            challenge_obj = self.pool.get('gamification.challenge')
+            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
+            if challenge_ids:
+                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, write_res)]}, context=context)
         return write_res
 
     def get_goals_todo_info(self, cr, uid, context=None):
@@ -174,4 +183,3 @@ class res_groups_gamification_group(osv.Model):
             if challenge_ids:
                 challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
         return write_res
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/gamification/test/goal_demo.yml b/addons/gamification/test/goal_demo.yml
deleted file mode 100644
index 1efc6cc7e74..00000000000
--- a/addons/gamification/test/goal_demo.yml
+++ /dev/null
@@ -1,53 +0,0 @@
--
-  In order to test process of the Goals, I assign the discovery challenge to all users
--
-  !record {model: gamification.challenge, id: challenge_base_discover}:
-    autojoin_group_id: base.group_user
--
-  I verify that the users of the group are added (at least admin and demo)
--
-  !assert {model: gamification.challenge, id: challenge_base_discover, string: The autojoin function was not successful}:
-    - len(user_ids) >= 2
--
-  I start the challenge and verify the change of state
--
-  !python {model: gamification.challenge}: |
-    challenge = self.browse(cr, uid, ref('challenge_base_discover'))
-    self.action_start(cr, uid, [challenge.id], context=context)
-    assert challenge.state == 'inprogress', "Challenge failed the change of state"
--
-  I verify the goals are generated correctly
--
-  !python {model: gamification.goal}: |
-    goal_ids = self.search(cr, uid, [('challenge_id', '=', ref('challenge_base_discover'))], context=context)
-    assert len(goal_ids) >= 4, "Not enough goals have been generated"
-    for goal in self.browse(cr, uid, goal_ids, context=context):
-      assert goal.state != 'draft', "Draft goal have been generated"
-      assert goal.line_id.challenge_id.id == ref('challenge_base_discover'), "Linked line incorrect"
--
-  I change timezone for demo user
--
-  !record {model: res.users, id: base.user_demo}:
-    tz: "Europe/Brussels"
--
-  I check the goal for demo user is successful
--
-  !python {model: gamification.goal}: |
-    goal_ids = self.search(cr, uid, [('user_id', '=', ref('base.user_demo')),('definition_id','=',ref('definition_base_timezone'))])
-    self.update(cr, uid, goal_ids, context=context)
-    for goal in self.browse(cr, uid, goal_ids, context=context):
-      assert goal.state == "reached", "Goal not successful %s" % goal.state
--
-  I add a reward to the challenge
--
-  !record {model: gamification.challenge, id: challenge_base_discover}:
-    reward_first_id: gamification.badge_good_job
-    reward_failure: True
--
-  I check the demo user received the badge
--
-  !python {model: gamification.challenge}: |
-    challenge = self.browse(cr, uid, ref('challenge_base_discover'), context=context)
-    self.action_close(cr, uid, [challenge.id])
-    badge_ids = self.pool.get('gamification.badge.user').search(cr, uid, [('badge_id', '=', ref('badge_good_job')), ('user_id', '=', ref('base.user_demo'))])
-    assert badge_ids, "Demo users didn't received the badge"
\ No newline at end of file
diff --git a/addons/gamification/tests/__init__.py b/addons/gamification/tests/__init__.py
new file mode 100644
index 00000000000..9cafd242b28
--- /dev/null
+++ b/addons/gamification/tests/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_challenge
+
+checks = [
+    test_challenge,
+]
diff --git a/addons/gamification/tests/test_challenge.py b/addons/gamification/tests/test_challenge.py
new file mode 100644
index 00000000000..c5dc02ef468
--- /dev/null
+++ b/addons/gamification/tests/test_challenge.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class test_challenge(common.TransactionCase):
+
+    def setUp(self):
+        super(test_challenge, self).setUp()
+        cr, uid = self.cr, self.uid
+        self.data_obj = self.registry('ir.model.data')
+        self.user_obj = self.registry('res.users')
+
+        self.challenge_obj = self.registry('gamification.challenge')
+        self.line_obj = self.registry('gamification.challenge.line')
+        self.goal_obj = self.registry('gamification.goal')
+        self.badge_obj = self.registry('gamification.badge')
+        self.badge_user_obj = self.registry('gamification.badge.user')
+
+        self.demo_user_id = self.data_obj.get_object_reference(cr, uid, 'base', 'user_demo')[1]
+        self.group_user_id = self.data_obj.get_object_reference(cr, uid, 'base', 'group_user')[1]
+        self.challenge_base_id = self.data_obj.get_object_reference(cr, uid, 'gamification', 'challenge_base_discover')[1]
+        self.definition_timezone_id = self.data_obj.get_object_reference(cr, uid, 'gamification', 'definition_base_timezone')[1]
+        self.badge_id = self.data_obj.get_object_reference(cr, uid, 'gamification', 'badge_good_job')[1]
+
+    def test_00_join_challenge(self):
+        cr, uid, context = self.cr, self.uid, {}
+
+        user_ids = self.user_obj.search(cr, uid, [('groups_id', '=', self.group_user_id)])
+        challenge = self.challenge_obj.browse(cr, uid, self.challenge_base_id, context=context)
+
+        self.assertGreaterEqual(len(challenge.user_ids), len(user_ids), "Not enough users in base challenge")
+
+        self.user_obj.create(cr, uid, {
+            'name': 'R2D2',
+            'login': 'r2d2@openerp.com',
+            'email': 'r2d2@openerp.com',
+            'groups_id': [(6, 0, [self.group_user_id])]
+        }, {'no_reset_password': True})
+
+        challenge = self.challenge_obj.browse(cr, uid, self.challenge_base_id, context=context)
+        self.assertGreaterEqual(len(challenge.user_ids), len(user_ids)+1, "These are not droids you are looking for")
+
+    def test_10_reach_challenge(self):
+        cr, uid, context = self.cr, self.uid, {}
+        
+        self.challenge_obj.action_start(cr, uid, [self.challenge_base_id], context=context)
+        challenge = self.challenge_obj.browse(cr, uid, self.challenge_base_id, context=context)
+        challenge_user_ids = [user.id for user in challenge.user_ids]
+
+        self.assertEqual(challenge.state, 'inprogress', "Challenge failed the change of state")
+
+        line_ids = self.line_obj.search(cr, uid, [('challenge_id', '=', self.challenge_base_id)], context=context)
+        goal_ids = self.goal_obj.search(cr, uid, [('challenge_id', '=', self.challenge_base_id), ('state', '!=', 'draft')], context=context)
+        self.assertEqual(len(goal_ids), len(line_ids)*len(challenge_user_ids), "Incorrect number of goals generated, should be 1 goal per user, per challenge line")
+
+        # demo user will set a timezone
+        self.user_obj.write(cr, uid, self.demo_user_id, {'tz': "Europe/Brussels"}, context=context)
+        goal_ids = self.goal_obj.search(cr, uid, [('user_id', '=', self.demo_user_id), ('definition_id', '=', self.definition_timezone_id)], context=context)
+        
+        self.goal_obj.update(cr, uid, goal_ids, context=context)
+        reached_goal_ids = self.goal_obj.search(cr, uid, [('id', 'in', goal_ids), ('state', '=', 'reached')], context=context)
+        self.assertEqual(set(goal_ids), set(reached_goal_ids), "Not every goal was reached after changing timezone")
+
+        # reward for two firsts as admin may have timezone
+        self.challenge_obj.write(cr, uid, self.challenge_base_id, {'reward_first_id': self.badge_id, 'reward_second_id': self.badge_id}, context=context)
+        self.challenge_obj.action_close(cr, uid, self.challenge_base_id, context=context)
+
+        badge_ids = self.badge_user_obj.search(cr, uid, [('badge_id', '=', self.badge_id), ('user_id', '=', self.demo_user_id)])
+        self.assertGreater(len(badge_ids), 0, "Demo user has not received the badge")
\ No newline at end of file

From cb0074ab15efd5e98ca0472ec66a8a89fef42719 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 18 Dec 2013 12:24:16 +0100
Subject: [PATCH 492/547] [FIX] web: context propagation was broken on buttons
 of action and object type.

The context on the button must be propagated to the resulting action

bzr revid: dle@openerp.com-20131218112416-2vtaq442qo8opq4u
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 1d7ed406378..c9584002472 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1364,10 +1364,11 @@ instance.web.View = instance.web.Widget.extend({
                 // Wrong default_* and search_default_* values will no give the expected result
                 // Wrong group_by values will simply fail and forbid rendering of the destination view
                 var ncontext = new instance.web.CompoundContext(
-                    _.object(_.reject(_.pairs(context.eval()), function(pair) {
+                    _.object(_.reject(_.pairs(dataset.get_context().eval()), function(pair) {
                       return pair[0].match('^(?:(?:default_|search_default_).+|group_by|group_by_no_leaf|active_id|active_ids)$') !== null;
                     }))
                 );
+                ncontext.add(action_data.context || {});
                 ncontext.add({active_model: dataset.model});
                 if (record_id) {
                     ncontext.add({

From 9491755b8b4116758afbbefd675660c3b05fd289 Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@openerp.com>
Date: Wed, 18 Dec 2013 12:35:47 +0100
Subject: [PATCH 493/547] [FIX] web: only show in 'Advanced Search', fields
 that are actually searcheable and avoid duplicate 'ID' field

bzr revid: xal@openerp.com-20131218113547-myl7eihvw5vbzkaa
---
 addons/web/static/src/js/search.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 78f53506abc..1b3d85930e6 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1848,9 +1848,14 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
             new instance.web.Model(this.view.model).call('fields_get', {
                     context: this.view.dataset.context
                 }).done(function(data) {
-                    self.fields = _.extend({
+                    self.fields = {
                         id: { string: 'ID', type: 'id' }
-                    }, data);
+                    };
+                    _.each(data, function(field_def, field_name) {
+                        if (field_def.selectable !== false && field_name != 'id') {
+                            self.fields[field_name] = field_def;
+                        }
+                    });
         })).done(function () {
             self.append_proposition();
         });

From 5acd144c81825c9641192743065527d37ae4bbec Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 18 Dec 2013 12:52:27 +0100
Subject: [PATCH 494/547] [FIX] gamification: rename view files

bzr revid: mat@openerp.com-20131218115227-39ii3so3uupc7vp8
---
 .../views/{gamification_view.xml => gamification.xml}             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/hr_gamification/views/{gamification_view.xml => gamification.xml} (100%)

diff --git a/addons/hr_gamification/views/gamification_view.xml b/addons/hr_gamification/views/gamification.xml
similarity index 100%
rename from addons/hr_gamification/views/gamification_view.xml
rename to addons/hr_gamification/views/gamification.xml

From 553e85f369a1383a91e9e10f4237434d1d523a27 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 18 Dec 2013 13:14:59 +0100
Subject: [PATCH 495/547] [FIX] gamification: move manifest order and remove
 useless browse

bzr revid: mat@openerp.com-20131218121459-zlfumwysdx9qm7d9
---
 addons/gamification/models/badge.py   | 12 ++++++------
 addons/hr_gamification/__openerp__.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index ad3767cbbc4..099176dc88f 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -78,12 +78,12 @@ class gamification_badge(osv.Model):
         result = dict.fromkeys(ids, False)
         badge_user_obj = self.pool.get('gamification.badge.user')
         first_month_day = date.today().replace(day=1).strftime(DF)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = {
-                'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid)], context=context, count=True),
-                'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_date', '>=', first_month_day)], context=context, count=True),
-                'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True),
-                'stat_my_monthly_sending': badge_user_obj.search(cr, uid, [('badge_id', '=', obj.id), ('create_uid', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True)
+        for bid in ids:
+            result[id] = {
+                'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid)], context=context, count=True),
+                'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('create_date', '>=', first_month_day)], context=context, count=True),
+                'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True),
+                'stat_my_monthly_sending': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('create_uid', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True)
             }
         return result
 
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index 2d29ccbc60a..c75a4454437 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -33,8 +33,8 @@ Badge received are displayed on the user profile.
     'data': [
         'security/ir.model.access.csv',
         'security/gamification_security.xml',
-        'views/gamification.xml',
         'wizard/grant_badge.xml',
+        'views/gamification.xml',
     ],
     'js': ['static/src/js/gamification.js'],
 }

From 44006349afc1961e1e53e1f57c858aaa56c1bcfa Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 18 Dec 2013 13:31:30 +0100
Subject: [PATCH 496/547] [FIX] base: size of partner address labels, according
 to standard 24 labels per page

bzr revid: dle@openerp.com-20131218123130-vlejjv7r2klkzoj0
---
 .../addons/base/res/report/partner_address.xsl   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/report/partner_address.xsl b/openerp/addons/base/res/report/partner_address.xsl
index ca212f2d2b0..83fb709e356 100644
--- a/openerp/addons/base/res/report/partner_address.xsl
+++ b/openerp/addons/base/res/report/partner_address.xsl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:variable name="initial_bottom_pos">20.5</xsl:variable>
-	<xsl:variable name="initial_left_pos">1</xsl:variable>
-	<xsl:variable name="height_increment">6.5</xsl:variable>
-	<xsl:variable name="width_increment">10</xsl:variable>
-	<xsl:variable name="frame_height">5.5cm</xsl:variable>
-	<xsl:variable name="frame_width">10cm</xsl:variable>
-	<xsl:variable name="number_columns">2</xsl:variable>
-	<xsl:variable name="max_frames">8</xsl:variable>
+	<xsl:variable name="initial_bottom_pos">24.5</xsl:variable>
+	<xsl:variable name="initial_left_pos">0.5</xsl:variable>
+	<xsl:variable name="height_increment">3.5</xsl:variable>
+	<xsl:variable name="width_increment">7</xsl:variable>
+	<xsl:variable name="frame_height">3.7cm</xsl:variable>
+	<xsl:variable name="frame_width">7cm</xsl:variable>
+	<xsl:variable name="number_columns">3</xsl:variable>
+	<xsl:variable name="max_frames">24</xsl:variable>
 
 	<xsl:template match="/">
 		<xsl:apply-templates select="addresses"/>

From 938a07a3610337e4aafebdc334aef33d9bcf152f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 18 Dec 2013 14:00:39 +0100
Subject: [PATCH 497/547] [FIX] gamification: check grant badges are now
 sistematic except for superuser (always possible)

bzr revid: mat@openerp.com-20131218130039-y5vp0wt48ejd3jrh
---
 addons/gamification/models/badge.py          | 76 +++++++++++---------
 addons/gamification/models/challenge.py      | 11 ++-
 addons/gamification/views/badge.xml          |  3 +
 addons/gamification/wizard/grant_badge.py    | 19 +++--
 addons/hr_gamification/wizard/grant_badge.py | 21 +++---
 5 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 099176dc88f..4f11c4192f0 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -43,10 +43,37 @@ class gamification_badge_user(osv.Model):
         'comment': fields.text('Comment'),
         'badge_name': fields.related('badge_id', 'name', type="char", string="Badge Name"),
         'create_date': fields.datetime('Created', readonly=True),
-        'create_uid': fields.many2one('res.users', 'Creator', readonly=True),
+        'create_uid': fields.many2one('res.users', string='Creator', readonly=True),
     }
 
 
+    def _send_badge(self, cr, uid, ids, user_from=False, context=None):
+        """Send a notification to a user for receiving a badge
+
+        Does not verify constrains on badge granting.
+        The users are added to the owner_ids (create badge_user if needed)
+        The stats counters are incremented
+        :param ids: list(int) of badge users that will receive the badge
+        :param user_from: optional id of the res.users object that has sent the badge
+        """
+        res = True
+        temp_obj = self.pool.get('email.template')
+        user_obj = self.pool.get('res.users')
+        template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_badge_received', context)
+        ctx = context.copy()
+        for badge_user in self.browse(cr, uid, ids, context=context):
+
+            ctx.update({'user_from': user_obj.browse(cr, uid, user_from).name})
+            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.badge.user', badge_user.id, context=ctx)
+
+            res = user_obj.message_post(cr, uid, badge_user.user_id.id, body=body_html, context=context)
+        return res
+
+    def create(self, cr, uid, vals, context=None):
+        self.pool.get('gamification.badge').check_granting(cr, uid, badge_id=vals.get('badge_id'), context=context)
+        return super(gamification_badge_user, self).create(cr, uid, vals, context=context)
+
+
 class gamification_badge(osv.Model):
     """Badge object that users can send and receive"""
 
@@ -96,7 +123,7 @@ class gamification_badge(osv.Model):
         """
         result = dict.fromkeys(ids, False)
         for badge in self.browse(cr, uid, ids, context=context):
-            if self._can_grant_badge(cr, uid, uid, badge.id, context) != 1:
+            if self._can_grant_badge(cr, uid, badge.id, context) != 1:
                 # if the user cannot grant this badge at all, result is 0
                 result[badge.id] = 0
             elif not badge.rule_max:
@@ -183,37 +210,13 @@ class gamification_badge(osv.Model):
         'rule_auth': 'everyone',
     }
 
-    def send_badge(self, cr, uid, badge_id, badge_user_ids, user_from=False, context=None):
-        """Send a notification to a user for receiving a badge
+    def check_granting(self, cr, uid, badge_id, context=None):
+        """Check the user 'uid' can grant the badge 'badge_id' and raise the appropriate exception
+        if not
 
-        Does NOT verify constrains on badge granting.
-        The users are added to the owner_ids (create badge_user if needed)
-        The stats counters are incremented
-        :param badge_id: id of the badge to deserve
-        :param badge_user_ids: list(int) of badge users that will receive the badge
-        :param user_from: optional id of the res.users object that has sent the badge
+        Do not check for SUPERUSER_ID
         """
-        badge = self.browse(cr, uid, badge_id, context=context)
-        # template_env = TemplateHelper()
-
-        res = None
-        temp_obj = self.pool.get('email.template')
-        template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_badge_received', context)
-        ctx = context.copy()
-        for badge_user in self.pool.get('gamification.badge.user').browse(cr, uid, badge_user_ids, context=context):
-
-            ctx.update({'user_from': self.pool.get('res.users').browse(cr, uid, user_from).name})
-
-            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.badge.user', badge_user.id, context=ctx)
-
-            # as SUPERUSER as normal user don't have write access on a badge
-            res = self.message_post(cr, SUPERUSER_ID, badge.id, partner_ids=[badge_user.user_id.partner_id.id], body=body_html, type='comment', subtype='mt_comment', context=context)
-        return res
-
-    def check_granting(self, cr, uid, user_from_id, badge_id, context=None):
-        """Check the user 'user_from_id' can grant the badge 'badge_id' and raise the appropriate exception
-        if not"""
-        status_code = self._can_grant_badge(cr, uid, user_from_id, badge_id, context=context)
+        status_code = self._can_grant_badge(cr, uid, badge_id, context=context)
         if status_code == 1:
             return True
         elif status_code == 2:
@@ -228,10 +231,10 @@ class gamification_badge(osv.Model):
             _logger.exception("Unknown badge status code: %d" % int(status_code))
         return False
 
-    def _can_grant_badge(self, cr, uid, user_from_id, badge_id, context=None):
+    def _can_grant_badge(self, cr, uid, badge_id, context=None):
         """Check if a user can grant a badge to another user
 
-        :param user_from_id: the id of the res.users trying to send the badge
+        :param uid: the id of the res.users trying to send the badge
         :param badge_id: the granted badge id
         :return: integer representing the permission.
             1: can grant
@@ -240,16 +243,19 @@ class gamification_badge(osv.Model):
             4: don't have the required badges
             5: user's monthly limit reached
         """
+        if uid == SUPERUSER_ID:
+            return 1
+
         badge = self.browse(cr, uid, badge_id, context=context)
 
         if badge.rule_auth == 'nobody':
             return 2
 
-        elif badge.rule_auth == 'users' and user_from_id not in [user.id for user in badge.rule_auth_user_ids]:
+        elif badge.rule_auth == 'users' and uid not in [user.id for user in badge.rule_auth_user_ids]:
             return 3
 
         elif badge.rule_auth == 'having':
-            all_user_badges = self.pool.get('gamification.badge.user').search(cr, uid, [('user_id', '=', user_from_id)], context=context)
+            all_user_badges = self.pool.get('gamification.badge.user').search(cr, uid, [('user_id', '=', uid)], context=context)
             for required_badge in badge.rule_auth_badge_ids:
                 if required_badge.id not in all_user_badges:
                     return 4
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 4d34fe7b640..0f3e64626cb 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -732,9 +732,14 @@ class gamification_challenge(osv.Model):
         return (sorted_challengers[0]['user'], sorted_challengers[1]['user'], sorted_challengers[2]['user'])
 
     def reward_user(self, cr, uid, user_id, badge_id, context=None):
-        """Create a badge user and send the badge to him"""
-        user_badge_id = self.pool.get('gamification.badge.user').create(cr, uid, {'user_id': user_id, 'badge_id': badge_id}, context=context)
-        return self.pool.get('gamification.badge').send_badge(cr, uid, badge_id, [user_badge_id], user_from=None, context=context)
+        """Create a badge user and send the badge to him
+
+        :param user_id: the user to reward
+        :param badge_id: the concerned badge
+        """
+        badge_user_obj = self.pool.get('gamification.badge.user')
+        user_badge_id = badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge_id}, context=context)
+        return badge_user_obj._send_badge(cr, uid, [user_badge_id], user_from=None, context=context)
 
 
 class gamification_challenge_line(osv.Model):
diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml
index f0ee1a8423d..33c0e21ea7a 100644
--- a/addons/gamification/views/badge.xml
+++ b/addons/gamification/views/badge.xml
@@ -56,6 +56,9 @@
                             <field name="description" nolabel="1" placeholder="Badge Description" />
                         </group>
                         <group string="Granting">
+                            <div class="oe_grey">
+                                Security rules to define who is allowed to manually grant badges. Not enforced for administrator.
+                            </div>
                             <field name="rule_auth" widget="radio" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
diff --git a/addons/gamification/wizard/grant_badge.py b/addons/gamification/wizard/grant_badge.py
index 725512a55bb..e100b2dce29 100644
--- a/addons/gamification/wizard/grant_badge.py
+++ b/addons/gamification/wizard/grant_badge.py
@@ -43,16 +43,13 @@ class grant_badge_wizard(osv.TransientModel):
             if uid == wiz.user_id.id:
                 raise osv.except_osv(_('Warning!'), _('You can not grant a badge to yourself'))
 
-            #check if the badge granting is legitimate
-            if badge_obj.check_granting(cr, uid, user_from_id=uid, badge_id=wiz.badge_id.id, context=context):
-                #create the badge
-                values = {
-                    'user_id': wiz.user_id.id,
-                    'badge_id': wiz.badge_id.id,
-                    'comment': wiz.comment,
-                }
-                badge_user = badge_user_obj.create(cr, uid, values, context=context)
-                #notify the user
-                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
+            #create the badge
+            values = {
+                'user_id': wiz.user_id.id,
+                'badge_id': wiz.badge_id.id,
+                'comment': wiz.comment,
+            }
+            badge_user = badge_user_obj.create(cr, uid, values, context=context)
+            result = badge_obj._send_badge(cr, uid, badge_user, user_from=uid, context=context)
 
         return result
diff --git a/addons/hr_gamification/wizard/grant_badge.py b/addons/hr_gamification/wizard/grant_badge.py
index 95efe444114..539781216e1 100644
--- a/addons/hr_gamification/wizard/grant_badge.py
+++ b/addons/hr_gamification/wizard/grant_badge.py
@@ -48,18 +48,13 @@ class hr_grant_badge_wizard(osv.TransientModel):
             if uid == wiz.user_id.id:
                 raise osv.except_osv(_('Warning!'), _('You can not send a badge to yourself'))
 
-            if badge_obj.check_granting(cr, uid,
-                                         user_from_id=uid,
-                                         badge_id=wiz.badge_id.id,
-                                         context=context):
+            values = {
+                'user_id': wiz.user_id.id,
+                'badge_id': wiz.badge_id.id,
+                'employee_id': wiz.employee_id.id,
+                'comment': wiz.comment,
+            }
 
-                values = {
-                    'user_id': wiz.user_id.id,
-                    'badge_id': wiz.badge_id.id,
-                    'employee_id': wiz.employee_id.id,
-                    'comment': wiz.comment,
-                }
-                badge_user = badge_user_obj.create(cr, uid, values, context=context)
-
-                result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
+            badge_user = badge_user_obj.create(cr, uid, values, context=context)
+            result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
         return result
\ No newline at end of file

From 90dfa5895d61fae037046aea2b64b25d9903df15 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 18 Dec 2013 15:03:33 +0100
Subject: [PATCH 498/547] [FIX] gamification: send badge on user, fix function
 field

bzr revid: mat@openerp.com-20131218140333-nipcc21z5snhac1c
---
 addons/gamification/models/badge.py           | 2 +-
 addons/hr_gamification/models/gamification.py | 3 +--
 addons/hr_gamification/wizard/grant_badge.py  | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 4f11c4192f0..99ad7f93edd 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -106,7 +106,7 @@ class gamification_badge(osv.Model):
         badge_user_obj = self.pool.get('gamification.badge.user')
         first_month_day = date.today().replace(day=1).strftime(DF)
         for bid in ids:
-            result[id] = {
+            result[bid] = {
                 'stat_my': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid)], context=context, count=True),
                 'stat_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('create_date', '>=', first_month_day)], context=context, count=True),
                 'stat_my_this_month': badge_user_obj.search(cr, uid, [('badge_id', '=', bid), ('user_id', '=', uid), ('create_date', '>=', first_month_day)], context=context, count=True),
diff --git a/addons/hr_gamification/models/gamification.py b/addons/hr_gamification/models/gamification.py
index 3c92514f338..27c1834bc39 100644
--- a/addons/hr_gamification/models/gamification.py
+++ b/addons/hr_gamification/models/gamification.py
@@ -120,7 +120,6 @@ class hr_employee(osv.osv):
 
     _columns = {
         'goal_ids': fields.function(_get_employee_goals, type="one2many", obj='gamification.goal', string="Employee HR Goals"),
-        'badge_ids': fields.function(_get_employee_badges, type="one2many",
-            obj='gamification.badge.user', string="Employee Badges"),
+        'badge_ids': fields.function(_get_employee_badges, type="one2many", obj='gamification.badge.user', string="Employee Badges"),
         'has_badges': fields.function(_has_badges, type="boolean", string="Has Badges"),
     }
diff --git a/addons/hr_gamification/wizard/grant_badge.py b/addons/hr_gamification/wizard/grant_badge.py
index 539781216e1..967324b7b87 100644
--- a/addons/hr_gamification/wizard/grant_badge.py
+++ b/addons/hr_gamification/wizard/grant_badge.py
@@ -38,7 +38,6 @@ class hr_grant_badge_wizard(osv.TransientModel):
         if context is None:
             context = {}
 
-        badge_obj = self.pool.get('gamification.badge')
         badge_user_obj = self.pool.get('gamification.badge.user')
 
         for wiz in self.browse(cr, uid, ids, context=context):
@@ -56,5 +55,5 @@ class hr_grant_badge_wizard(osv.TransientModel):
             }
 
             badge_user = badge_user_obj.create(cr, uid, values, context=context)
-            result = badge_obj.send_badge(cr, uid, wiz.badge_id.id, [badge_user], user_from=uid, context=context)
+            result = badge_user_obj._send_badge(cr, uid, [badge_user], user_from=uid, context=context)
         return result
\ No newline at end of file

From 0c5d29097cbc448f044875051ae8b3d25d7f8076 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Dec 2013 05:39:03 +0000
Subject: [PATCH 499/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131219053903-g82qo7aa2trdg2yd
---
 openerp/addons/base/i18n/ab.po       |   4 +-
 openerp/addons/base/i18n/af.po       |   4 +-
 openerp/addons/base/i18n/am.po       |   4 +-
 openerp/addons/base/i18n/ar.po       |   4 +-
 openerp/addons/base/i18n/bg.po       |   4 +-
 openerp/addons/base/i18n/bs.po       |   4 +-
 openerp/addons/base/i18n/ca.po       |   4 +-
 openerp/addons/base/i18n/cs.po       |   4 +-
 openerp/addons/base/i18n/da.po       |   4 +-
 openerp/addons/base/i18n/de.po       |   4 +-
 openerp/addons/base/i18n/el.po       |   4 +-
 openerp/addons/base/i18n/en_GB.po    |   4 +-
 openerp/addons/base/i18n/es.po       |   4 +-
 openerp/addons/base/i18n/es_AR.po    |   4 +-
 openerp/addons/base/i18n/es_BO.po    |   4 +-
 openerp/addons/base/i18n/es_CL.po    |   4 +-
 openerp/addons/base/i18n/es_CR.po    |   4 +-
 openerp/addons/base/i18n/es_DO.po    |   4 +-
 openerp/addons/base/i18n/es_EC.po    |   4 +-
 openerp/addons/base/i18n/es_MX.po    |   7 +-
 openerp/addons/base/i18n/es_PE.po    |   4 +-
 openerp/addons/base/i18n/es_VE.po    |   4 +-
 openerp/addons/base/i18n/et.po       |   4 +-
 openerp/addons/base/i18n/eu.po       |   4 +-
 openerp/addons/base/i18n/fa.po       |   4 +-
 openerp/addons/base/i18n/fa_AF.po    |   4 +-
 openerp/addons/base/i18n/fi.po       | 103 +++++++++-------
 openerp/addons/base/i18n/fr.po       |   4 +-
 openerp/addons/base/i18n/fr_CA.po    |   4 +-
 openerp/addons/base/i18n/gl.po       |   4 +-
 openerp/addons/base/i18n/gu.po       |   4 +-
 openerp/addons/base/i18n/he.po       |   4 +-
 openerp/addons/base/i18n/hi.po       |   4 +-
 openerp/addons/base/i18n/hr.po       |   4 +-
 openerp/addons/base/i18n/hu.po       |   4 +-
 openerp/addons/base/i18n/hy.po       |   4 +-
 openerp/addons/base/i18n/id.po       |   4 +-
 openerp/addons/base/i18n/is.po       |   4 +-
 openerp/addons/base/i18n/it.po       |   4 +-
 openerp/addons/base/i18n/ja.po       |   4 +-
 openerp/addons/base/i18n/ka.po       |   4 +-
 openerp/addons/base/i18n/kk.po       |   4 +-
 openerp/addons/base/i18n/ko.po       |   4 +-
 openerp/addons/base/i18n/lt.po       |   4 +-
 openerp/addons/base/i18n/lv.po       | 174 +++++++++++++++++++--------
 openerp/addons/base/i18n/mk.po       |   4 +-
 openerp/addons/base/i18n/mn.po       |   4 +-
 openerp/addons/base/i18n/nb.po       |   4 +-
 openerp/addons/base/i18n/nl.po       |   6 +-
 openerp/addons/base/i18n/nl_BE.po    |   4 +-
 openerp/addons/base/i18n/pl.po       |   4 +-
 openerp/addons/base/i18n/pt.po       |   4 +-
 openerp/addons/base/i18n/pt_BR.po    |   4 +-
 openerp/addons/base/i18n/ro.po       |  34 +++---
 openerp/addons/base/i18n/ru.po       |   4 +-
 openerp/addons/base/i18n/sk.po       |   4 +-
 openerp/addons/base/i18n/sl.po       |   4 +-
 openerp/addons/base/i18n/sq.po       |   4 +-
 openerp/addons/base/i18n/sr.po       |   4 +-
 openerp/addons/base/i18n/sr@latin.po |   4 +-
 openerp/addons/base/i18n/sv.po       |   4 +-
 openerp/addons/base/i18n/th.po       |   4 +-
 openerp/addons/base/i18n/tlh.po      |   4 +-
 openerp/addons/base/i18n/tr.po       |   4 +-
 openerp/addons/base/i18n/uk.po       |   4 +-
 openerp/addons/base/i18n/ur.po       |   4 +-
 openerp/addons/base/i18n/vi.po       |   4 +-
 openerp/addons/base/i18n/zh_CN.po    |   4 +-
 openerp/addons/base/i18n/zh_HK.po    |   4 +-
 openerp/addons/base/i18n/zh_TW.po    |   4 +-
 70 files changed, 337 insertions(+), 247 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 4a5c7cffe51..2ac05e2a5a3 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -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-12-03 05:29+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:27+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index aa30caf0889..f31d968da30 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -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-12-03 05:29+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index c48b8720533..6eb7b1c2b5f 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -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-12-03 05:29+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 2cc0271838a..a77b0d1d904 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,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-12-03 05:29+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index b4c3fb66957..f4a3765a388 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,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-12-03 05:30+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:29+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index c9ff72f2df3..00f24503952 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,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-12-03 05:30+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 7ae72c759e9..cabe379ca58 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,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-12-03 05:30+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:29+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 01ef16527a2..024d6077cd1 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,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-12-03 05:30+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:29+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 4a906e2ecaa..2dc3e1f0b0a 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -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-12-03 05:31+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:29+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 6e1569d4199..d13507ad5e1 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -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-12-03 05:32+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 850f3851788..23373411b40 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,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-12-03 05:32+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 80f270dd346..9683fb9b3a3 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -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-12-03 05:38+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:37+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 5be6de287a8..5e8eaea63d5 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,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-12-03 05:36+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 62b8bdf2c09..9fb51e967f1 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -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-12-03 05:38+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index 4b553837293..a8a99901065 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -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-12-03 05:39+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:37+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 95da6400d36..6458dd5beff 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,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-12-03 05:39+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:37+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 03e0f4e3894..9040d72ef20 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -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-12-03 05:40+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index 392515887c0..84b4cb3ac58 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -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-12-03 05:39+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:37+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index da7a06982c5..460b18934b0 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,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-12-03 05:40+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index 98cd32c214c..0a25960c40f 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -9,14 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2013-07-25 03:08+0000\n"
-"Last-Translator: Federico Manuel Echeverri Choux -  (  Vauxoo  ) "
-"<echeverrifm@gmail.com>\n"
+"Last-Translator: Federico Manuel Echeverri Choux <echeverrifm@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-03 05:40+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index 182421e3f0f..49017757437 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -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-12-11 05:31+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index 4dc59a2343a..61bda28722a 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -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-12-03 05:38+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 746f0f76f99..bb20b82d323 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,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-12-03 05:31+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:29+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 10519023b75..3b278329ff8 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -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-12-03 05:30+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 891043414b5..9953d0ad7f7 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,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-12-03 05:35+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 99407d21416..55d3537aff8 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -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-12-03 05:40+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 48468e6bc5d..99df871eefa 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,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-12-03 05:31+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -209,13 +209,12 @@ msgid ""
 "reports."
 msgstr ""
 "\n"
-"Luo laskut perustuen kuluihin, aikaan ja tuntikirjauksiin.\n"
+"Luo laskut perustuen kuluihin ja tuntikortteihin.\n"
 "========================================================\n"
 "\n"
-"Moduuli laskujen luomiseen henkilökulujen pohjalta (tuntilomakkeen "
-"merkinnät, kulut,...)\n"
+"Moduuli laskujen luomiseen kulujen pohjalta (henkilöstöhallinto, kulut,...)\n"
 "\n"
-"Voit määritellä hinnastoja kustannuspaikoille ja luoda näillä "
+"Voit määritellä hinnastoja analyyttisessä kirjanpidossa ja luoda näillä "
 "ennusteraportteja tuloista."
 
 #. module: base
@@ -644,7 +643,7 @@ msgstr "Espanjalainen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr "Laskuta tuntilistojen mukaan"
+msgstr "Laskuta tuntikorttien mukaan"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -3452,7 +3451,7 @@ msgid ""
 "Mr., Mrs. "
 msgstr ""
 "Hallitse yhteyshenkilöiden titteleitä (käytetään kirjeissä yms. jos haluat) "
-"esim. Mr. Mrs. "
+"esim. Herra, Rouva "
 
 #. module: base
 #: view:ir.model.access:0
@@ -3525,7 +3524,7 @@ msgstr "Syntymäpäivä"
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 #: model:ir.ui.menu,name:base.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr "Yhteyshenkilöiden arvonimet"
+msgstr "Yhteyshenkilöiden tittelit"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_manufacturer
@@ -3837,7 +3836,7 @@ msgstr "Raportointi"
 #: field:res.partner,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
-msgstr "Otsikko"
+msgstr "Yhtiömuoto"
 
 #. module: base
 #: help:ir.property,res_id:0
@@ -4022,7 +4021,7 @@ msgstr "12. %w = 5"
 #. module: base
 #: constraint:res.partner.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr "Virhe! Et voi luoda rekursiivisia kategorioita."
+msgstr "Virhe! Et voi luoda rekursiivisia ryhmiä."
 
 #. module: base
 #: view:res.lang:0
@@ -4231,7 +4230,7 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue_sheet
 msgid "Timesheet on Issues"
-msgstr "Tuntilomake asioille"
+msgstr "Tuntikortti asioille"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -6548,7 +6547,7 @@ msgid ""
 "request, timesheets, ...), if he is linked to an employee in the system."
 msgstr ""
 "käyttäjä voi hallita hänen omia henkilöstöhallintotietojaan "
-"(poissaolopyyntöjä, tuntilmoakkeitaan,...), mikäli hänet on kytketty "
+"(poissaolopyyntöjä, tuntikorttejaan,...), mikäli hänet on kytketty "
 "järjestelmään työntekijänä."
 
 #. module: base
@@ -6836,7 +6835,7 @@ msgstr "OHADA - Kirjanpito"
 #. module: base
 #: help:res.bank,bic:0
 msgid "Sometimes called BIC or Swift."
-msgstr "Kutsutaan myös BIC tai SWIFT koodiksi."
+msgstr "Kutsutaan myös BIC tai SWIFT -koodiksi."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
@@ -6846,7 +6845,7 @@ msgstr "Intia - Kirjanpito"
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
-msgstr "Aika formaatti"
+msgstr "Ajan esitysmuoto"
 
 #. module: base
 #: field:res.company,rml_header3:0
@@ -6958,7 +6957,7 @@ msgstr "Panama kotoistettu tilikartta"
 #. module: base
 #: help:res.partner.category,active:0
 msgid "The active field allows you to hide the category without removing it."
-msgstr "Aktiivinen kenttä sallii kategorian piilottamisen poistamatta sitä."
+msgstr "Aktiivinen kenttä sallii ryhmän piilottamisen poistamatta sitä."
 
 #. module: base
 #: report:ir.module.reference:0
@@ -7154,7 +7153,7 @@ msgstr "Siirtymät"
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
 msgid "Timesheets"
-msgstr "Tuntilistat"
+msgstr "Tuntikortit"
 
 #. module: base
 #: help:ir.values,company_id:0
@@ -7248,6 +7247,20 @@ msgid ""
 "up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Tämä moduuli asentaa tuntikorttijärjestelmän.\n"
+"==========================================\n"
+"\n"
+"Jokainen työntekjiä voi kirjata ajankäyttönsä ja seurata tätä "
+"projekteittain.\n"
+"Projekti on analyyttinen till ja projekti synnyttää kustannuksia "
+"analyyttiselle tilille.\n"
+"\n"
+"Sisältää seurantaan paljon erilaisia aika- ja työntekijäraportteja.\n"
+"\n"
+"Moduuli on täysin integroitu ksutannuslaskentamoduulin kanssa. Sallii \n"
+"hallinnan määrittämisen asiaryhmittäin.\n"
+"    "
 
 #. module: base
 #: field:res.bank,state:0
@@ -7464,7 +7477,7 @@ msgstr "Ecuador - Kirjanpito"
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
-msgstr "Kategorian nimi"
+msgstr "Ryhmän nimi"
 
 #. module: base
 #: model:res.country,name:base.mp
@@ -7596,7 +7609,7 @@ msgstr "Namibia"
 #. module: base
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr "Alakategoriat"
+msgstr "Aliryhmät"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:606
@@ -7649,7 +7662,7 @@ msgstr "MDX"
 #. module: base
 #: view:ir.cron:0
 msgid "Scheduled Action"
-msgstr "Jaksottimen toiminto"
+msgstr "Ajoitettu toimenpide"
 
 #. module: base
 #: model:res.country,name:base.bi
@@ -8347,7 +8360,7 @@ msgstr "Täydet käyttöoikeudet"
 #. module: base
 #: field:res.partner.category,parent_id:0
 msgid "Parent Category"
-msgstr "Yläkategoria"
+msgstr "Ylempi ryhmä"
 
 #. module: base
 #: model:res.country,name:base.fi
@@ -8458,9 +8471,9 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
-"Tämä on liitteen nimi johon tulostus tallennetaan. Jätä tyhjäksi jos "
-"tulostettuja raportteija ei haluta tallentaa. Voit käyttää python-lauseketta "
-"jossa on objekti- tai aikamuuttuja."
+"Tämä on liitteen tiedostonimi, johon tuloste tallennetaan. Jätä tyhjäksi jos "
+"tulostettuja raportteja ei haluta tallentaa. Voit käyttää python-lauseketta, "
+"jossa on objekti- tai aikamuuttujia."
 
 #. module: base
 #: sql_constraint:ir.model.data:0
@@ -8540,7 +8553,7 @@ msgstr "Filippiinit"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_timesheet_sheet
 msgid "Timesheets, Attendances, Activities"
-msgstr "Tuntilomakkeet, Poissaolot, Tehtävät"
+msgstr "Tuntikortit, läsnäolot, toiminnot"
 
 #. module: base
 #: model:res.country,name:base.ma
@@ -9112,7 +9125,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.title,shortcut:0
 msgid "Abbreviation"
-msgstr ""
+msgstr "Lyhenne"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
@@ -9342,7 +9355,7 @@ msgstr "8. %I:%M:%S %p = 06:25:20 PM"
 #. module: base
 #: view:ir.filters:0
 msgid "Filters shared with all users"
-msgstr "Suodattimet jaettu kaikkien käyttäjien kanssa"
+msgstr "Suodattimet jotka on jaettu kaikkien käyttäjien kanssa"
 
 #. module: base
 #: view:ir.translation:0
@@ -9414,7 +9427,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.category:0
 msgid "Module Category"
-msgstr "Moduulin kategoria"
+msgstr "Moduuliryhmä"
 
 #. module: base
 #: model:res.country,name:base.us
@@ -9657,7 +9670,7 @@ msgstr "Mallia %s ei ole olemassa!"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_jit
 msgid "Just In Time Scheduling"
-msgstr "Just in time ajoitus (JIT)"
+msgstr "JOT-ajoitus (JIT)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -9920,6 +9933,15 @@ msgid ""
 "handle an issue.\n"
 "                "
 msgstr ""
+"\n"
+"Tämä moduuli lisää tuen tuntikortteille projektin asioiden ja  virheiden "
+"hallintaan.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Työkohtaisia lokeja voi ylläpitää käytetyn työajan näyttämiseen "
+"käyttäjittäin.\n"
+"                "
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -10681,8 +10703,8 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
-"Hallitse partneriyritysten yritystyyppejä joita on käytössäsi. Näitä ovat "
-"esim  OY, KY, A/S, GmBH ..."
+"Hallitse kumppaniyritysten yritystyyppejä joita on käytössäsi. Näitä ovat "
+"esim. Oyj, Oy, Ky, Tmi, Ay, Ry, A/S, GmBH ..."
 
 #. module: base
 #: view:res.bank:0
@@ -11876,7 +11898,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "Legends for Date and Time Formats"
-msgstr "Selitykset päivämäärän ja kellonajan muotoilusta"
+msgstr "Merkinnät päivämäärän ja kellonajan muotoiluun"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -12078,8 +12100,7 @@ msgstr "Käyttäjän viite"
 #: code:addons/base/ir/ir_fields.py:226
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
-msgstr ""
-"\"%s\" ei näyttäisi olevan sallittu päivä/aika kentälle \"%%(field)s\""
+msgstr "\"%s\" ei ole sallittu päivä/aika kentälle \"%%(field)s\""
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
@@ -12333,7 +12354,7 @@ msgstr "Tuo käännös"
 #: view:ir.module.module:0
 #: field:ir.module.module,category_id:0
 msgid "Category"
-msgstr "Kategoria"
+msgstr "Ryhmä"
 
 #. module: base
 #: view:ir.attachment:0
@@ -12812,7 +12833,7 @@ msgstr "Poistettavissa"
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr "Kumppanin katerogia"
+msgstr "Kumppaniryhmä"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -12917,7 +12938,7 @@ msgstr "Suodata dokumenttejani"
 #. module: base
 #: model:ir.module.module,summary:base.module_project_gtd
 msgid "Personal Tasks, Contexts, Timeboxes"
-msgstr "Henkilökohtaiset tehtävät, Asiakokonaisuudet, Aikalaatikot"
+msgstr "Henkilökohtaiset tehtävät, asiakokonaisuudet, aikarajat"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cr
@@ -13681,8 +13702,8 @@ msgstr ""
 "---------------\n"
 "* Työntekijät ja hierarkiat: Voit määritellä työntekijät käyttäjinä ja "
 "näyttää hierarkiat\n"
-"* Henkilöstöosastot\n"
-"* Henkilöstötyöt\n"
+"* Henkilöstöhallinnon osastot\n"
+"* Henkilöstöhallinnon tehtävät\n"
 "    "
 
 #. module: base
@@ -14147,7 +14168,7 @@ msgstr "Useamman dokumentin toiminto"
 #: model:ir.actions.act_window,name:base.action_partner_title_partner
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 msgid "Titles"
-msgstr "Titteli"
+msgstr "Tittelit"
 
 #. module: base
 #: model:ir.module.module,description:base.module_anonymization
@@ -15461,7 +15482,7 @@ msgstr "Matkapuhelinnumero"
 #: model:ir.model,name:base.model_res_partner_category
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr "Kumppanien kategoriat"
+msgstr "Kumppanien ryhmät"
 
 #. module: base
 #: view:base.module.upgrade:0
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index fc4eaa61d59..cc145e34b45 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,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-12-03 05:31+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index 6295a6845df..04f779e79b3 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -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-12-03 05:39+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:37+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 0c7714c15e2..b7fae84e9b9 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -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-12-03 05:32+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 87529ba8926..bc1bf6d1158 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -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-12-03 05:32+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 7f0429847ab..397db94eda2 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -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-12-03 05:32+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index 0620b3fd8da..53b006a5bed 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -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-12-03 05:33+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index f66b99bd54e..1b12fbf4f00 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,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-12-03 05:36+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 9755f7cbe31..5fa30ef6682 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -13,8 +13,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-12-03 05:33+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index ca7b1162e70..8d8e2507dcf 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -9,8 +9,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-12-03 05:29+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 8178f6f4a11..59fbf98c2dd 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -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-12-03 05:33+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 6747ee44667..1a322b8237e 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -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-12-03 05:33+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 25bda01f2da..0566446d73f 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -13,8 +13,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-12-03 05:33+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index aabf4300913..239d993353e 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -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-12-03 05:33+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index f2b25b56518..546a41ca6d2 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -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-12-03 05:32+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 6e4ba5af6a2..344a8a046cb 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -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-12-03 05:34+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 15517e3b7d8..33625fec62a 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -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-12-03 05:34+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 13f78cccfab..4fe9d4083fe 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,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-12-03 05:34+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 2821b0c5cc6..eaa96860963 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -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-12-03 05:34+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -175,7 +175,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
 msgid "Sales Analytic Distribution"
-msgstr ""
+msgstr "Pāŗdošanas Analītika"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_invoice
@@ -265,7 +265,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "MultiValūtas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -391,7 +391,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.category,child_ids:0
 msgid "Child Applications"
-msgstr ""
+msgstr "Apakšaplikācijas"
 
 #. module: base
 #: field:res.partner,credit_limit:0
@@ -457,6 +457,7 @@ msgid ""
 "One of the records you are trying to modify has already been deleted "
 "(Document type: %s)."
 msgstr ""
+"Kāds no ierakstiem, ko mēģināt labot ir jau dzēsts (Dokumenta Tips: %s)."
 
 #. module: base
 #: help:ir.actions.act_window,views:0
@@ -515,7 +516,7 @@ msgstr ""
 #. module: base
 #: view:workflow.transition:0
 msgid "Workflow Transition"
-msgstr ""
+msgstr "Darbplūsmas Pāreja"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -608,7 +609,7 @@ msgstr "Spāņu (VE) / Español (VE)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr ""
+msgstr "Rēķinu piestādīšana pēc darba tabelēm"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -634,7 +635,7 @@ msgstr "Kolumbija"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
 msgid "Mister"
-msgstr ""
+msgstr "Kungs"
 
 #. module: base
 #: help:res.country,code:0
@@ -663,7 +664,7 @@ msgstr "Neiztulkots"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Izejošā Pasta Serveris"
 
 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -751,6 +752,9 @@ msgid ""
 "Contains the installer for marketing-related modules.\n"
 "    "
 msgstr ""
+"\n"
+"Izvēlne Mārketingam.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -845,7 +849,7 @@ msgstr "Drošība un Autentifikācija"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "Web Calendar"
-msgstr ""
+msgstr "Web Kalendārs"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1027,7 +1031,7 @@ msgstr "Niue"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_membership
 msgid "Membership Management"
-msgstr ""
+msgstr "Biedru Pārvaldība"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -1037,7 +1041,7 @@ msgstr "Cita OSI apstiprināta licence"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "WWW Gant Diagramma"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1064,7 +1068,7 @@ msgstr "Google Lietotāji"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Autoparka Vadība"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1146,7 +1150,7 @@ msgstr ""
 #. module: base
 #: view:res.users:0
 msgid "Change the user password."
-msgstr ""
+msgstr "Mainīt lietotāja paroli."
 
 #. module: base
 #: view:res.lang:0
@@ -1241,7 +1245,7 @@ msgstr "Valsts nosaukumam jābūt unikālam!"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "Jaunākā versija"
 
 #. module: base
 #: view:ir.rule:0
@@ -1289,7 +1293,7 @@ msgstr ""
 #: code:addons/orm.py:4920
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "Ieraksts #%d %s nav atrasts, nevar kopēt!"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -1309,7 +1313,7 @@ msgstr "Char"
 #. module: base
 #: field:ir.module.category,visible:0
 msgid "Visible"
-msgstr ""
+msgstr "Redzams"
 
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
@@ -1359,7 +1363,7 @@ msgstr "Spāņu (GT) / Español (GT)"
 #. module: base
 #: field:ir.mail_server,smtp_port:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "SMTP Ports"
 
 #. module: base
 #: help:res.users,login:0
@@ -1391,7 +1395,7 @@ msgstr ""
 #: code:addons/base/module/wizard/base_language_install.py:53
 #, python-format
 msgid "Language Pack"
-msgstr ""
+msgstr "Valodu Paka"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
@@ -1401,7 +1405,7 @@ msgstr "Pārbaudes"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save as Attachment Prefix"
-msgstr ""
+msgstr "Saglabāt kā pielikuma Prefiksu."
 
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
@@ -1459,7 +1463,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.category,parent_id:0
 msgid "Parent Application"
-msgstr ""
+msgstr "Galvenā Aplikācija"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_wizard
@@ -1477,12 +1481,12 @@ msgstr "Darbība atcelta"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document
 msgid "Document Management System"
-msgstr ""
+msgstr "Dokumentu Pārvaldes Sistēma"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr ""
+msgstr "Klientu pieteikumu Vadība"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_webdav
@@ -1990,6 +1994,8 @@ msgstr "Kreisais vecāks"
 #: model:ir.module.module,shortdesc:base.module_project_mrp
 msgid "Create Tasks on SO"
 msgstr ""
+"Veidot uzdevumus projektu vadības modulī, kas bāzēti uz tirdzniecības "
+"pasūtījumiem"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:320
@@ -2000,7 +2006,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
-msgstr ""
+msgstr "Attēlot Atskaitēs"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_timesheet
@@ -2087,7 +2093,7 @@ msgstr "%s (kopēt)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_chart
 msgid "Template of Charts of Accounts"
-msgstr ""
+msgstr "Kontu plānu veidne"
 
 #. module: base
 #: field:res.partner,type:0
@@ -2219,7 +2225,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_subscription
 msgid "Recurring Documents"
-msgstr ""
+msgstr "Dokumenti, kas periodiski atkārtojas"
 
 #. module: base
 #: model:res.country,name:base.bs
@@ -2422,7 +2428,7 @@ msgstr ""
 #: code:addons/orm.py:3843
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
-msgstr ""
+msgstr "Dokuments ir modificēts, kopš pēdējās apskates  (%s:%d)"
 
 #. module: base
 #: view:workflow:0
@@ -2635,12 +2641,12 @@ msgstr "Angilja"
 #. module: base
 #: model:ir.actions.report.xml,name:base.report_ir_model_overview
 msgid "Model Overview"
-msgstr ""
+msgstr "Modelis"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_margin
 msgid "Margins by Products"
-msgstr ""
+msgstr "Peļņa pēc Produktiem"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_invoiced
@@ -2733,7 +2739,7 @@ msgstr ""
 #: field:ir.translation,res_id:0
 #: field:ir.values,res_id:0
 msgid "Record ID"
-msgstr ""
+msgstr "Ieraksta ID"
 
 #. module: base
 #: view:ir.filters:0
@@ -2917,7 +2923,7 @@ msgstr ""
 #. module: base
 #: view:res.groups:0
 msgid "Inherited"
-msgstr ""
+msgstr "Mantotais"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:146
@@ -3187,7 +3193,7 @@ msgstr "Kuba"
 #: code:addons/report_sxw.py:443
 #, python-format
 msgid "Unknown report type: %s"
-msgstr ""
+msgstr "Nezināms atskaites tips: %s"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense
@@ -3384,7 +3390,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_survey_user
 msgid "Survey / User"
-msgstr ""
+msgstr "Aptauja / Lietotājs"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3440,7 +3446,7 @@ msgstr "Kontaktpersonu Uzrunas"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_manufacturer
 msgid "Products Manufacturers"
-msgstr ""
+msgstr "Produktu Ražotāji"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:240
@@ -3686,7 +3692,7 @@ msgstr "Majota"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_todo
 msgid "Tasks on CRM"
-msgstr ""
+msgstr "Uzdevumi bāzēti uz CRM"
 
 #. module: base
 #: help:ir.model.fields,relation_field:0
@@ -3808,7 +3814,7 @@ msgstr ""
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "Standard"
-msgstr ""
+msgstr "Standarta"
 
 #. module: base
 #: model:res.country,name:base.ru
@@ -4163,7 +4169,7 @@ msgstr "Portugāle"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_share
 msgid "Share any Document"
-msgstr ""
+msgstr "Koplietot jebkuru dokumentu"
 
 #. module: base
 #: field:workflow.transition,group_id:0
@@ -4234,7 +4240,7 @@ msgstr "Xor"
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
 msgid "Account Charts"
-msgstr ""
+msgstr "Kontu Plāni"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_main
@@ -4336,7 +4342,7 @@ msgstr "Kopsavilkums"
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_dependency
 msgid "Dependency"
-msgstr ""
+msgstr "Atkarīgie moduļi"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal
@@ -4425,7 +4431,7 @@ msgstr "Darbību izraisošais Objekts"
 #. module: base
 #: sql_constraint:ir.sequence.type:0
 msgid "`code` must be unique."
-msgstr ""
+msgstr "'kods' laukam jābūt unikālam."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_knowledge
@@ -4477,7 +4483,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Izrakstīt rēķinus par patērēto laiku"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_marketing
@@ -4766,7 +4772,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,description:base.module_category_marketing
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Palīdz pārvaldīt mārketinga kampaņas soli pa solim."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4812,7 +4818,7 @@ msgstr "Noteikumi"
 #. module: base
 #: field:ir.mail_server,smtp_host:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP serveris"
 
 #. module: base
 #: code:addons/base/module/module.py:320
@@ -4824,7 +4830,7 @@ msgstr ""
 #. module: base
 #: view:base.module.upgrade:0
 msgid "The selected modules have been updated / installed !"
-msgstr ""
+msgstr "Izvēlētie moduļi ir atjaunināti / uzinstalēti!"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4978,7 +4984,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
 msgid "Partners Geo-Localization"
-msgstr ""
+msgstr "Partneru Ģeo-lokācija"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -4989,7 +4995,7 @@ msgstr "Kenija"
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translated Terms"
-msgstr ""
+msgstr "Tulkotie Termini"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5056,7 +5062,7 @@ msgstr "Benina"
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
 #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
 msgid "Bank Account Types"
-msgstr ""
+msgstr "Bankas Kontu Tipi"
 
 #. module: base
 #: help:ir.sequence,suffix:0
@@ -5192,7 +5198,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Darbā pieņemšanas Process"
 
 #. module: base
 #: model:res.country,name:base.br
@@ -5775,7 +5781,7 @@ msgstr "Angļu (CA)"
 #. module: base
 #: model:ir.module.category,name:base.module_category_human_resources
 msgid "Human Resources"
-msgstr ""
+msgstr "Personāla Vadība"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_syscohada
@@ -8543,7 +8549,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_warning
 msgid "Warning Messages and Alerts"
-msgstr ""
+msgstr "Brīdinājumi"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_ui_view_custom
@@ -10190,7 +10196,7 @@ msgstr ""
 #: view:base.module.upgrade:0
 msgid ""
 "We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
-msgstr ""
+msgstr "Lai redzētu jaunās izvēlnes, pārlādējiet logus (Ctrl+T tad Ctrl+R)."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_rule
@@ -14720,7 +14726,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_vat
 msgid "VAT Number Validation"
-msgstr ""
+msgstr "PVN numura pārbaude"
 
 #. module: base
 #: field:ir.model.fields,complete_name:0
@@ -16449,3 +16455,67 @@ msgstr ""
 
 #~ msgid "Website of Partner."
 #~ msgstr "Partnera Vietne"
+
+#~ msgid "Set password"
+#~ msgstr "Uzstādīt paroli"
+
+#~ msgid "Tools / Customization"
+#~ msgstr "Rīki / Pielāgošana"
+
+#~ msgid "Calendar Layer"
+#~ msgstr "Kalendāra Skatījums"
+
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "Kļūda! Nevar izveidot rekursīvus saistītos locekļus."
+
+#~ msgid "Multi-Currency in Analytic"
+#~ msgstr "Multi-Valūtas Analītiskajos Kontos"
+
+#~ msgid "Report Header / Company Slogan"
+#~ msgstr "Ziņojuma virsraksts / Firmas sauklis"
+
+#~ msgid "Openerp web web"
+#~ msgstr "OpenERP WWW"
+
+#~ msgid "Expenses Management"
+#~ msgstr "Izdevumi"
+
+#~ msgid "Master Procurement Schedule"
+#~ msgstr "Automātisko Pasūtījumu Grafiks"
+
+#~ msgid "HR Officer"
+#~ msgstr "Personāldaļas darbinieks"
+
+#~ msgid "Openerp web Diagram view"
+#~ msgstr "OpenERP WWW Diagrammas skatījums"
+
+#~ msgid "Receive User Feedback"
+#~ msgstr "Saņemt Lietotāju Atsauksmes"
+
+#~ msgid "web Dashboard"
+#~ msgstr "WWW Instrumentu Panelis"
+
+#~ msgid "Point Of Sale"
+#~ msgstr "Kases Iekārtas"
+
+#, python-format
+#~ msgid ""
+#~ "Operation prohibited by access rules, or performed on an already deleted "
+#~ "document (Operation: read, Document type: %s)."
+#~ msgstr ""
+#~ "Operāciija ir aizliegta, vai arī tiek veikta dokumentam, kas jau ir dzēsts "
+#~ "(Operācija lasīt: Dokumenta tips %s)."
+
+#~ msgid "web Gantt"
+#~ msgstr "Gant Skatījums"
+
+#~ msgid "Web Chat"
+#~ msgstr "WWW Tērzētava"
+
+#, python-format
+#~ msgid ""
+#~ "You can not create this document (%s) ! Be sure your user belongs to one of "
+#~ "these groups: %s."
+#~ msgstr ""
+#~ "Nevar izveidot dokumentu  (%s) !  Pārbaudiet, vai lietotājs pieder kādai no "
+#~ "šīm grupām: %s."
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 5a00f189c50..78971f69e07 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -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-12-03 05:34+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index e5881f12e7d..a71cc7fa020 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,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-12-03 05:34+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 6d6634f2816..23497ee0524 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -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-12-03 05:35+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index f8c9847ff7c..88b361dab81 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,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-12-03 05:31+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:29+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -10869,7 +10869,7 @@ msgstr "Bankrekeningen gerelateerd aan dit bedrijf"
 #: model:ir.ui.menu,name:base.menu_sales
 #: model:ir.ui.menu,name:base.next_id_64
 msgid "Sales"
-msgstr "Verkoop"
+msgstr "Verkopen"
 
 #. module: base
 #: field:ir.actions.server,child_ids:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 3b569c62d90..3f3f4b70fa4 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -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-12-03 05:39+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:37+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 1f92bb9c7ad..f296005d0b6 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,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-12-03 05:35+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 798ac68932b..d97fd9069cd 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,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-12-03 05:35+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index b38b1150afe..c11e9f109f1 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -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-12-03 05:38+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index ddf6c83cb06..15aa26f8138 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,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-12-03 05:35+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -379,7 +379,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr "Numele limbii trebuie sa fie unic !"
+msgstr "Numele limbii trebuie să fie unic !"
 
 #. module: base
 #: selection:res.request,state:0
@@ -5266,7 +5266,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_res_lang_act_window
 #: view:res.lang:0
 msgid "Languages"
-msgstr "Limbi"
+msgstr "Limba"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -6398,7 +6398,7 @@ msgstr "Plan de conturi SNC pentru Portugalia"
 #: view:ir.actions.report.xml:0
 #: model:ir.ui.menu,name:base.menu_security
 msgid "Security"
-msgstr "Siguranță"
+msgstr "Securitate"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8933,7 +8933,7 @@ msgstr "Cod judet"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_multilang
 msgid "Multi Language Chart of Accounts"
-msgstr "Plan de Conturi multi limbi"
+msgstr "Plan de Conturi multi limbă"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_gt
@@ -9052,7 +9052,7 @@ msgstr "Contabilitate si Finante"
 #. module: base
 #: view:ir.module.module:0
 msgid "Upgrade"
-msgstr "Actualizare"
+msgstr "Actualizați"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_action_rule
@@ -9808,7 +9808,7 @@ msgstr "init"
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesperson"
-msgstr "Agest de vanzari"
+msgstr "Agent de vânzări"
 
 #. module: base
 #: view:res.lang:0
@@ -10726,7 +10726,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_view_base_module_update
 msgid "Update Modules List"
-msgstr "Actualizati Lista de Module"
+msgstr "Actualizați lista de module"
 
 #. module: base
 #: code:addons/base/module/module.py:359
@@ -11595,7 +11595,7 @@ msgstr "Tip de vizualizare"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_2
 msgid "User Interface"
-msgstr "Interfata Utilizator"
+msgstr "Interfață utilizator"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_byproduct
@@ -12526,7 +12526,7 @@ msgstr "Aceasta metoda nu mai exista"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Synchronize Terms"
-msgstr "Sincronizati Termenii"
+msgstr "Sincronizați termenii"
 
 #. module: base
 #: field:res.lang,thousands_sep:0
@@ -12827,7 +12827,7 @@ msgstr "Conturile bancare asociate acestei companii"
 #: model:ir.ui.menu,name:base.menu_sales
 #: model:ir.ui.menu,name:base.next_id_64
 msgid "Sales"
-msgstr "Vanzari"
+msgstr "Vânzări"
 
 #. module: base
 #: field:ir.actions.server,child_ids:0
@@ -15542,7 +15542,7 @@ msgstr "ir.valori"
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
 msgid "Update Module"
-msgstr "Actualizati Modulul"
+msgstr "Actualizați modulul"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -16117,7 +16117,7 @@ msgstr "Administrare"
 #. module: base
 #: view:base.module.update:0
 msgid "Click on Update below to start the process..."
-msgstr "Faceti click pe Actualizare pentru a porni procesul..."
+msgstr "Faceți clic pe Actualizați pentru a porni procesul..."
 
 #. module: base
 #: model:res.country,name:base.ir
@@ -16156,7 +16156,7 @@ msgstr ""
 #. module: base
 #: view:base.update.translations:0
 msgid "Synchronize Translation"
-msgstr "Sincronizati Traducerea"
+msgstr "Sincronizați traducerea"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -16416,7 +16416,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.act_window,auto_refresh:0
 msgid "Auto-Refresh"
-msgstr "Actualizare automata"
+msgstr "Actualizare automată"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product_expiry
@@ -16699,7 +16699,7 @@ msgstr "Program de depistare Probleme"
 #: view:base.module.upgrade:0
 #: view:base.update.translations:0
 msgid "Update"
-msgstr "Actualizare"
+msgstr "Actualizați"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index b648054f2ff..fa4be23ae1c 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,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-12-03 05:35+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index a49a57f40b7..99450958449 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -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-12-03 05:36+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 07f1ef6cc72..adf5467ccb5 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,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-12-03 05:36+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 6e9dcf6c81e..b02e4faf7eb 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,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-12-03 05:29+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:28+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 3639a2e1a0a..a60403dd737 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -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-12-03 05:36+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 3231571faaf..dd2dfb6f544 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -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-12-03 05:40+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:39+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index fce7d3c433e..c290a4ff4c7 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,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-12-03 05:37+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 67dd4a1d937..01567727dec 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -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-12-03 05:37+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 8f697a3cc0a..8b5b889c043 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,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-12-03 05:37+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 9b9459b6824..b28b9360da8 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,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-12-03 05:37+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 8b04e292c43..b08e8bb6ac9 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,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-12-03 05:37+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index d60600ea028..15ad9bb9993 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -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-12-03 05:37+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 1baf54016ca..df43278495c 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -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-12-03 05:38+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 11d6e3cd8ec..3c29be0948c 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,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-12-03 05:40+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 2144e7f4a58..45e70a99402 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -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-12-03 05:38+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index a65c4e31d40..828ee55c953 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,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-12-03 05:39+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:37+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

From 64cc283264e5d69bf173a669c38d57c4812991d4 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Dec 2013 06:15:41 +0000
Subject: [PATCH 500/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061541-j0v5712t55sdiqb6
---
 addons/web/i18n/ar.po                |  4 +--
 addons/web/i18n/bg.po                |  4 +--
 addons/web/i18n/bn.po                |  4 +--
 addons/web/i18n/bs.po                |  4 +--
 addons/web/i18n/ca.po                |  4 +--
 addons/web/i18n/cs.po                |  4 +--
 addons/web/i18n/da.po                |  4 +--
 addons/web/i18n/de.po                |  4 +--
 addons/web/i18n/en_AU.po             |  4 +--
 addons/web/i18n/en_GB.po             |  4 +--
 addons/web/i18n/es.po                |  4 +--
 addons/web/i18n/es_CL.po             |  4 +--
 addons/web/i18n/es_CR.po             |  4 +--
 addons/web/i18n/es_DO.po             |  4 +--
 addons/web/i18n/es_EC.po             |  4 +--
 addons/web/i18n/es_MX.po             |  4 +--
 addons/web/i18n/es_PE.po             |  4 +--
 addons/web/i18n/et.po                |  4 +--
 addons/web/i18n/eu.po                |  4 +--
 addons/web/i18n/fa.po                |  4 +--
 addons/web/i18n/fi.po                |  4 +--
 addons/web/i18n/fr.po                |  4 +--
 addons/web/i18n/fr_CA.po             |  4 +--
 addons/web/i18n/gl.po                |  4 +--
 addons/web/i18n/gu.po                |  4 +--
 addons/web/i18n/hi.po                |  4 +--
 addons/web/i18n/hr.po                |  4 +--
 addons/web/i18n/hu.po                |  4 +--
 addons/web/i18n/id.po                |  4 +--
 addons/web/i18n/it.po                |  4 +--
 addons/web/i18n/ja.po                |  4 +--
 addons/web/i18n/ka.po                |  4 +--
 addons/web/i18n/ko.po                |  4 +--
 addons/web/i18n/lo.po                |  4 +--
 addons/web/i18n/lt.po                |  4 +--
 addons/web/i18n/lv.po                |  4 +--
 addons/web/i18n/mk.po                |  4 +--
 addons/web/i18n/mn.po                |  4 +--
 addons/web/i18n/nb.po                |  4 +--
 addons/web/i18n/nl.po                |  4 +--
 addons/web/i18n/nl_BE.po             |  4 +--
 addons/web/i18n/pl.po                |  4 +--
 addons/web/i18n/pt.po                |  4 +--
 addons/web/i18n/pt_BR.po             |  6 ++--
 addons/web/i18n/ro.po                |  4 +--
 addons/web/i18n/ru.po                |  4 +--
 addons/web/i18n/sk.po                |  4 +--
 addons/web/i18n/sl.po                |  4 +--
 addons/web/i18n/sq.po                |  4 +--
 addons/web/i18n/sr@latin.po          |  4 +--
 addons/web/i18n/sv.po                |  4 +--
 addons/web/i18n/th.po                |  4 +--
 addons/web/i18n/tr.po                |  4 +--
 addons/web/i18n/uk.po                |  4 +--
 addons/web/i18n/vi.po                |  4 +--
 addons/web/i18n/zh_CN.po             |  6 ++--
 addons/web/i18n/zh_TW.po             |  4 +--
 addons/web_api/i18n/cs.po            |  4 +--
 addons/web_api/i18n/es_CR.po         |  4 +--
 addons/web_calendar/i18n/ar.po       |  4 +--
 addons/web_calendar/i18n/bg.po       |  4 +--
 addons/web_calendar/i18n/bn.po       |  4 +--
 addons/web_calendar/i18n/bs.po       |  4 +--
 addons/web_calendar/i18n/ca.po       |  4 +--
 addons/web_calendar/i18n/cs.po       |  4 +--
 addons/web_calendar/i18n/da.po       |  4 +--
 addons/web_calendar/i18n/de.po       |  4 +--
 addons/web_calendar/i18n/en_AU.po    |  4 +--
 addons/web_calendar/i18n/en_GB.po    |  4 +--
 addons/web_calendar/i18n/es.po       |  4 +--
 addons/web_calendar/i18n/es_CL.po    |  4 +--
 addons/web_calendar/i18n/es_CR.po    |  4 +--
 addons/web_calendar/i18n/es_DO.po    |  4 +--
 addons/web_calendar/i18n/es_EC.po    |  4 +--
 addons/web_calendar/i18n/es_MX.po    |  4 +--
 addons/web_calendar/i18n/es_PE.po    |  4 +--
 addons/web_calendar/i18n/et.po       |  4 +--
 addons/web_calendar/i18n/eu.po       |  4 +--
 addons/web_calendar/i18n/fa.po       |  4 +--
 addons/web_calendar/i18n/fi.po       |  4 +--
 addons/web_calendar/i18n/fr.po       |  6 ++--
 addons/web_calendar/i18n/fr_CA.po    |  4 +--
 addons/web_calendar/i18n/gl.po       |  4 +--
 addons/web_calendar/i18n/gu.po       |  4 +--
 addons/web_calendar/i18n/hr.po       |  4 +--
 addons/web_calendar/i18n/hu.po       |  4 +--
 addons/web_calendar/i18n/id.po       |  4 +--
 addons/web_calendar/i18n/it.po       |  4 +--
 addons/web_calendar/i18n/ja.po       |  4 +--
 addons/web_calendar/i18n/ka.po       |  4 +--
 addons/web_calendar/i18n/ko.po       |  4 +--
 addons/web_calendar/i18n/lt.po       |  4 +--
 addons/web_calendar/i18n/mk.po       |  4 +--
 addons/web_calendar/i18n/mn.po       |  4 +--
 addons/web_calendar/i18n/nb.po       |  4 +--
 addons/web_calendar/i18n/nl.po       |  4 +--
 addons/web_calendar/i18n/nl_BE.po    |  4 +--
 addons/web_calendar/i18n/pl.po       |  4 +--
 addons/web_calendar/i18n/pt.po       |  4 +--
 addons/web_calendar/i18n/pt_BR.po    |  6 ++--
 addons/web_calendar/i18n/ro.po       |  4 +--
 addons/web_calendar/i18n/ru.po       |  4 +--
 addons/web_calendar/i18n/sk.po       |  4 +--
 addons/web_calendar/i18n/sl.po       |  4 +--
 addons/web_calendar/i18n/sq.po       |  4 +--
 addons/web_calendar/i18n/sr@latin.po |  4 +--
 addons/web_calendar/i18n/sv.po       |  4 +--
 addons/web_calendar/i18n/th.po       |  4 +--
 addons/web_calendar/i18n/tr.po       |  4 +--
 addons/web_calendar/i18n/uk.po       |  4 +--
 addons/web_calendar/i18n/zh_CN.po    |  6 ++--
 addons/web_calendar/i18n/zh_TW.po    |  4 +--
 addons/web_diagram/i18n/ar.po        |  4 +--
 addons/web_diagram/i18n/bg.po        |  4 +--
 addons/web_diagram/i18n/bn.po        |  4 +--
 addons/web_diagram/i18n/bs.po        |  4 +--
 addons/web_diagram/i18n/ca.po        |  4 +--
 addons/web_diagram/i18n/cs.po        |  4 +--
 addons/web_diagram/i18n/da.po        | 15 ++++++---
 addons/web_diagram/i18n/de.po        |  4 +--
 addons/web_diagram/i18n/en_AU.po     |  4 +--
 addons/web_diagram/i18n/en_GB.po     |  4 +--
 addons/web_diagram/i18n/es.po        |  4 +--
 addons/web_diagram/i18n/es_CL.po     |  4 +--
 addons/web_diagram/i18n/es_CR.po     |  4 +--
 addons/web_diagram/i18n/es_DO.po     |  4 +--
 addons/web_diagram/i18n/es_EC.po     |  4 +--
 addons/web_diagram/i18n/es_MX.po     |  4 +--
 addons/web_diagram/i18n/es_PE.po     |  4 +--
 addons/web_diagram/i18n/et.po        |  4 +--
 addons/web_diagram/i18n/fa.po        |  4 +--
 addons/web_diagram/i18n/fi.po        |  4 +--
 addons/web_diagram/i18n/fr.po        |  4 +--
 addons/web_diagram/i18n/gl.po        |  4 +--
 addons/web_diagram/i18n/gu.po        |  4 +--
 addons/web_diagram/i18n/hr.po        |  4 +--
 addons/web_diagram/i18n/hu.po        |  4 +--
 addons/web_diagram/i18n/id.po        |  4 +--
 addons/web_diagram/i18n/it.po        |  4 +--
 addons/web_diagram/i18n/ja.po        |  4 +--
 addons/web_diagram/i18n/ka.po        |  4 +--
 addons/web_diagram/i18n/ko.po        |  4 +--
 addons/web_diagram/i18n/lt.po        |  4 +--
 addons/web_diagram/i18n/mk.po        |  4 +--
 addons/web_diagram/i18n/mn.po        |  4 +--
 addons/web_diagram/i18n/nb.po        |  4 +--
 addons/web_diagram/i18n/nl.po        |  4 +--
 addons/web_diagram/i18n/nl_BE.po     |  4 +--
 addons/web_diagram/i18n/pl.po        |  4 +--
 addons/web_diagram/i18n/pt.po        |  4 +--
 addons/web_diagram/i18n/pt_BR.po     |  4 +--
 addons/web_diagram/i18n/ro.po        |  4 +--
 addons/web_diagram/i18n/ru.po        |  4 +--
 addons/web_diagram/i18n/sl.po        |  4 +--
 addons/web_diagram/i18n/sq.po        |  4 +--
 addons/web_diagram/i18n/sr@latin.po  |  4 +--
 addons/web_diagram/i18n/sv.po        |  4 +--
 addons/web_diagram/i18n/th.po        |  4 +--
 addons/web_diagram/i18n/tr.po        |  4 +--
 addons/web_diagram/i18n/zh_CN.po     |  4 +--
 addons/web_diagram/i18n/zh_TW.po     |  4 +--
 addons/web_gantt/i18n/ar.po          |  4 +--
 addons/web_gantt/i18n/bg.po          |  4 +--
 addons/web_gantt/i18n/bn.po          |  4 +--
 addons/web_gantt/i18n/bs.po          |  4 +--
 addons/web_gantt/i18n/ca.po          |  4 +--
 addons/web_gantt/i18n/cs.po          |  4 +--
 addons/web_gantt/i18n/da.po          |  4 +--
 addons/web_gantt/i18n/de.po          |  4 +--
 addons/web_gantt/i18n/en_AU.po       |  4 +--
 addons/web_gantt/i18n/en_GB.po       |  4 +--
 addons/web_gantt/i18n/es.po          |  4 +--
 addons/web_gantt/i18n/es_CL.po       |  4 +--
 addons/web_gantt/i18n/es_CR.po       |  4 +--
 addons/web_gantt/i18n/es_DO.po       |  4 +--
 addons/web_gantt/i18n/es_EC.po       |  4 +--
 addons/web_gantt/i18n/es_MX.po       |  4 +--
 addons/web_gantt/i18n/et.po          |  4 +--
 addons/web_gantt/i18n/fa.po          |  4 +--
 addons/web_gantt/i18n/fi.po          |  4 +--
 addons/web_gantt/i18n/fr.po          |  4 +--
 addons/web_gantt/i18n/gl.po          |  4 +--
 addons/web_gantt/i18n/gu.po          |  4 +--
 addons/web_gantt/i18n/hr.po          |  4 +--
 addons/web_gantt/i18n/hu.po          |  4 +--
 addons/web_gantt/i18n/it.po          |  4 +--
 addons/web_gantt/i18n/ja.po          |  4 +--
 addons/web_gantt/i18n/ka.po          |  4 +--
 addons/web_gantt/i18n/ko.po          |  4 +--
 addons/web_gantt/i18n/lo.po          |  4 +--
 addons/web_gantt/i18n/lt.po          |  4 +--
 addons/web_gantt/i18n/mk.po          |  4 +--
 addons/web_gantt/i18n/mn.po          |  4 +--
 addons/web_gantt/i18n/nb.po          |  4 +--
 addons/web_gantt/i18n/nl.po          |  4 +--
 addons/web_gantt/i18n/nl_BE.po       |  4 +--
 addons/web_gantt/i18n/pl.po          |  4 +--
 addons/web_gantt/i18n/pt.po          |  4 +--
 addons/web_gantt/i18n/pt_BR.po       |  4 +--
 addons/web_gantt/i18n/ro.po          |  4 +--
 addons/web_gantt/i18n/ru.po          |  4 +--
 addons/web_gantt/i18n/sl.po          |  4 +--
 addons/web_gantt/i18n/sq.po          |  4 +--
 addons/web_gantt/i18n/sr@latin.po    |  4 +--
 addons/web_gantt/i18n/sv.po          |  4 +--
 addons/web_gantt/i18n/th.po          |  4 +--
 addons/web_gantt/i18n/tr.po          |  4 +--
 addons/web_gantt/i18n/zh_CN.po       |  4 +--
 addons/web_graph/i18n/ar.po          |  4 +--
 addons/web_graph/i18n/bg.po          |  4 +--
 addons/web_graph/i18n/bn.po          |  4 +--
 addons/web_graph/i18n/bs.po          |  4 +--
 addons/web_graph/i18n/ca.po          |  4 +--
 addons/web_graph/i18n/cs.po          |  4 +--
 addons/web_graph/i18n/da.po          | 36 ++++++++++----------
 addons/web_graph/i18n/de.po          |  4 +--
 addons/web_graph/i18n/en_AU.po       |  4 +--
 addons/web_graph/i18n/en_GB.po       |  4 +--
 addons/web_graph/i18n/es.po          |  4 +--
 addons/web_graph/i18n/es_CL.po       |  4 +--
 addons/web_graph/i18n/es_CR.po       |  4 +--
 addons/web_graph/i18n/es_DO.po       |  4 +--
 addons/web_graph/i18n/es_EC.po       |  4 +--
 addons/web_graph/i18n/es_MX.po       |  4 +--
 addons/web_graph/i18n/et.po          |  4 +--
 addons/web_graph/i18n/fa.po          |  4 +--
 addons/web_graph/i18n/fi.po          |  4 +--
 addons/web_graph/i18n/fr.po          |  4 +--
 addons/web_graph/i18n/fr_CA.po       |  4 +--
 addons/web_graph/i18n/gl.po          |  4 +--
 addons/web_graph/i18n/gu.po          |  4 +--
 addons/web_graph/i18n/hr.po          |  4 +--
 addons/web_graph/i18n/hu.po          |  4 +--
 addons/web_graph/i18n/it.po          |  4 +--
 addons/web_graph/i18n/ja.po          |  4 +--
 addons/web_graph/i18n/ka.po          |  4 +--
 addons/web_graph/i18n/ko.po          |  4 +--
 addons/web_graph/i18n/lt.po          |  4 +--
 addons/web_graph/i18n/mk.po          |  4 +--
 addons/web_graph/i18n/mn.po          |  4 +--
 addons/web_graph/i18n/nb.po          |  4 +--
 addons/web_graph/i18n/nl.po          |  4 +--
 addons/web_graph/i18n/nl_BE.po       |  4 +--
 addons/web_graph/i18n/pl.po          |  4 +--
 addons/web_graph/i18n/pt.po          |  4 +--
 addons/web_graph/i18n/pt_BR.po       |  6 ++--
 addons/web_graph/i18n/ro.po          |  4 +--
 addons/web_graph/i18n/ru.po          |  4 +--
 addons/web_graph/i18n/sl.po          |  4 +--
 addons/web_graph/i18n/sq.po          |  4 +--
 addons/web_graph/i18n/sr@latin.po    |  4 +--
 addons/web_graph/i18n/sv.po          |  4 +--
 addons/web_graph/i18n/th.po          |  4 +--
 addons/web_graph/i18n/tr.po          |  4 +--
 addons/web_graph/i18n/zh_CN.po       |  4 +--
 addons/web_hello/i18n/ar.po          |  4 +--
 addons/web_hello/i18n/cs.po          |  4 +--
 addons/web_hello/i18n/es_CR.po       |  4 +--
 addons/web_hello/i18n/fr.po          |  4 +--
 addons/web_hello/i18n/pt_BR.po       |  4 +--
 addons/web_kanban/i18n/ar.po         |  4 +--
 addons/web_kanban/i18n/bg.po         |  4 +--
 addons/web_kanban/i18n/bn.po         |  4 +--
 addons/web_kanban/i18n/bs.po         |  4 +--
 addons/web_kanban/i18n/ca.po         |  4 +--
 addons/web_kanban/i18n/cs.po         |  4 +--
 addons/web_kanban/i18n/da.po         |  4 +--
 addons/web_kanban/i18n/de.po         |  4 +--
 addons/web_kanban/i18n/en_AU.po      |  4 +--
 addons/web_kanban/i18n/en_GB.po      |  4 +--
 addons/web_kanban/i18n/es.po         |  4 +--
 addons/web_kanban/i18n/es_CL.po      |  4 +--
 addons/web_kanban/i18n/es_CR.po      |  4 +--
 addons/web_kanban/i18n/es_DO.po      |  4 +--
 addons/web_kanban/i18n/es_EC.po      |  4 +--
 addons/web_kanban/i18n/es_MX.po      |  4 +--
 addons/web_kanban/i18n/et.po         |  4 +--
 addons/web_kanban/i18n/fa.po         |  4 +--
 addons/web_kanban/i18n/fi.po         |  4 +--
 addons/web_kanban/i18n/fr.po         |  4 +--
 addons/web_kanban/i18n/fr_CA.po      |  4 +--
 addons/web_kanban/i18n/gl.po         |  4 +--
 addons/web_kanban/i18n/gu.po         |  4 +--
 addons/web_kanban/i18n/hr.po         |  4 +--
 addons/web_kanban/i18n/hu.po         |  4 +--
 addons/web_kanban/i18n/it.po         |  4 +--
 addons/web_kanban/i18n/ja.po         |  4 +--
 addons/web_kanban/i18n/ka.po         |  4 +--
 addons/web_kanban/i18n/ko.po         |  4 +--
 addons/web_kanban/i18n/lt.po         |  4 +--
 addons/web_kanban/i18n/mk.po         |  4 +--
 addons/web_kanban/i18n/mn.po         |  4 +--
 addons/web_kanban/i18n/nb.po         |  4 +--
 addons/web_kanban/i18n/nl.po         |  6 ++--
 addons/web_kanban/i18n/nl_BE.po      |  4 +--
 addons/web_kanban/i18n/pl.po         |  4 +--
 addons/web_kanban/i18n/pt.po         |  4 +--
 addons/web_kanban/i18n/pt_BR.po      |  6 ++--
 addons/web_kanban/i18n/ro.po         |  4 +--
 addons/web_kanban/i18n/ru.po         |  4 +--
 addons/web_kanban/i18n/sl.po         |  4 +--
 addons/web_kanban/i18n/sr@latin.po   |  4 +--
 addons/web_kanban/i18n/sv.po         |  4 +--
 addons/web_kanban/i18n/th.po         |  4 +--
 addons/web_kanban/i18n/tr.po         |  4 +--
 addons/web_kanban/i18n/zh_CN.po      |  6 ++--
 addons/web_kanban/i18n/zh_TW.po      |  4 +--
 addons/web_tests/i18n/cs.po          |  4 +--
 addons/web_tests/i18n/es.po          |  4 +--
 addons/web_tests/i18n/es_CR.po       |  4 +--
 addons/web_tests/i18n/fr_CA.po       |  4 +--
 addons/web_view_editor/i18n/ar.po    |  4 +--
 addons/web_view_editor/i18n/bs.po    |  4 +--
 addons/web_view_editor/i18n/cs.po    |  4 +--
 addons/web_view_editor/i18n/da.po    | 50 ++++++++++++++--------------
 addons/web_view_editor/i18n/de.po    |  4 +--
 addons/web_view_editor/i18n/en_AU.po |  4 +--
 addons/web_view_editor/i18n/en_GB.po |  4 +--
 addons/web_view_editor/i18n/es.po    |  4 +--
 addons/web_view_editor/i18n/es_DO.po |  4 +--
 addons/web_view_editor/i18n/es_EC.po |  4 +--
 addons/web_view_editor/i18n/es_MX.po |  4 +--
 addons/web_view_editor/i18n/et.po    |  4 +--
 addons/web_view_editor/i18n/fa.po    |  4 +--
 addons/web_view_editor/i18n/fi.po    |  4 +--
 addons/web_view_editor/i18n/fr.po    |  4 +--
 addons/web_view_editor/i18n/hr.po    |  4 +--
 addons/web_view_editor/i18n/hu.po    |  4 +--
 addons/web_view_editor/i18n/it.po    |  4 +--
 addons/web_view_editor/i18n/ko.po    |  4 +--
 addons/web_view_editor/i18n/lt.po    |  4 +--
 addons/web_view_editor/i18n/lv.po    |  4 +--
 addons/web_view_editor/i18n/mk.po    |  4 +--
 addons/web_view_editor/i18n/mn.po    |  4 +--
 addons/web_view_editor/i18n/nb.po    |  4 +--
 addons/web_view_editor/i18n/nl.po    |  4 +--
 addons/web_view_editor/i18n/nl_BE.po |  4 +--
 addons/web_view_editor/i18n/pl.po    |  4 +--
 addons/web_view_editor/i18n/pt.po    |  4 +--
 addons/web_view_editor/i18n/pt_BR.po |  4 +--
 addons/web_view_editor/i18n/ro.po    |  8 ++---
 addons/web_view_editor/i18n/ru.po    |  4 +--
 addons/web_view_editor/i18n/sl.po    |  4 +--
 addons/web_view_editor/i18n/sv.po    |  4 +--
 addons/web_view_editor/i18n/th.po    |  4 +--
 addons/web_view_editor/i18n/tr.po    |  4 +--
 addons/web_view_editor/i18n/zh_CN.po |  6 ++--
 347 files changed, 754 insertions(+), 747 deletions(-)

diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index a99d9ea4e10..dd689b26d37 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -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-10-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16791)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index ac4969af108..8a8d5781150 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index 3fef1d916ba..a26f0977b3d 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index 3549d4c2384..9f1e0b93a65 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -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-09-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16760)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 1018c4a4a9a..75578c8d459 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index 969a8ef79f8..71038cd0faf 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -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-08-26 05:12+0000\n"
-"X-Generator: Launchpad (build 16738)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index ce5e7694deb..36c3b72f2e7 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -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-09-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index f18971cb852..3834b934670 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -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-11-13 06:08+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index 79ac7273898..018b61b3970 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index ff2ca272a74..27e73e922e0 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -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-10-27 06:13+0000\n"
-"X-Generator: Launchpad (build 16810)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index e83820cd273..a971f562ac0 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -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-06-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index 4a0da9ac4d3..0349271af6c 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index 25ad27c9b55..887f384425d 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index 1058b98cee1..c12a69ef6ef 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/i18n/es_DO.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 0a53f64cc43..8c5c94ee621 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index a7e51a6e373..d0f918f8f25 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/i18n/es_MX.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_PE.po b/addons/web/i18n/es_PE.po
index 88cb0ba0c8f..6b12dbce212 100644
--- a/addons/web/i18n/es_PE.po
+++ b/addons/web/i18n/es_PE.po
@@ -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-12-11 06:28+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index c0b83d8bd2f..69dc0defea0 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -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-11-26 06:07+0000\n"
-"X-Generator: Launchpad (build 16840)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index c14e608cba6..210adcd75b2 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index a8d21fe3cbc..da8c8a72e75 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 94c20c6e2b4..e5512a95b8d 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -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-12-11 06:28+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index 05eb39f30d2..73514802761 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -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-07-29 05:55+0000\n"
-"X-Generator: Launchpad (build 16700)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 1ec3761aafb..53db7347c13 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -15,8 +15,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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index 16a4012984a..f15a366d8f5 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.po
@@ -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-07-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16692)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 34d726c4869..c4e876eb524 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 4dbdf7595e4..5f424daf844 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index aafe264fcad..971fda09f4a 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index 5c48a3bf4c5..64a4c3a265f 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -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-06-22 06:25+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index bb797b4038b..f2837b4aa66 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index b9af45b12bc..d463e3dd83c 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 3da6a26722b..4bec79e5a5c 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -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-11-29 05:30+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index 0842c98ea58..210c59d227b 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index c710a9057e4..eca6b8aa30c 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/i18n/ko.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index 2f193e24cb5..5c2fbccee9c 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 29328bde821..ee124531d93 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -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-08-22 05:40+0000\n"
-"X-Generator: Launchpad (build 16734)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index 78040446093..dda3ca5f616 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.po
@@ -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-10-24 05:21+0000\n"
-"X-Generator: Launchpad (build 16810)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 3e32184dde5..0ed45b76ea1 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index 49ce813b5eb..10fe1535e15 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -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-10-13 05:38+0000\n"
-"X-Generator: Launchpad (build 16799)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index 4024f89c895..0d80052e3f5 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.po
@@ -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-10-04 05:45+0000\n"
-"X-Generator: Launchpad (build 16791)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 608c44c631e..13d4fc25312 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -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-11-13 06:08+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index 6d1731d3691..e9692f8465d 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index 3439ae696d3..b54568e10fd 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -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-11-16 06:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index b3d0dcef68b..68e7e9d294e 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -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-08-15 05:51+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 8fa9dc08dd2..8a2e5b3cc9f 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
 "PO-Revision-Date: 2013-09-19 04:20+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-20 06:01+0000\n"
-"X-Generator: Launchpad (build 16765)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index 561c4e71c06..1dcce32e09a 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -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-12-08 05:46+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 05caa66553d..ebd018f7bd0 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -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-11-03 05:43+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index bc926c6ec5d..62e77781f1d 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index 4c73bcd4a75..d2a73f789b9 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -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-09-22 05:34+0000\n"
-"X-Generator: Launchpad (build 16765)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index 7417e60a119..8439a5b2df9 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -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-06-08 07:49+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:13+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index 1d8cbcc8d5d..5a3f17939bc 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index 6fb9db1e970..f6b0eefe16e 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -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-11-02 06:23+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index 20b8a23fbf7..6a95e8bddea 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/i18n/th.po
@@ -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-09-02 05:37+0000\n"
-"X-Generator: Launchpad (build 16750)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index f20f7d18ed9..f396a09f0a1 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -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-07-12 06:35+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index a1db81c3b38..d0e435fbf70 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/vi.po b/addons/web/i18n/vi.po
index 02339d92261..277736b4d3b 100644
--- a/addons/web/i18n/vi.po
+++ b/addons/web/i18n/vi.po
@@ -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-07-30 04:58+0000\n"
-"X-Generator: Launchpad (build 16700)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 8421049646e..1fe86e00e18 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
 "PO-Revision-Date: 2013-08-22 05:31+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
-"X-Generator: Launchpad (build 16737)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index 6423ec0eb25..223e155d70a 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_api/i18n/cs.po b/addons/web_api/i18n/cs.po
index 8fd6e5da2e9..eca93c03e7f 100644
--- a/addons/web_api/i18n/cs.po
+++ b/addons/web_api/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:57+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_api/i18n/es_CR.po b/addons/web_api/i18n/es_CR.po
index 0f8c205945d..2c432393436 100644
--- a/addons/web_api/i18n/es_CR.po
+++ b/addons/web_api/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:57+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index 405a4c784f9..b6e898aed9a 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index 2b39219bf94..01132774ddd 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index 4b678f710cb..ce25ef6e541 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index 7b99456f995..7b16479bd6b 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -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-09-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16760)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index 347dc6f61f6..a7681df8380 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 86a4d7b23db..cf511f30e99 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -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-06-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index 6c43d549aa3..31949a1651b 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.po
@@ -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-09-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 1f187b43193..cfcf6e0dee9 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 992568fa73a..a8248a5b794 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index a52fb90154c..c020f24c20b 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.po
@@ -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-09-15 06:11+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index 3509283b029..bf211cbd1f6 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -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-06-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index e46b9ee48e3..6378340659d 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index 7ab62fd49cb..eb454994f09 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index 52085ebd572..9b242e7d8db 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/i18n/es_DO.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index a030ee46c74..4c46ffe4871 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index 8de53620544..af985662f40 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/i18n/es_MX.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_PE.po b/addons/web_calendar/i18n/es_PE.po
index 9f5cb43c326..217149a4a60 100644
--- a/addons/web_calendar/i18n/es_PE.po
+++ b/addons/web_calendar/i18n/es_PE.po
@@ -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-12-11 06:28+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index 015823517ea..1e8e70c2a92 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index e5e4b70b0ce..503abb76dda 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index b9bad40f7ef..a96b3f4859e 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index 6ac55811beb..51cb5e3efbd 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index 34327a39f9b..f923d7eada3 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
 "PO-Revision-Date: 2013-04-10 02:42+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"Last-Translator: Quentin THEURET @TeMPO Consulting <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 4afb45ad476..619e757a35d 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index 74948083327..c0b6e7cd873 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index 41e5a1ce1fd..00102cba9a0 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/i18n/gu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 1405f4818c9..b5256865669 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index 6b9c8517ebc..8786cb9fc76 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 838f07d892c..f96353decb6 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index a0aabc76c66..5e1a2bbe9a5 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 04a571762c4..4b5c06ef375 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index 4916be0d845..d900ee8de57 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index ef093c47d3b..a610b4a3e29 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/i18n/ko.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index 2393464a25b..49ad8698fc7 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 20c909d187e..714f0a44dff 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index f6c05677466..5f3243f035b 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -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-06-26 06:18+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index ec297f60a94..cd779eefb1c 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 113d534fdbf..e64d9cb01ad 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -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-11-13 06:08+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index 7716e895e68..2505e767147 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 953460660d9..0ec9fee101b 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index 2a026f61097..36651860e1c 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -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-08-15 05:51+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 2796d9392dd..899988e9170 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
 "PO-Revision-Date: 2013-03-16 14:21+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index e4afa5810ad..d9058ff4db9 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index a247d8f57e4..68cc294370d 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index a03fff471b8..dc81513b387 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index c763e217051..ef2d986637d 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index 14f6e986b94..69605c24ab2 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:14+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 2430a53523f..2676b88b742 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index 991f2af9f80..fa6f0745449 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -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-09-19 04:56+0000\n"
-"X-Generator: Launchpad (build 16765)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index 7c3126885e3..5813c9b8e42 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/i18n/th.po
@@ -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-09-02 05:37+0000\n"
-"X-Generator: Launchpad (build 16750)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index 8ee465aca7e..78a4b863a48 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index b5adc6bcf95..5a70edd8e05 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index ca984c678ec..37affd52790 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
 "PO-Revision-Date: 2013-07-04 07:32+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-05 06:13+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_TW.po b/addons/web_calendar/i18n/zh_TW.po
index 0a439b3a9c9..1b694ee7b78 100644
--- a/addons/web_calendar/i18n/zh_TW.po
+++ b/addons/web_calendar/i18n/zh_TW.po
@@ -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-09-28 05:54+0000\n"
-"X-Generator: Launchpad (build 16774)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index ec7e2363fb8..49a2ac9912e 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 8621c00a02c..b7430c34144 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index 0fefccdb22a..14657156abe 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 7fbbc1f2629..dbdf6324fbc 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -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-09-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16760)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index ab31810b088..b2ea657709f 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index e8d39d3f847..06fe26f72f2 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index a36fb5f3e68..1db6de9371e 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
@@ -35,13 +35,17 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"Sletning af denne knude kan ikke fortrydes.\n"
+"Det vil også slette alle tilsluttede overgange.\n"
+"\n"
+"Er du sikker?"
 
 #. module: web_diagram
 #. openerp-web
 #: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
 #, python-format
 msgid "New Node"
-msgstr "Ny tilstand"
+msgstr "Ny knude"
 
 #. module: web_diagram
 #. openerp-web
@@ -71,7 +75,7 @@ msgstr "Aktivitet"
 #: code:addons/web_diagram/static/src/js/diagram.js:420
 #, python-format
 msgid "%d / %d"
-msgstr ""
+msgstr "%d / %d"
 
 #. module: web_diagram
 #. openerp-web
@@ -97,3 +101,6 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"Sletning af denne overgang kan ikke fortrydes.\n"
+"\n"
+"Er du sikker ?"
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 0a9ed58531a..bf565cd5e09 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index a0ee926e432..eb67aba4d2f 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index 02b5f811506..e3e4569fd2f 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.po
@@ -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-09-15 06:11+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index 0b816798e70..f8af7f302e5 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index 871f6897eb6..59eeb7149c6 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index 4cd14f38da5..8992ed4fc96 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index aec35c417bc..5f284239494 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/i18n/es_DO.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index ed577fc44b3..5afffd321b7 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index d25030b82ae..fe0d69814f0 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/i18n/es_MX.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_PE.po b/addons/web_diagram/i18n/es_PE.po
index 4bf254309bb..085c02f7d5e 100644
--- a/addons/web_diagram/i18n/es_PE.po
+++ b/addons/web_diagram/i18n/es_PE.po
@@ -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-12-11 06:28+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index dfeed632dd5..dadc7630bb2 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index ea092007b31..b0918907a3e 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index 74d54fc96e2..b44bb8f0cd9 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index bf02e0da01d..0810a0cc8d9 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index a9061ac8eec..ec00f0caaac 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 60685846168..359158f3482 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/i18n/gu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index ea58ecde15f..5f9afe2efd1 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index 7d8d75b58ee..471382056fc 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index b2749c188eb..f1c2ce24291 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index cc23e7f4c71..18168e0e02a 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index f2483f6f9f9..94d535dbc5f 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 586dd7c9890..250469dac87 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index 62eae4ea0d0..19513518bd6 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/i18n/ko.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 97e2056e7e5..a73087adef7 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index 4fa7513cac5..820d46e717d 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/i18n/mk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index b5b05a682b5..98dc6684254 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index 3c7a3c93ee8..de2cbf0d4e3 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/i18n/nb.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index 6f8d91f9791..a233c226891 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index 50488873a0c..fa6a0a5b2cf 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index 823662f3e66..80e45a5a364 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index 909ff37518f..7e07b0aa6cd 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 63f3e239e45..d46315c7edf 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index a8568950dad..68cb016ff58 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index c9a7790bd83..36ab658ac31 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index 09eac640b28..165bfb72485 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index d9a6c4f3769..6192cb5a779 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index b214863b690..519b75fb710 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index df29bca739c..a9bd176e4d5 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -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-09-19 04:56+0000\n"
-"X-Generator: Launchpad (build 16765)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index 8491b02a863..9ce83aae227 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/i18n/th.po
@@ -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-06-20 06:35+0000\n"
-"X-Generator: Launchpad (build 16673)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index 5d4a1ab570b..06bf8ec3bfc 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index 1bb72ab88b3..d04c190f32b 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index 1b96a858207..cdd0828193f 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index e9bfad24436..532955f0a22 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index d7f4304c434..7989c584395 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index 0ff217d93a1..cccecfd7173 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index a3a2e29acb3..a5713843fb7 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index 8d0c3f77846..eb6de01a3a6 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 586f84864c6..503439bd16d 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 44d0cef33f6..262bea20c87 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index dbe73f58b3e..f99e7d50380 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 8d46c6f7f77..a389a2c0f48 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 4445849b39c..f97dbcaf8a9 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index 9c1cc6cc81f..553882311df 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index c2d34654728..dcd7f183780 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index 03883617c82..6e64a7bc677 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index 65a0a051662..969724bac45 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/i18n/es_DO.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index 4958fd7e44b..335b26bf458 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index a0444984a25..cf29e920f64 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/i18n/es_MX.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index 7660084a674..500819879bc 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index b24db42ce0e..4584145754c 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index bd91d01d496..2969bc88b33 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index a90b1e6b6b8..8a2320ae189 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index ce1f84037f9..a1ffad36177 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index 66b3b2d0987..ca40135e0c3 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/i18n/gu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 13058788199..d26e57e6a90 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index 779c1e2a02f..c8beb0f3e4e 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index 94dade7fe42..815dbdfd241 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 0cd5cbd9876..d96d9e8d2fd 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 9d89d1d6739..0bfdcad7333 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index 72e9704613b..a0abc0e47de 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/i18n/ko.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index e9f8bf9b6a7..93ea678f294 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.po
@@ -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-11-26 06:07+0000\n"
-"X-Generator: Launchpad (build 16840)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index 36d8c30b139..ea58ac0693a 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index ce9cc9468d5..efba7de44a2 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index f97039dc142..7c0e51fc841 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index 0fe5ddf634b..503aabc341b 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index 909f8702ff3..a006343fd37 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index a71c915d652..632b59f5dd6 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index debd777cb62..8bf03b2712d 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index 559e78c0a2d..3175b01e741 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index b30268cd2ce..b2c1c8c9d21 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,8 +15,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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 409184c8ac9..9b0fec6aac7 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index b781f7143df..c30538a5ea3 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 667d36e74d9..93b07228a7f 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index 7535f95eee7..ea8548e939c 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index f7a4c6c1c1f..26a51d18246 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index 9423d703c53..0faa401bbb4 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index 513d727cdbc..57fe77359b0 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/i18n/th.po
@@ -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-06-17 06:21+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index 0a0bbe7d7f4..0c4be88c5c1 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 66a88e4c967..cbd85d701f4 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index dc80acb60f1..12c9bd545a5 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index 4d1da0e5cb1..a30c1cbb22c 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index dfef3b9aed3..03aa11a31cf 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index 9773ee7c3fb..05ea52b91c2 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -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-09-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16760)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index a796f0f777b..f5fd0c6acc7 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 7957c28b48e..6cd356a0400 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 20b1a31ba60..5ac21a26903 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.po
@@ -14,22 +14,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:12
 #, python-format
 msgid "Bars"
-msgstr ""
+msgstr "Søjler"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:33
 #, python-format
 msgid "Show Data"
-msgstr ""
+msgstr "Vis data"
 
 #. module: web_graph
 #. openerp-web
@@ -43,95 +43,95 @@ msgstr "Graf"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:25
 #, python-format
 msgid "Inside"
-msgstr ""
+msgstr "Indvendig"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:11
 #, python-format
 msgid "Pie"
-msgstr ""
+msgstr "Udsnit"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr ""
+msgstr "Aktioner"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:7
 #, python-format
 msgid "Graph Mode"
-msgstr ""
+msgstr "Graf mode"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:18
 #, python-format
 msgid "Radar"
-msgstr ""
+msgstr "Radar"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:34
 #, python-format
 msgid "Download as PNG"
-msgstr ""
+msgstr "Download som PNG"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Øverst"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:24
 #, python-format
 msgid "Hidden"
-msgstr ""
+msgstr "Skjult"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "Graph Options"
-msgstr ""
+msgstr "Graf optioner"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:14
 #, python-format
 msgid "Lines"
-msgstr ""
+msgstr "Linjer"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:20
 #, python-format
 msgid "Legend"
-msgstr ""
+msgstr "Historie"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:32
 #, python-format
 msgid "Switch Axis"
-msgstr ""
+msgstr "Skift akser"
 
 #. module: web_graph
 #. openerp-web
 #: code:addons/web_graph/static/src/xml/web_graph.xml:15
 #, python-format
 msgid "Areas"
-msgstr ""
+msgstr "Område"
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index 80029225913..8370ad5f3a7 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index d23e7367300..4ee131d9e77 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index da16621d647..eff47a091c1 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.po
@@ -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-09-15 06:11+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 7daef936957..1663ef864d8 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index 26d088b3257..6e8e34611e0 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index af17812cd00..8665743bc22 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index 974547b027f..c168a11d931 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/i18n/es_DO.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index e9823d9f273..19d00d44693 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index bb3d4d5aa26..51b227f92a8 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/i18n/es_MX.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index 3ad7113b358..db2d48b415f 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index a7304c181d6..382b05f0e24 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index d90637ec891..55b68ffbb54 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index eeff9f8ee4c..4cb05fd100e 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index 2593546634a..701a275e080 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/i18n/fr_CA.po
@@ -15,8 +15,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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index 9a2de88f484..9c0fbc9b7e0 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index 6d47aeba7f8..05c122aa066 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/i18n/gu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index ab3ad7ac4e4..b98c95511cc 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index 8980fee64e8..e333df861f4 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index 2150f16a2f9..b62bd2bb33d 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index c8c11272ff4..58be04b37c0 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index 7c05bf6adc3..d60e94b47ef 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index 9d1cf58676c..36ab8b7931a 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/i18n/ko.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index 68e37ae17ee..19622110e56 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index 46f2e025007..c5c1e9f5708 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 0a65e35843d..dbd8931d6c1 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index 2642da67a60..a550cc3a9bd 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/i18n/nb.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index 89715196d7e..8808d6e692a 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -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-11-13 06:08+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index c00dcc56ede..aa65fd401c3 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 49ca7f76c98..002418640d9 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index 0bea1ed2919..6ff5ab15a06 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index 79b150af9be..5a92072e5e4 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
 "PO-Revision-Date: 2013-01-26 06:21+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index e0c0da7c4c2..f7a641502cd 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index 810436ca503..c54430e503b 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index e512f80c85f..adc3d6dc829 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 94b70757b34..f90e7ded285 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -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-06-08 07:50+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 6f9dbc59b70..6a8dacbdcc5 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index 32732b0a464..e18ce7718c2 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -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-11-02 06:23+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index 0422ca7a22e..1b28a1dbb03 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/i18n/th.po
@@ -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-06-20 06:35+0000\n"
-"X-Generator: Launchpad (build 16673)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index d2ae851fa39..61d5dc9cd52 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index d4966dfb729..93597696bc3 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_hello/i18n/ar.po b/addons/web_hello/i18n/ar.po
index a3c070f0b7b..da610996aef 100644
--- a/addons/web_hello/i18n/ar.po
+++ b/addons/web_hello/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_hello/i18n/cs.po b/addons/web_hello/i18n/cs.po
index 41991f03c72..94d3626edb4 100644
--- a/addons/web_hello/i18n/cs.po
+++ b/addons/web_hello/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_hello/i18n/es_CR.po b/addons/web_hello/i18n/es_CR.po
index 5ad25b5cd03..5ffc582733a 100644
--- a/addons/web_hello/i18n/es_CR.po
+++ b/addons/web_hello/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_hello/i18n/fr.po b/addons/web_hello/i18n/fr.po
index d2f6685714b..875da68e7b4 100644
--- a/addons/web_hello/i18n/fr.po
+++ b/addons/web_hello/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_hello/i18n/pt_BR.po b/addons/web_hello/i18n/pt_BR.po
index e442560b9d6..b2c517e218b 100644
--- a/addons/web_hello/i18n/pt_BR.po
+++ b/addons/web_hello/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index 37871d4fcd6..ae60645e933 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index 5a55ffff4a5..d4ff5a12cf9 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 1da762f16f9..46380689679 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index e7a18ee3982..8418a16caea 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -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-09-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16760)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index d94523aed47..d3808c90ca7 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index d2e25c3df3e..45b9e8e64dd 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -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-06-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index 59988e813b6..13c4341f8b6 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.po
@@ -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-09-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16758)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 6524699a494..b66078e5722 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -15,8 +15,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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index f2c2afd09cd..34429cd7b78 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index 32ee06bb828..8b550fa92e0 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.po
@@ -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-09-15 06:11+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index 9ea72f44220..1dc1273bea5 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -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-06-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index b3dffdcb9df..bd3f02d4327 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index c5679cae334..d952853a48c 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index 18195793da1..36646e6da95 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/i18n/es_DO.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 86928b961f8..2d58b858199 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 585c4b662f0..855f1cf6d7a 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/i18n/es_MX.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index fd399a8a8e1..65ae6f2cb5e 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index d6845a38ef6..c299f80c177 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index 7c83c85a17c..73158639d84 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index 308968767ca..1adca2a8b35 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index a48a3744135..22b3e5bfb22 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/i18n/fr_CA.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 69d445af32a..c318faddb6d 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index 89bd792dc59..fc52063051a 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/i18n/gu.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index e34e99163b6..442a6ee0f68 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index ce74becfadd..debe72dec62 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 4922d58390e..a1c11722a53 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index d59fa62dcba..a7229a96610 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -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-11-25 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index f2cc05f9183..53eb0191d71 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index 9b61682bc59..ae53ffd0af0 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/i18n/ko.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index efd96c00235..ea99c4b0d27 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index 2ed3418a38d..b67e1605a1b 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/i18n/mk.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index a0bca62503a..d921e677056 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -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-06-26 06:18+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index 3db66bb3e81..06e81bba83c 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/i18n/nb.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 7bb4bb97695..93490b531aa 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:38+0000\n"
 "PO-Revision-Date: 2013-03-08 09:37+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index 51067848146..7809f7de21a 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index bcbcb32f6f9..b17e57476ec 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index f89824750ab..76adf320ef5 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -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-08-15 05:51+0000\n"
-"X-Generator: Launchpad (build 16723)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index 02cb8a51738..ba13a9a588e 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.po
@@ -10,13 +10,13 @@ msgstr ""
 "POT-Creation-Date: 2013-06-07 19:38+0000\n"
 "PO-Revision-Date: 2013-09-19 04:22+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-20 06:01+0000\n"
-"X-Generator: Launchpad (build 16765)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index f21e652ca6a..1e162633238 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index a5a5c5bcd07..cf0b6f8ede4 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index b2dba9a3eca..63f9bee1ee1 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index 625d521eb14..f75829f3198 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index 52fbd2b36ed..91a1229877f 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -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-11-02 06:23+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index 52fbd516d8d..648d78ecd1f 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/i18n/th.po
@@ -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-06-20 06:35+0000\n"
-"X-Generator: Launchpad (build 16673)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index 88158b24cae..b27a20e3765 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -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-07-12 06:35+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index 74811d0ec06..0617c4ffbd5 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:38+0000\n"
 "PO-Revision-Date: 2013-06-23 13:53+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-24 05:26+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index b7aaad8fe23..91a045be0b2 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_tests/i18n/cs.po b/addons/web_tests/i18n/cs.po
index 41991f03c72..94d3626edb4 100644
--- a/addons/web_tests/i18n/cs.po
+++ b/addons/web_tests/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_tests/i18n/es.po b/addons/web_tests/i18n/es.po
index 83fbb76d4fa..59b438ae8a7 100644
--- a/addons/web_tests/i18n/es.po
+++ b/addons/web_tests/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-05 06:13+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_tests/i18n/es_CR.po b/addons/web_tests/i18n/es_CR.po
index 5ad25b5cd03..5ffc582733a 100644
--- a/addons/web_tests/i18n/es_CR.po
+++ b/addons/web_tests/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_tests/i18n/fr_CA.po b/addons/web_tests/i18n/fr_CA.po
index 377ca611d24..e98fa97f9b1 100644
--- a/addons/web_tests/i18n/fr_CA.po
+++ b/addons/web_tests/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-29 07:58+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index a8b1dab903f..60aac883f77 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/bs.po b/addons/web_view_editor/i18n/bs.po
index 5a4dda88e14..dde8d4fe18d 100644
--- a/addons/web_view_editor/i18n/bs.po
+++ b/addons/web_view_editor/i18n/bs.po
@@ -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-09-06 06:07+0000\n"
-"X-Generator: Launchpad (build 16760)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index b84e1081d4c..a2a8342e050 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.po
@@ -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-07-14 05:59+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/da.po b/addons/web_view_editor/i18n/da.po
index 5bd567b190d..902e82395a1 100644
--- a/addons/web_view_editor/i18n/da.po
+++ b/addons/web_view_editor/i18n/da.po
@@ -14,64 +14,64 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n"
-"X-Generator: Launchpad (build 16753)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:164
 #, python-format
 msgid "The following fields are invalid :"
-msgstr ""
+msgstr "Følgende felter er ugyldige :"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:63
 #, python-format
 msgid "Create"
-msgstr ""
+msgstr "Opret"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:994
 #, python-format
 msgid "New Field"
-msgstr ""
+msgstr "Nyt felt"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:387
 #, python-format
 msgid "Do you really wants to create an inherited view here?"
-msgstr ""
+msgstr "Vil du virkelig oprette en nedarvet visning her?"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:397
 #, python-format
 msgid "Preview"
-msgstr ""
+msgstr "Eksempel"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:183
 #, python-format
 msgid "Do you really want to remove this view?"
-msgstr ""
+msgstr "Vil du virkelig slette denne visning"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:90
 #, python-format
 msgid "Save"
-msgstr ""
+msgstr "Gem"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:394
 #, python-format
 msgid "Select an element"
-msgstr ""
+msgstr "Vælg et element"
 
 #. module: web_view_editor
 #. openerp-web
@@ -79,28 +79,28 @@ msgstr ""
 #: code:addons/web_view_editor/static/src/js/view_editor.js:962
 #, python-format
 msgid "Update"
-msgstr ""
+msgstr "Opdater"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:264
 #, python-format
 msgid "Please select view in list :"
-msgstr ""
+msgstr "Vælg visning fra listen:"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:37
 #, python-format
 msgid "Manage Views (%s)"
-msgstr ""
+msgstr "Håndter Visninger (%s)"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:13
 #, python-format
 msgid "Manage Views"
-msgstr ""
+msgstr "Håndtér visninger"
 
 #. module: web_view_editor
 #. openerp-web
@@ -108,56 +108,56 @@ msgstr ""
 #: code:addons/web_view_editor/static/src/js/view_editor.js:959
 #, python-format
 msgid "Properties"
-msgstr ""
+msgstr "Egenskaber"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:64
 #, python-format
 msgid "Edit"
-msgstr ""
+msgstr "Rediger"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:14
 #, python-format
 msgid "Could not find current view declaration"
-msgstr ""
+msgstr "Kunne ikke finde nuværende visningsdeklaration"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:383
 #, python-format
 msgid "Inherited View"
-msgstr ""
+msgstr "Nedarvet visning"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:65
 #, python-format
 msgid "Remove"
-msgstr ""
+msgstr "Fjern"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:517
 #, python-format
 msgid "Do you really want to remove this node?"
-msgstr ""
+msgstr "Vil du virkelig fjerne dette led?"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:391
 #, python-format
 msgid "Can't Update View"
-msgstr ""
+msgstr "Visning kan ikke opdateres"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:380
 #, python-format
 msgid "View Editor %d - %s"
-msgstr ""
+msgstr "Visning Editor %d - %s"
 
 #. module: web_view_editor
 #. openerp-web
@@ -166,7 +166,7 @@ msgstr ""
 #: code:addons/web_view_editor/static/src/js/view_editor.js:982
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Annuller"
 
 #. module: web_view_editor
 #. openerp-web
@@ -174,11 +174,11 @@ msgstr ""
 #: code:addons/web_view_editor/static/src/js/view_editor.js:414
 #, python-format
 msgid "Close"
-msgstr ""
+msgstr "Luk"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:88
 #, python-format
 msgid "Create a view (%s)"
-msgstr ""
+msgstr "Opret en visning (%s)"
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index fa94f0118e0..0de186afd19 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/i18n/de.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index 47fea62de6b..52764ee58d4 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_GB.po b/addons/web_view_editor/i18n/en_GB.po
index 33280d93494..47965a76242 100644
--- a/addons/web_view_editor/i18n/en_GB.po
+++ b/addons/web_view_editor/i18n/en_GB.po
@@ -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-09-15 06:11+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index add01ebc886..b95898ff049 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index 4a554f37387..9f76778c709 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/i18n/es_DO.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index 4d677bc4fd9..3020aa7abb4 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index 09bec4c69e6..2afcbd1060f 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/i18n/es_MX.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index cf45a5a3db1..43f8899be7a 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index bc102be8846..1ba77ffe58e 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index 35bbde495b0..cc532aff4c0 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index 1b3c963b332..1df817647e6 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index 49838f4d545..85eaa7a68cf 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 71c2ad8844e..b48118c6f8a 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index 2d83dc42301..256bca76530 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index 92d7c3bedc2..663bdb71d75 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/i18n/ko.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index 565f4fe0f51..6a6b6fee1bf 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index 08fe13e56ed..dedbcd58ffc 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/i18n/lv.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index 304dea663ea..b17a2d42388 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/i18n/mk.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index 52807b7e01b..e546c10c493 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/i18n/mn.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index 5ce992e1e33..3ca64f99754 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/i18n/nb.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index c339f47a6b3..7f071f5a6b3 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -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-11-27 05:39+0000\n"
-"X-Generator: Launchpad (build 16845)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index 6b9e2f2872f..bc0e620bdad 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/i18n/nl_BE.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index 8f0e2cf6d1e..4d862971425 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 35b7baafc8a..ff1cf019dec 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index fb6e3880d01..1df94bff99a 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/i18n/pt_BR.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index c76c6b7a467..f0e7748d45c 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:38+0000\n"
-"PO-Revision-Date: 2013-04-09 04:30+0000\n"
+"PO-Revision-Date: 2013-12-18 18:06+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
@@ -136,7 +136,7 @@ msgstr "Vizualizare moștenită"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:65
 #, python-format
 msgid "Remove"
-msgstr "Elimină"
+msgstr "Eliminaţi"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index 3b5c30fc1f8..8873d8ddf7d 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index 273b00f9dc4..7e617a0a544 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.po
@@ -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-06-08 07:51+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sv.po b/addons/web_view_editor/i18n/sv.po
index f7c90386bb8..237f6a74075 100644
--- a/addons/web_view_editor/i18n/sv.po
+++ b/addons/web_view_editor/i18n/sv.po
@@ -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-11-02 06:23+0000\n"
-"X-Generator: Launchpad (build 16820)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index 2b9a215cb88..7e65c8ce724 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/i18n/th.po
@@ -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-06-20 06:35+0000\n"
-"X-Generator: Launchpad (build 16673)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index fe7e8e0f336..7c6369c2c34 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -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-07-12 06:35+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index ff0d36e9047..dbf675626dc 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:38+0000\n"
 "PO-Revision-Date: 2013-06-23 14:01+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-24 05:26+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-12-19 06:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web

From 40994c2966cd9f77fa45d396f1004aaf5d4c90e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Dec 2013 10:57:29 +0100
Subject: [PATCH 501/547] [FIX] mass_mailing: when creating a new wave from the
 mass mailing campaign kanban view, add the campaign in default

bzr revid: tde@openerp.com-20131219095729-k5tsvmkqm2mdsnza
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index ac313dea78b..b2b48fb8618 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -75,6 +75,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="context">{'default_mass_mailing_campaign_id': active_id}</field>
         </record>
 
     </data>

From 803068808425a89e2e1351218b5833cc72a0c947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Dec 2013 11:00:41 +0100
Subject: [PATCH 502/547] [FIX] mass_mailing: opening the composer when sending
 a new wave should not have the res_id linked to the campaign. As we are
 working with mass mailing, it should be False; ids will come from active_ids
 / active_domain.

bzr revid: tde@openerp.com-20131219100041-85mbafgk05u8naud
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
index 4359d6c3e7b..0944e89f1de 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
@@ -117,6 +117,7 @@ class MailMassMailingCreate(osv.TransientModel):
             'default_use_mass_mailing_campaign': True,
             'default_use_active_domain': True,
             'default_model': wizard.model_id.model,
+            'default_res_id': False,
             'default_active_domain': wizard.domain,
             'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
             'default_mass_mailing_id': wizard.mass_mailing_id.id,

From aa81e66039faf8959bbe1ebe593f0c11470bac66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Dec 2013 13:31:28 +0100
Subject: [PATCH 503/547] [FIX] project_issue_sheet: worklog responsible should
 be the current user and not the issue responsible user

bzr revid: tde@openerp.com-20131219123128-u0nmoait1cysjgv3
---
 addons/project_issue_sheet/project_issue_sheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 4911cac8f25..6d813b44239 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -19,7 +19,7 @@
                 </field>
                 <xpath expr="//notebook/page[@string='Extra Info']" position="before">
                     <page string="Worklogs">
-                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}"
+                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : uid, 'default_account_id' : analytic_account_id}"
                                 groups="base.group_user">
                             <tree editable="top" string="Timesheets">
                                 <field name="name"/>

From ecb223da043849d0d9ce5110a5d9dffbe8c45e0d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 19 Dec 2013 14:09:01 +0100
Subject: [PATCH 504/547] [FIX] hr: merge of views Leave Request & Allocation
 request, as they are allmost similar.

Moreover, before this fix, when you clicked on an allocation request from a mail.message (for instance, from the messaging inbox page), you were not redirected to the right view: You were redirected to the view of Leave request instead of Allocation request.

bzr revid: dle@openerp.com-20131219130901-nxciudhsacru2tmb
---
 addons/hr_holidays/hr_holidays_view.xml | 85 +++++++------------------
 1 file changed, 22 insertions(+), 63 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3064eda5ab1..af20d727fc8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -47,61 +47,14 @@
             </field>
         </record>
 
-        <record id="edit_holiday_new" model="ir.ui.view">
+        <!-- Holidays: Allocation Request -->
+        <record model="ir.ui.view" id="edit_holiday_new">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
-            <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Leave Request" version="7.0">
                 <field name="can_reset" invisible="1"/>
-                <header>
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Reset to Draft" name="reset" type="workflow"
-                            attrs="{'invisible': ['|', ('can_reset', '=', False), ('state', 'not in', ['confirm', 'refuse'])]}"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                </header>
-                <sheet string="Leave Request">
-                    <group>
-                        <group>
-                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
-                            <label for="number_of_days_temp" string="Duration" help="The default duration interval between the start date and the end date is 8 hours.  Feel free to adapt it to your needs."/>
-                            <div>
-                                <group col="3">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
-                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
-                                </group>
-                                <div>
-                                    <field name="number_of_days_temp" class="oe_inline"/> days
-                                </div>
-                            </div>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
-                        </group>
-                        <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type, employee_id)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                        </group>
-                    </group>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- Holidays: Allocation Request -->
-        <record model="ir.ui.view" id="allocation_leave_new">
-            <field name="name">Allocation Request</field>
-            <field name="model">hr.holidays</field>
-            <field name="arch" type="xml">
-                <form string="Allocation Request" version="7.0">
-                <field name="can_reset" invisible="1"/>
+                <field name="type" invisible="1"/>
                 <header>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
@@ -114,21 +67,27 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')], 'required': [('type', '=', 'add')]}"/>
                             <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
-                            <label for="number_of_days_temp"/>
+                                <label for="number_of_days_temp" string="Duration"/>
                             <div>
-                                <field name="number_of_days_temp" class="oe_inline"/> days
+                                <group col="3" attrs="{'invisible': [('type', '=', 'add')]}">
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
+                                </group>
+                                <div>
+                                    <field name="number_of_days_temp" class="oe_inline"/> days
+                                </div>
                             </div>
                         </group>
                         <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')]}"/>
-                            <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('type', '=', 'remove'),('state','!=','draft')]}" string="Mode" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly': [('type', '=', 'remove'),('state','!=','draft'), ('state','!=','confirm')], 'invisible':[('holiday_type','=','employee')]}"/>
+                            <field name="department_id" attrs="{'readonly':['|', ('type','=','add'),('holiday_type','=','category')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
-                    <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
+                    <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..." attrs="{'invisible': [('type', '=', 'remove')]}"/>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
@@ -231,7 +190,7 @@
         <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
-            <field name="name">Leave Requests</field>
+            <field name="name">Leave Request</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
@@ -305,7 +264,7 @@
             <field name="view_type">form</field>
             <field name="context">{'default_type':'add', 'search_default_my_leaves':1}</field>
             <field name="domain">[('type','=','add')]</field>
-            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="view_id" ref="edit_holiday_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
@@ -319,7 +278,7 @@
         <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="view_id" ref="edit_holiday_new"/>
             <field name="act_window_id" ref="open_allocation_holidays"/>
         </record>
 
@@ -331,7 +290,7 @@
             <field name="view_type">form</field>
             <field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
             <field name="domain">[('type','=','add')]</field>
-            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="view_id" ref="edit_holiday_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
@@ -345,7 +304,7 @@
         <record model="ir.actions.act_window.view" id="action_request_approve_allocation_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="view_id" ref="edit_holiday_new"/>
             <field name="act_window_id" ref="request_approve_allocation"/>
         </record>
 

From 60123bebbe094002e0f875df0ee7835c38ec587f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Dec 2013 14:28:39 +0100
Subject: [PATCH 505/547] [FIX] note: fixed note creation. When creating a new
 note, a function field requires to browse the note in order to get the
 stages. However the basic rule for creating a note is to be in the followers.
 As followers is another field set during the creation, we are not sure uid is
 already in the followers of the note when reading it. We therefore do it as
 SUPERUSER_ID, because it is only to have access to some technical data of the
 note.

bzr revid: tde@openerp.com-20131219132839-m0a5rv0znhliqbq1
---
 addons/note/note.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 00c67c37191..fe917531472 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -84,9 +84,10 @@ class note_note(osv.osv):
         return ids and ids[0] or False
 
     def _set_stage_per_user(self, cr, uid, id, name, value, args=None, context=None):
-        note = self.browse(cr, uid, id, context=context)
-        if not value: return False
-        stage_ids = [value] + [stage.id for stage in note.stage_ids if stage.user_id.id != uid ]
+        if not value:
+            return False
+        note = self.browse(cr, SUPERUSER_ID, id, context=context)  # do it as SUPERUSER because when creating, followers are not necessariliry set (another function field)
+        stage_ids = [value] + [stage.id for stage in note.stage_ids if stage.user_id.id != uid]
         return self.write(cr, uid, [id], {'stage_ids': [(6, 0, set(stage_ids))]}, context=context)
 
     def _get_stage_per_user(self, cr, uid, ids, name, args, context=None):

From 31e41c30155c111c4b4c55a378dee1cc7c3ce24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Dec 2013 14:47:33 +0100
Subject: [PATCH 506/547] [CLEAN] kanban: added some forgotten spaces

bzr revid: tde@openerp.com-20131219134733-e0aqknw29gfpm2fr
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index a8877f53fb4..776c2bc3b63 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -350,7 +350,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         var self = this;
         if (this.group_by) {
             // Kanban cards drag'n'drop
-            var prev_widget,is_folded,record;
+            var prev_widget, is_folded, record;
             var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_folded_column_cards');
             $columns.sortable({
                 handle : '.oe_kanban_draghandle',

From f0f710047c3b0b0d19ad3dc453562f086eeff758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Dec 2013 14:50:54 +0100
Subject: [PATCH 507/547] [CLEAN] kanban: cleaned added code

bzr revid: tde@openerp.com-20131219135054-3qcaxkh1j9f6i3bu
---
 addons/web_kanban/static/src/js/kanban.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 776c2bc3b63..5aed681f5f6 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -362,7 +362,9 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                     });
                     record = ui.item.data('widget');
                     record.$el.bind('mouseup',function(ev,ui){
-                        if(is_folded)record.$el.hide();
+                        if (is_folded) {
+                            record.$el.hide();
+                        }
                         record.$el.unbind('mouseup');
                     })
                     ui.placeholder.height(ui.item.height());
@@ -371,7 +373,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                     var parent = $(event.target).parent();
                     prev_widget.highlight(false);
                     is_folded = parent.hasClass('oe_kanban_group_folded'); 
-                    if(is_folded){
+                    if (is_folded) {
                         var widget = parent.data('widget');
                         widget.highlight(true);
                         prev_widget = widget;
@@ -454,7 +456,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             this.dataset.write(record.id, data, {}).done(function() {
                 record.do_reload();
                 new_group.do_save_sequences();
-                if(new_group.state.folded){
+                if (new_group.state.folded) {
                     new_group.do_action_toggle_fold();
                     record.prependTo(new_group.$records.find('.oe_kanban_column_cards'));
                 }

From 8b3312e1f65289bf5ac9a62f078c7927b30237a1 Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@openerp.com>
Date: Thu, 19 Dec 2013 15:55:28 +0100
Subject: [PATCH 508/547] [FIX] l10n_be: fix no value in 'Code (Tax Code)'
 column on 'Print VAT Intra' preview report

bzr revid: xal@openerp.com-20131219145528-ppndys5c1jryefgk
---
 addons/l10n_be/wizard/l10n_be_vat_intra_print.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
index ff1a2c2064d..a782b98621a 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
@@ -105,7 +105,7 @@
             <para style="terp_default_9">[[ l['vat'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ l['code'] (l['intra_code']) ]]</para>
+            <para style="terp_default_9">[[ u'%s (%s)' % (l['code'], l['intra_code']) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l['amount'], currency_obj=company.currency_id) ]]</para>

From d7b1dafbab95aa6b3ba8dc3fa9d3f7cd588e2ca7 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 19 Dec 2013 17:03:45 +0100
Subject: [PATCH 509/547] [FIX] stock: warehouse manager impliying account
 invoicing group is enough (no need to be accountant)

bzr revid: dle@openerp.com-20131219160345-jj68pdnkqjxm1f2o
---
 addons/stock/security/stock_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index e51f20c67c9..aaf4333ece7 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -10,7 +10,7 @@
     <record id="group_stock_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_warehouse_management"/>
-        <field name="implied_ids" eval="[(4, ref('group_stock_user')), (4, ref('account.group_account_user'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_stock_user')), (4, ref('account.group_account_invoice'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 

From 55221c4f2f4315673d1eadfa0d214d61a5000ecd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 20 Dec 2013 05:11:17 +0000
Subject: [PATCH 510/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131220051117-xo0f99jx4i5kjl2l
---
 addons/account/i18n/ru.po |   13 +-
 addons/fleet/i18n/lo.po   | 1912 +++++++++++++++++++++++++++++++++++++
 2 files changed, 1922 insertions(+), 3 deletions(-)
 create mode 100644 addons/fleet/i18n/lo.po

diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 28d04731c8e..3fd95d491f4 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-07-02 06:32+0000\n"
+"PO-Revision-Date: 2013-12-19 08:06+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:32+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:11+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -184,6 +184,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Щелкните, чтобы добавить отчетный период.\n"
+"              </p><p>\n"
+"               Отчетный период как правило - месяц или квартал .\n"
+"               Обычно он соответствует периодам налоговой декларации.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
diff --git a/addons/fleet/i18n/lo.po b/addons/fleet/i18n/lo.po
new file mode 100644
index 00000000000..bb3d220ffbe
--- /dev/null
+++ b/addons/fleet/i18n/lo.po
@@ -0,0 +1,1912 @@
+# Lao translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-19 15:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:11+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Group By..."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:669
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:740
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver_id:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state_id:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state_id:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand_id:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver_id:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""

From e6a46a855d86cbd977cd0ce3f6f1d1f207c39e42 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 20 Dec 2013 05:34:13 +0000
Subject: [PATCH 511/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
---
 addons/account_analytic_analysis/i18n/tr.po   |    8 +-
 addons/account_analytic_plans/i18n/tr.po      |   18 +-
 addons/account_test/i18n/tr.po                |   14 +-
 .../analytic_contract_hr_expense/i18n/tr.po   |   10 +-
 addons/auth_signup/i18n/de.po                 |    8 +-
 addons/fleet/i18n/lo.po                       | 1930 +++++++++++++++++
 addons/hr_contract/i18n/tr.po                 |    8 +-
 addons/mrp/i18n/de.po                         |    9 +-
 addons/portal_project/i18n/de.po              |   10 +-
 addons/product/i18n/de.po                     |   14 +-
 addons/purchase/i18n/de.po                    |   16 +-
 11 files changed, 1987 insertions(+), 58 deletions(-)
 create mode 100644 addons/fleet/i18n/lo.po

diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 0c284d4a767..67216475a40 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-28 13:11+0000\n"
+"PO-Revision-Date: 2013-12-19 20:53+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-29 05:29+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: tr\n"
 
 #. module: account_analytic_analysis
@@ -274,7 +274,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr "Faturalanacak Bir şey yok, oluiştur"
+msgstr "Faturalanacak Bir şey yok, oluştur"
 
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 84170284479..505bf7c7ee1 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-02-06 11:06+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"PO-Revision-Date: 2013-12-19 21:07+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: tr\n"
 
 #. module: account_analytic_plans
@@ -207,7 +207,7 @@ msgstr "Yüzde(%)"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr "Günlük maddeleri"
+msgstr "Yevmiye Kalemleri"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
@@ -311,7 +311,7 @@ msgstr "Hesap6 No"
 #: view:account.crossovered.analytic:0
 #: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
-msgstr "Analitik Günlük"
+msgstr "Analitik Yevmiye"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
@@ -342,21 +342,21 @@ msgstr "Kod"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr "Günlük"
+msgstr "Yevmiye"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr "'%s' Günlüğünde bir analitik günlük tanımlamalısınız!"
+msgstr "'%s' Yevmiyede bir analitik yevmiye tanımlamalısınız!"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Analitik günlük yok !"
+msgstr "Analitik Yevmiye Yok !"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
diff --git a/addons/account_test/i18n/tr.po b/addons/account_test/i18n/tr.po
index 7347832ba26..a3971e3e66e 100644
--- a/addons/account_test/i18n/tr.po
+++ b/addons/account_test/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-02-19 07:23+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2013-12-19 20:22+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: account_test
 #: view:accounting.assert.test:0
@@ -189,7 +189,7 @@ msgstr "Test 5.1 : Uzlaştırılmış faturaların Borç ve Alacak hesap kaleml
 #. module: account_test
 #: field:accounting.assert.test,code_exec:0
 msgid "Python code"
-msgstr "Piton kodu"
+msgstr "Python kodu"
 
 #. module: account_test
 #: model:accounting.assert.test,desc:account_test.account_test_07
@@ -247,7 +247,7 @@ msgstr ""
 #. module: account_test
 #: view:accounting.assert.test:0
 msgid "Python Code"
-msgstr "Piton Kodu"
+msgstr "Python Kodu"
 
 #. module: account_test
 #: model:ir.actions.act_window,help:account_test.action_accounting_assert
@@ -275,7 +275,7 @@ msgstr "Hesap hareketlerindeki genel hesapları ve paydaşları denetleyin"
 #. module: account_test
 #: model:accounting.assert.test,name:account_test.account_test_06_1
 msgid "Test 7: « View  » account type"
-msgstr "Test 7: « View  » hesap türü"
+msgstr "Test 7: « Görünüm  » hesap türü"
 
 #. module: account_test
 #: view:accounting.assert.test:0
diff --git a/addons/analytic_contract_hr_expense/i18n/tr.po b/addons/analytic_contract_hr_expense/i18n/tr.po
index a180d1742e0..67d120ae704 100644
--- a/addons/analytic_contract_hr_expense/i18n/tr.po
+++ b/addons/analytic_contract_hr_expense/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-20 18:15+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2013-12-19 20:43+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -87,7 +87,7 @@ msgstr "Faturalanacak Giderlerin Tahmini"
 #. module: analytic_contract_hr_expense
 #: field:account.analytic.account,charge_expenses:0
 msgid "Charge Expenses"
-msgstr "Hesaba geçirilen giderler"
+msgstr "Tahsil Edilecek Giderler"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po
index 4a161edc6d9..3b8e0935a55 100644
--- a/addons/auth_signup/i18n/de.po
+++ b/addons/auth_signup/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-26 17:58+0000\n"
+"PO-Revision-Date: 2013-12-19 17:25+0000\n"
 "Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -135,7 +135,7 @@ msgstr "Status"
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Never Connected"
-msgstr ""
+msgstr "Noch nie angemeldet"
 
 #. module: auth_signup
 #. openerp-web
diff --git a/addons/fleet/i18n/lo.po b/addons/fleet/i18n/lo.po
new file mode 100644
index 00000000000..db1bd5c3e4a
--- /dev/null
+++ b/addons/fleet/i18n/lo.po
@@ -0,0 +1,1930 @@
+# Lao translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-19 15:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Group By..."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Write here any other information"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:669
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:740
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver_id:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Write here any other information related to the service completed."
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state_id:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state_id:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand_id:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver_id:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new odometer log. \n"
+"              </p>\n"
+"              <p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Write here all other information relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 5fe831bcccc..bd044a23057 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-08-04 16:32+0000\n"
+"PO-Revision-Date: 2013-12-19 20:33+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -140,7 +140,7 @@ msgstr "Notlar"
 #. module: hr_contract
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr "İş İzin No"
+msgstr "Çalışma İzin No"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 65489bd9184..d2f51ccc32f 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-03-21 00:09+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-12-19 17:23+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:20+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
diff --git a/addons/portal_project/i18n/de.po b/addons/portal_project/i18n/de.po
index a2c69e168cb..8a1650c1524 100644
--- a/addons/portal_project/i18n/de.po
+++ b/addons/portal_project/i18n/de.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-19 17:01+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: portal_project
 #: model:ir.model,name:portal_project.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekte"
 
 #. module: portal_project
 #: model:ir.actions.act_window,help:portal_project.open_view_project
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 8ce3430c8a1..1e429451e08 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-12-02 19:34+0000\n"
-"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
+"PO-Revision-Date: 2013-12-19 17:29+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-03 06:16+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: de\n"
 
 #. module: product
@@ -38,7 +38,7 @@ msgstr "Basis Preis zur Berechnung"
 #: help:product.product,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
-"Dieses ist die minimale Menge die beim Lieferanten eingekauft werden kann."
+"Das ist die Mindestbestellmenge für den Einkauf beim Hauptlieferanten."
 
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
@@ -66,7 +66,7 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
-"Diese Preisliste wird anstelle der Standard Preisliste zur Abrechnung an den "
+"Diese Preisliste wird anstelle der Standard-Preisliste beim Verkauf an den "
 "aktuellen Partner genutzt."
 
 #. module: product
@@ -92,7 +92,7 @@ msgstr "Basispreise"
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr "Regel Bezeichnung"
+msgstr "Regelbezeichnung"
 
 #. module: product
 #: help:product.template,list_price:0
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 238b5efb3ba..0e7209a9da5 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-18 08:50+0000\n"
-"Last-Translator: Armin GREGOR <armin.gregor@gmail.com>\n"
+"PO-Revision-Date: 2013-12-19 17:05+0000\n"
+"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:31+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -30,7 +30,7 @@ msgstr "account.config.settings"
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr "Monatliche Einkäufe je Kategorie"
+msgstr "Monatliche Bestellungen nach Kategorie"
 
 #. module: purchase
 #: help:purchase.config.settings,module_warning:0
@@ -970,7 +970,7 @@ msgstr "wird erstellt, um Sub-Auftrag zu vergeben"
 #: model:ir.ui.menu,name:purchase.menu_purchase_config
 #: view:res.partner:0
 msgid "Purchases"
-msgstr "Einkäufe"
+msgstr "Einkauf"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1474,7 +1474,7 @@ msgstr "Anschaffungspreis aus Durchschnittspreisen errechnen lassen"
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
 #: view:purchase.config.settings:0
 msgid "Configure Purchases"
-msgstr "Konfiguriere Bestellungen"
+msgstr "Konfiguriere Einkauf"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1787,7 +1787,7 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
-"Diese Preisliste wird anstelle der Standard Preisliste für Einkäufe beim "
+"Diese Preisliste wird anstelle der Standard-Preisliste für Einkäufe beim "
 "aktuellen Partner verwendet."
 
 #. module: purchase

From 73dfa69e34feef8629ece89ea74ad82eb42b3c5d Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@openerp.com>
Date: Fri, 20 Dec 2013 10:18:23 +0100
Subject: [PATCH 512/547] [FIX] project: fix task progress not correctly
 updated when reopening a task

bzr revid: xal@openerp.com-20131220091823-o9uvvlo6hdh4xukw
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 7f56b573ebb..8487006f8b6 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -808,7 +808,7 @@ class task(base_stage, osv.osv):
             }),
         'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
             store = {
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours', 'state', 'stage_id'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference between planned hours by the project manager and the total hours of the task.",

From 8fa229061a41620fc51085b7ec5ccf40ce4f73d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Dec 2013 10:26:44 +0100
Subject: [PATCH 513/547] [IMP] hr_recruitment: sending an email based on the
 template of the stage is now done using the composer, therefore using
 message_post and all processing required. Next step is to factorize that code
 to be able to use it directly with one call.

bzr revid: tde@openerp.com-20131220092644-72uf3jpxn80u1ymq
---
 addons/hr_recruitment/hr_recruitment.py | 45 ++++++++++++++++---------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index df6a0d0e7fd..e12efdabb58 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -258,16 +258,6 @@ class hr_applicant(osv.Model):
     _group_by_full = {
         'stage_id': _read_group_stage_ids
     }
-    
-    def _get_mail_template(self, cr, uid, ids, template, context):
-        mail_obj = self.pool.get('mail.mail')
-        assert template._name == 'email.template'
-        for applications in self.browse(cr, uid, ids, context):
-            if applications.email_from:
-                mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, applications.id, True, context=context)
-                mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context)
-                if mail_state and mail_state['state'] == 'exception':
-                    raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context)
 
     def onchange_job(self, cr, uid, ids, job_id=False, context=None):
         if job_id:
@@ -406,20 +396,45 @@ class hr_applicant(osv.Model):
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
+        res = True
+
         # user_id change: update date_start
         if vals.get('user_id'):
             vals['date_start'] = fields.datetime.now()
         # stage_id: track last stage before update
         if 'stage_id' in vals:
             vals['date_last_stage_update'] = fields.datetime.now()
-            stage_obj = self.pool.get('hr.recruitment.stage').browse(cr, uid, vals.get('stage_id'), context=context)
-            if stage_obj and stage_obj.template_id:
-                self._get_mail_template(cr, uid, ids, stage_obj.template_id, context)
             for applicant in self.browse(cr, uid, ids, context=None):
                 vals['last_stage_id'] = applicant.stage_id.id
                 res = super(hr_applicant, self).write(cr, uid, [applicant.id], vals, context=context)
-            return res
-        return super(hr_applicant, self).write(cr, uid, ids, vals, context=context)
+        else:
+            res = super(hr_applicant, self).write(cr, uid, ids, vals, context=context)
+
+        # post processing: if stage changed, post a message in the chatter
+        if vals.get('stage_id'):
+            stage = self.pool['hr.recruitment.stage'].browse(cr, uid, vals['stage_id'], context=context)
+            if stage.template_id:
+                # TDENOTE: probably factorize me in a message_post_with_template generic method FIXME
+                compose_ctx = dict(context,
+                                   active_ids=ids)
+                compose_id = self.pool['mail.compose.message'].create(
+                    cr, uid, {
+                        'model': self._name,
+                        'composition_mode': 'mass_mail',
+                        'template_id': stage.template_id.id,
+                        'same_thread': True,
+                        'post': True,
+                        'notify': True,
+                    }, context=compose_ctx)
+                self.pool['mail.compose.message'].write(
+                    cr, uid, [compose_id],
+                    self.pool['mail.compose.message'].onchange_template_id(
+                        cr, uid, [compose_id],
+                        stage.template_id.id, 'mass_mail', self._name, False,
+                        context=compose_ctx)['value'],
+                    context=compose_ctx)
+                self.pool['mail.compose.message'].send_mail(cr, uid, [compose_id], context=compose_ctx)
+        return res
 
     def create_employee_from_applicant(self, cr, uid, ids, context=None):
         """ Create an hr.employee from the hr.applicants """

From 4a55165597a9cfe931ef62aa6d29404ff1d671c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Dec 2013 10:27:56 +0100
Subject: [PATCH 514/547] [FIX] email_template: when sending email, process
 partner_to value also to convet it into a recipient_ids.

Hint: backport me into saas-2 or even 7.0

bzr revid: tde@openerp.com-20131220092756-o2qx54cjfq0qbsc9
---
 addons/email_template/email_template.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6e19b1eb8aa..3139d5bc14b 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -411,7 +411,16 @@ class email_template(osv.osv):
         # create a mail_mail based on values, without attachments
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
         assert values.get('email_from'), 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
-        del values['partner_to']  # TODO Properly use them.
+
+        # process partner_to field that is a comma separated list of partner_ids -> recipient_ids
+        # TDENOTE: should probably be done in saas / 7.0, FIXME
+        values['recipient_ids'] = []
+        partner_to = values.pop('partner_to', '')
+        if partner_to:
+            for partner_id in partner_to.split(','):
+                if partner_id:  # placeholders could generate '', 3, 2 due to some empty field values
+                    values['recipient_ids'].append((4, int(partner_id)))
+
         attachment_ids = values.pop('attachment_ids', [])
         attachments = values.pop('attachments', [])
         msg_id = mail_mail.create(cr, uid, values, context=context)
@@ -420,11 +429,11 @@ class email_template(osv.osv):
         # manage attachments
         for attachment in attachments:
             attachment_data = {
-                    'name': attachment[0],
-                    'datas_fname': attachment[0],
-                    'datas': attachment[1],
-                    'res_model': 'mail.message',
-                    'res_id': mail.mail_message_id.id,
+                'name': attachment[0],
+                'datas_fname': attachment[0],
+                'datas': attachment[1],
+                'res_model': 'mail.message',
+                'res_id': mail.mail_message_id.id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))

From 28a41dc80147ebae0317d26cb33ba248fe4dc2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Dec 2013 11:18:47 +0100
Subject: [PATCH 515/547] [IMP] hr_recruitment: improved approve/refuse
 templates

bzr revid: tde@openerp.com-20131220101847-a4ku8yst9ve8cf4y
---
 addons/hr_recruitment/hr_recruitment_data.xml | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 1675b092b3f..5e665bde848 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -17,42 +17,41 @@
         <field name="name">Interview</field>
     </record>
 
-<!-- Templates DATA for  refuse and approve -->
+    <!-- Templates for approval / refusing applicants -->
     <record id="email_template_refuse_applicant" model="email.template">
-        <field name="name">Refuse Application</field>
-        <field name="email_from">${user.email or ''}</field>
-        <field name="subject">We refuse your application</field>
+        <field name="name">Application refused</field>
+        <field name="subject">Application refused</field>
         <field name="email_to">${object.email_from}</field>
-        <field name="lang">${object.lang}</field>
+        <field name="partner_id">${object.partner_id and object.partner_id.id or ''}</field>
+        <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field eval="0" name="user_signature"/>
-        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
+        <field name="user_signature" eval="0"/>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
         <p>We thank you for your interest in our company and for your application.
-        Unfortunately, your profile does not match with our needs or our recruitment campaign has reached its term.</p>
+        Unfortunately, your profile does not match with our needs or our recruitment
+        campaign has reached its term.</p>
         <p>If you want more details, feel free to contact us by phone.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id.signature}
-        <br/>]]></field>
+         ${object.user_id and object.user_id.signature or ''}]]></field>
     </record>
 
     <record id="email_template_approve_applicant" model="email.template">
-        <field name="name">Interested in Application</field>
-        <field name="email_from">${user.email or ''}</field>
+        <field name="name">Application approved</field>
+        <field name="subject">Application approved</field>
         <field name="email_to">${object.email_from}</field>
-        <field name="subject">We are interested in your application</field>
-        <field name="lang">${object.lang}</field>
+        <field name="partner_id">${object.partner_id and object.partner_id.id or ''}</field>
+        <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field eval="0" name="user_signature"/>
-        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
+        <field name="user_signature" eval="0"/>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
         <p>Congrats! Your resume's got our interest!
         I will call you as soon as possible to make a 10 minutes phone interview and  plan a first meeting.</p>
         <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030
         If I do not answer, please let me a message with some schedules to call you back.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id.signature}
-        <br/>]]></field>
+         ${object.user_id.signature}]]></field>
     </record>
 
         <!--    HR Recruitment Source        -->

From 5ce340694e1ee12a057b709a3ac7f62a9a6a7be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Dec 2013 11:24:22 +0100
Subject: [PATCH 516/547] [FIX] email_template: fixed a test, partner_to is a
 list of ids, but not a python list

bzr revid: tde@openerp.com-20131220102422-holr2goxt823gt5x
---
 addons/email_template/tests/test_ir_actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/tests/test_ir_actions.py b/addons/email_template/tests/test_ir_actions.py
index d323ee36c1f..9b408a45316 100644
--- a/addons/email_template/tests/test_ir_actions.py
+++ b/addons/email_template/tests/test_ir_actions.py
@@ -33,7 +33,7 @@ class TestServerActionsEmail(TestServerActionsBase):
             'name': 'TestTemplate',
             'email_from': 'myself@example.com',
             'email_to': 'brigitte@example.com',
-            'partner_to': '[%s]' % self.test_partner_id,
+            'partner_to': '%s' % self.test_partner_id,
             'model_id': self.res_partner_model_id,
             'subject': 'About ${object.name}',
             'body_html': '<p>Dear ${object.name}, your parent is ${object.parent_id and object.parent_id.name or "False"}</p>',

From 9d885fecabe0f09b651eb87a3e7a08304810de31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Dec 2013 11:29:18 +0100
Subject: [PATCH 517/547] [CLEAN] hr_recruitment: cleaned code about
 attachments and tree view added in this branch: renamed the method + updated
 in views accordingly + simplified view + simplified onchange_job code

bzr revid: tde@openerp.com-20131220102918-yxn4aozi03hzlnsf
---
 addons/hr_recruitment/hr_recruitment.py       | 52 ++++++++-----------
 addons/hr_recruitment/hr_recruitment_view.xml |  7 +--
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e12efdabb58..8e1a51abc42 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -172,28 +172,11 @@ class hr_applicant(osv.Model):
                     duration = float(ans.days)
                     res[issue.id][field] = abs(float(duration))
         return res
-    
 
-    def attachment_tree_view(self, cr, uid, ids, context):
-        domain = ['&', ('res_model', '=', 'hr.applicant'), ('res_id', 'in', ids)]
-        res_id = ids and ids[0] or False
-        return {
-            'name': _('Attachments'),
-            'domain': domain,
-            'res_model': 'ir.attachment',
-            'type': 'ir.actions.act_window',
-            'view_id': False,
-            'view_mode': 'tree,form',
-            'view_type': 'form',
-            'limit': 80,
-            'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)
-        }
-
-    def _compute_attachments(self, cr, uid, ids, fields, args, context=None):
-        res = {}
-        attachment_pool = self.pool.get('ir.attachment')
-        for applicant in ids:
-            res[applicant] = attachment_pool.search_count(cr, uid, [('res_model', '=', 'hr.applicant'), ('res_id', '=', applicant)], context=context)
+    def _get_attachment_number(self, cr, uid, ids, fields, args, context=None):
+        res = dict.fromkeys(ids, 0)
+        for app_id in ids:
+            res[app_id] = self.pool['ir.attachment'].search_count(cr, uid, [('res_model', '=', 'hr.applicant'), ('res_id', '=', app_id)], context=context)
         return res
 
     _columns = {
@@ -240,9 +223,8 @@ class hr_applicant(osv.Model):
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
         'emp_id': fields.many2one('hr.employee', string='Employee', help='Employee linked to the applicant.'),
-        'attachment_number': fields.function(_compute_attachments, string='Number of Attachments', \
-                                 type="integer"),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
+        'attachment_number': fields.function(_get_attachment_number, string='Number of Attachments', type="integer"),
     }
 
     _defaults = {
@@ -260,13 +242,11 @@ class hr_applicant(osv.Model):
     }
 
     def onchange_job(self, cr, uid, ids, job_id=False, context=None):
+        department_id = False
         if job_id:
             job_record = self.pool.get('hr.job').browse(cr, uid, job_id, context=context)
-            if job_record and job_record.department_id:
-                return {'value': {'department_id': job_record.department_id.id}}
-            else:
-                return {'value': {'department_id': False}}
-        return {}
+            department_id = job_record and job_record.department_id and job_record.department_id.id or False
+        return {'value': {'department_id': department_id}}
 
     def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
         if not stage_id:
@@ -325,7 +305,7 @@ class hr_applicant(osv.Model):
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {
-            'default_partner_ids': applicant_ids or False,
+            'default_partner_ids': applicant_ids,
             'default_user_id': uid,
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,
@@ -351,6 +331,20 @@ class hr_applicant(osv.Model):
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
         return value
 
+    def action_get_attachment_tree_view(self, cr, uid, ids, context):
+        domain = ['&', ('res_model', '=', 'hr.applicant'), ('res_id', 'in', ids)]
+        return {
+            'name': _('Attachments'),
+            'domain': domain,
+            'res_model': 'ir.attachment',
+            'type': 'ir.actions.act_window',
+            'view_id': False,
+            'view_mode': 'tree,form',
+            'view_type': 'form',
+            'limit': 80,
+            'context': "{'default_res_model': '%s'}" % (self._name)
+        }
+
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
         recipients = super(hr_applicant, self).message_get_suggested_recipients(cr, uid, ids, context=context)
         for applicant in self.browse(cr, uid, ids, context=context):
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 46d56cebad7..bd90ccc9a45 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -83,7 +83,7 @@
                     <button name="action_print_survey" type="object"
                         string="Print Interview" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
-                    <button name="attachment_tree_view" string="Documents" type="object"/>
+                    <button name="action_get_attachment_tree_view" string="Documents" type="object"/>
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
@@ -295,10 +295,7 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
-                                    <a t-if="record.attachment_number.raw_value == 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachment_number"/> Document</a> 
-							
-                                    <a t-if="record.attachment_number.raw_value gt 1" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachment_number"/> Documents</a> 
-
+                                    <a t-if="record.attachment_number" name="action_get_attachment_tree_view" type="object" style="margin-right: 10px"> <field name="attachment_number"/> Documents</a> 
                                 </div>
                             
                             </div>

From abefabfa3e5f3efa523cc8b55fca9fb934c0891e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 20 Dec 2013 12:52:13 +0100
Subject: [PATCH 518/547] [FIX] mail: fix _get_default_from if no alias_name
 for user.

As alias_name is not anymore required, we should check that the alias_domain AND alias_name are set before choosing the alias as email_from of the mail.message

bzr revid: dle@openerp.com-20131220115213-ll8duh01csk0xy4t
---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index de8e4c68fda..b29642180e8 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -201,7 +201,7 @@ class mail_message(osv.Model):
 
     def _get_default_from(self, cr, uid, context=None):
         this = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
-        if this.alias_domain:
+        if this.alias_name and this.alias_domain:
             return '%s <%s@%s>' % (this.name, this.alias_name, this.alias_domain)
         elif this.email:
             return '%s <%s>' % (this.name, this.email)

From 4abd454e8e21132c199841815cffa35a59068e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Dec 2013 13:52:04 +0100
Subject: [PATCH 519/547] [FIX] hr_recruitment: email.template field is
 partner_to, not partner_id

bzr revid: tde@openerp.com-20131220125204-24xwn1jzo2nyiwzb
---
 addons/hr_recruitment/hr_recruitment_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 5e665bde848..59d1589e7ff 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -22,7 +22,7 @@
         <field name="name">Application refused</field>
         <field name="subject">Application refused</field>
         <field name="email_to">${object.email_from}</field>
-        <field name="partner_id">${object.partner_id and object.partner_id.id or ''}</field>
+        <field name="partner_to">${object.partner_id and object.partner_id.id or ''}</field>
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field name="user_signature" eval="0"/>
@@ -40,7 +40,7 @@
         <field name="name">Application approved</field>
         <field name="subject">Application approved</field>
         <field name="email_to">${object.email_from}</field>
-        <field name="partner_id">${object.partner_id and object.partner_id.id or ''}</field>
+        <field name="partner_to">${object.partner_id and object.partner_id.id or ''}</field>
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field name="user_signature" eval="0"/>

From f77aefc07ace66587bc13f7d2fa55755968437c5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 20 Dec 2013 15:45:21 +0100
Subject: [PATCH 520/547] [REF] gamification: cleaning methods and reports

bzr revid: mat@openerp.com-20131220144521-wyu1gx8bcitu6nk4
---
 addons/gamification/data/goal_base.xml        |  64 +++---
 addons/gamification/models/challenge.py       | 211 +++++++++++-------
 addons/gamification/models/goal.py            |   1 +
 addons/gamification/models/res_users.py       |  99 ++------
 .../static/src/css/gamification.css           |   6 +-
 .../static/src/js/gamification.js             |  55 +++--
 .../static/src/xml/gamification.xml           |  78 +++----
 .../templates/badge_received.mako             |  17 --
 addons/gamification/templates/base.mako       |  13 --
 .../templates/group_progress.mako             |  38 ----
 .../templates/personal_progress.mako          |  31 ---
 addons/gamification/templates/reminder.mako   |  17 --
 addons/gamification/views/challenge.xml       |   7 +-
 addons/gamification/views/goal.xml            |   2 +-
 14 files changed, 261 insertions(+), 378 deletions(-)
 delete mode 100644 addons/gamification/templates/badge_received.mako
 delete mode 100644 addons/gamification/templates/base.mako
 delete mode 100644 addons/gamification/templates/group_progress.mako
 delete mode 100644 addons/gamification/templates/personal_progress.mako
 delete mode 100644 addons/gamification/templates/reminder.mako

diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 2b21fbc947f..48dd770bbcc 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -7,7 +7,7 @@
             <field name="name">Set your Timezone</field>
             <field name="description">Configure your profile and specify your timezone</field>
             <field name="computation_mode">count</field>
-            <field name="display_mode">checkbox</field>
+            <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id','=',user.id),('partner_id.tz', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_users_my')" />
@@ -18,7 +18,7 @@
             <field name="name">Set your Company Data</field>
             <field name="description">Write some information about your company (specify at least a name)</field>
             <field name="computation_mode">count</field>
-            <field name="display_mode">checkbox</field>
+            <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', [user.id]), ('name', '=', 'Your Company')]</field>
             <field name="condition">lower</field>
@@ -29,7 +29,7 @@
         <record model="gamification.goal.definition" id="definition_base_company_logo">
             <field name="name">Set your Company Logo</field>
             <field name="computation_mode">count</field>
-            <field name="display_mode">checkbox</field>
+            <field name="display_mode">boolean</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user.id),('logo', '!=', False)]</field>
             <field name="action_id" eval="ref('base.action_res_company_form')" />
@@ -50,7 +50,7 @@
         <record model="gamification.goal.definition" id="definition_base_invite">
             <field name="name">Invite new Users</field>
             <field name="description">Create at least another user</field>
-            <field name="display_mode">checkbox</field>
+            <field name="display_mode">boolean</field>
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_users')" />
             <field name="domain">[('id', '!=', user.id)]</field>
@@ -146,24 +146,24 @@
         <th>Current</th>
         <th>Completeness</th>
     </tr>
-    % for goal in ctx["goals"]:
+    % for line in ctx["challenge_lines"]:
         <tr
-            % if goal.completeness >= 100:
+            % if line['completeness'] >= 100:
                 style="font-weight:bold;"
             % endif
             >
-            <td>${goal.definition_id.name}</td>
-            <td>${goal.target_goal}
-            % if goal.definition_suffix:
-                ${goal.definition_suffix}
+            <td>${line['name']}</td>
+            <td>${line['target']}
+            % if line['suffix']:
+                ${line['suffix']}
             % endif
             </td>
-            <td>${goal.current}
-            % if goal.definition_suffix:
-                ${goal.definition_suffix}
+            <td>${line['current']}
+            % if line['suffix']:
+                ${line['suffix']}
             % endif
             </td>
-            <td>${goal.completeness} %</td>
+            <td>${line['completeness']} %</td>
         </tr>
     % endfor
     </table>]]></field>
@@ -177,10 +177,10 @@
     </header>
     <p class="oe_grey">${object.report_header or ''}</p>
 
-    % for line in ctx['lines_boards']:
+    % for line in ctx["challenge_lines"]:
         <table width="100%" border="1">
             <tr>
-                <th colspan="4">${line.goal_definition.name}</th>
+                <th colspan="4">${line['name']}</th>
             </tr>
             <tr>
                 <th>#</th>
@@ -188,23 +188,21 @@
                 <th>Completeness</th>
                 <th>Current</th>
             </tr>
-            % for idx, goal in line.board_goals:
-                % if idx < 3 or goal.user_id.id == user.id:
-                    <tr
-                        % if goal.completeness >= 100:
-                            style="font-weight:bold;"
-                        % endif
-                        >
-                        <td>${idx+1}</td>
-                        <td>${goal.user_id.name}</td>
-                        <td>${goal.completeness}%</td>
-                        <td>${goal.current}/${goal.target_goal}
-                        % if goal.definition_suffix:
-                            ${goal.definition_suffix}
-                        % endif
-                        </td>
-                    </tr>
-                % endif
+            % for goal in line['goals']:
+                <tr
+                    % if goal.completeness >= 100:
+                        style="font-weight:bold;"
+                    % endif
+                    >
+                    <td>${goal['rank']}</td>
+                    <td>${goal['name']}</td>
+                    <td>${goal['completeness']}%</td>
+                    <td>${goal['current']}/${line['target']}
+                    % if line['suffix']:
+                        ${line['suffix']}
+                    % endif
+                    </td>
+                </tr>
             % endfor
         </table>
 
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 0f3e64626cb..7cbd784b9bf 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -19,17 +19,18 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
 
-# from templates import TemplateHelper
-
 from datetime import date, datetime, timedelta
 import calendar
 import logging
 _logger = logging.getLogger(__name__)
 
+# display top 3 in ranking, could be db variable
+MAX_VISIBILITY_RANKING = 3
 
 def start_end_date_for_period(period, default_start_date=False, default_end_date=False):
     """Return the start and end date for a goal period based on today
@@ -107,7 +108,7 @@ class gamification_challenge(osv.Model):
                 ('other', 'Settings / Gamification Tools'),
             ]
 
-    _sort = 'end_date, start_date, name, id'
+    _order = 'end_date, start_date, name, id'
     _columns = {
         'name': fields.char('Challenge Name', required=True, translate=True),
         'description': fields.text('Description', translate=True),
@@ -444,89 +445,137 @@ class gamification_challenge(osv.Model):
 
     ##### JS utilities #####
 
-    def get_board_goal_info(self, cr, uid, challenge, subset_goal_ids=False, context=None):
-        """Get the list of latest goals for a challenge, sorted by user ranking for each line"""
+    def _get_serialized_challenge_lines(self, cr, uid, challenge, user_id=False, restrict_goal_ids=False, restrict_top=False, context=None):
+        """Return a serialised version of the goals information
 
+        :challenge: browse record of challenge to compute
+        :user_id: res.users id of the user retrieving progress (False if no distinction, only for ranking challenges)
+        :restrict_goal_ids: <list(int)> compute only the results for this subset if gamification.goal ids, if False retrieve every goal of current running challenge
+        :restrict_top: <int> for challenge lines where visibility_mode == 'ranking', retrieve only these bests results and itself, if False retrieve all
+            restrict_goal_ids has priority over restrict_top
+
+        format list
+        # if visibility_mode == 'ranking'
+        {
+            'name': <gamification.goal.description name>,
+            'description': <gamification.goal.description description>,
+            'condition': <reach condition {lower,higher}>,
+            'computation_mode': <target computation {manually,count,sum,python}>,
+            'monetary': <{True,False}>,
+            'suffix': <value suffix>,
+            'action': <{True,False}>,
+            'display_mode': <{progress,boolean}>,
+            'target': <challenge line target>,
+            'own_goal_id': <gamification.goal id where user_id == uid>,
+            'goals': [
+                {
+                    'id': <gamification.goal id>,
+                    'rank': <user ranking>,
+                    'user_id': <res.users id>,
+                    'name': <res.users name>,
+                    'state': <gamification.goal state {draft,inprogress,inprogress_update,reached,failed,canceled}>,
+                    'completeness': <percentage>,
+                    'current': <current value>,
+                }
+            ]
+        },
+        # if visibility_mode == 'personal'
+        {
+            'id': <gamification.goal id>,
+            'name': <gamification.goal.description name>,
+            'description': <gamification.goal.description description>,
+            'condition': <reach condition {lower,higher}>,
+            'computation_mode': <target computation {manually,count,sum,python}>,
+            'monetary': <{True,False}>,
+            'suffix': <value suffix>,
+            'action': <{True,False}>,
+            'display_mode': <{progress,boolean}>,
+            'target': <challenge line target>,
+            'state': <gamification.goal state {draft,inprogress,inprogress_update,reached,failed,canceled}>,                                
+            'completeness': <percentage>,
+            'current': <current value>,
+        }
+        """
         goal_obj = self.pool.get('gamification.goal')
-        lines_boards = []
         (start_date, end_date) = start_end_date_for_period(challenge.period)
 
+        res_lines = []
         for line in challenge.line_ids:
-
+            line_data = {
+                'name': line.definition_id.name,
+                'description': line.definition_id.description,
+                'condition': line.definition_id.condition,
+                'computation_mode': line.definition_id.computation_mode,
+                'monetary': line.definition_id.monetary,
+                'suffix': line.definition_id.suffix,
+                'action': True if line.definition_id.action_id else False,
+                'display_mode': line.definition_id.display_mode,
+                'target': line.target_goal,
+            }
             domain = [
                 ('line_id', '=', line.id),
-                ('state', 'in', ('inprogress', 'inprogress_update',
-                                 'reached', 'failed')),
+                ('state', '!=', 'draft'),
             ]
-
-            if subset_goal_ids:
-                goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                common_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
+            if restrict_goal_ids:
+                domain.append(('ids', 'in', restrict_goal_ids))
             else:
                 # if no subset goals, use the dates for restriction
                 if start_date:
                     domain.append(('start_date', '=', start_date))
                 if end_date:
                     domain.append(('end_date', '=', end_date))
-                common_goal_ids = goal_obj.search(cr, uid, domain, context=context)
 
-            board_goals = [goal for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context)]
-
-            if len(board_goals) == 0:
-                # line has no generated goals
-                continue
-
-            # most complete first, current if same percentage (eg: if several 100%)
-            sorted_board = enumerate(sorted(board_goals, key=lambda k: (k.completeness, k.current), reverse=True))
-            lines_boards.append({'goal_definition': line.definition_id, 'board_goals': sorted_board, 'target_goal': line.target_goal})
-        return lines_boards
-
-    def get_indivual_goal_info(self, cr, uid, user_id, challenge, subset_goal_ids=False, context=None):
-        """Get the list of latest goals of a user for a challenge"""
-        domain = [
-            ('challenge_id', '=', challenge.id),
-            ('user_id', '=', user_id),
-            ('state', 'in', ('inprogress', 'inprogress_update',
-                             'reached', 'failed')),
-        ]
-        goal_obj = self.pool.get('gamification.goal')
-        (start_date, end_date) = start_end_date_for_period(challenge.period)
-
-        if subset_goal_ids:
-            # use the domain for safety, don't want irrelevant report if wrong argument
-            goal_ids = goal_obj.search(cr, uid, domain, context=context)
-            related_goal_ids = [goal for goal in goal_ids if goal in subset_goal_ids]
-        else:
-            # if no subset goals, use the dates for restriction
-            if start_date:
-                domain.append(('start_date', '=', start_date))
-            if end_date:
-                domain.append(('end_date', '=', end_date))
-            related_goal_ids = goal_obj.search(cr, uid, domain, context=context)
-
-        if len(related_goal_ids) == 0:
-            return False
-
-        goals = []
-        all_done = True
-        for goal in goal_obj.browse(cr, uid, related_goal_ids, context=context):
-            if goal.end_date:
-                if goal.end_date < fields.date.today():
-                    # do not include goals of previous challenge run
-                    continue
-                else:
-                    all_done = False
+            if challenge.visibility_mode == 'personal':
+                if not user_id:
+                    raise osv.except_osv(_('Error!'),_("Retrieving progress for personal challenge without user information"))
+                domain.append(('user_id', '=', user_id))
+                sorting = goal_obj._order
+                limit = 1
+                # initialise in case search returns no results
+                line_data.update({
+                    'id': 0,
+                    'current': 0,
+                    'completeness': 0,
+                    'state': 'draft',
+                })
             else:
-                if goal.state == 'inprogress' or goal.state == 'inprogress_update':
-                    all_done = False
+                line_data.update({
+                    'own_goal_id': False,
+                    'goals': [],
+                })
+                sorting = "completeness desc, current desc"
+                limit = False
 
-            goals.append(goal)
+            goal_ids = goal_obj.search(cr, uid, domain, order=sorting, limit=limit, context=context)
+            ranking = 0
+            for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
+                if challenge.visibility_mode == 'personal':
+                    # limit=1 so only one result
+                    line_data.update({
+                        'id': goal.id,
+                        'current': goal.current,
+                        'completeness': goal.completeness,
+                        'state': goal.state,
+                    })
+                else:
+                    ranking += 1
+                    if user_id and goal.user_id.id == user_id:
+                        line_data['own_goal_id'] = goal.id
+                    elif restrict_top and ranking > restrict_top:
+                        # not own goal, over top, skipping
+                        continue
 
-        if all_done:
-            # skip challenges where all goal are done or failed
-            return False
-        else:
-            return goals
+                    line_data['goals'].append({
+                        'id': goal.id,
+                        'user_id': goal.user_id.id,
+                        'name': goal.user_id.name,
+                        'rank': ranking,
+                        'current': goal.current,
+                        'completeness': goal.completeness,
+                        'state': goal.state,
+                    })
+            res_lines.append(line_data)
+        return res_lines
 
     ##### Reporting #####
 
@@ -550,11 +599,11 @@ class gamification_challenge(osv.Model):
         temp_obj = self.pool.get('email.template')
         ctx = context.copy()
         if challenge.visibility_mode == 'ranking':
-            lines_boards = self.get_board_goal_info(cr, uid, challenge, subset_goal_ids, context)
+            lines_boards = self._get_serialized_challenge_lines(cr, uid, challenge, user_id=False, restrict_goal_ids=subset_goal_ids, restrict_top=False, context=context)
 
-            ctx.update({'lines_boards': lines_boards})
-            template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_group', context)
-            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.challenge', challenge.id, context=context)
+            ctx.update({'challenge_lines': lines_boards})
+            template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'email_template_goal_progress_group', context)
+            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
 
             # body_html = template_env.get_template('group_progress.mako').render({'object': challenge, 'lines_boards': lines_boards, 'uid': uid})
 
@@ -572,14 +621,14 @@ class gamification_challenge(osv.Model):
         else:
             # generate individual reports
             for user in users or challenge.user_ids:
-                goals = self.get_indivual_goal_info(cr, uid, user.id, challenge, subset_goal_ids, context=context)
+                goals = self._get_serialized_challenge_lines(cr, uid, challenge, user.id, restrict_goal_ids=subset_goal_ids, context=context)
                 if not goals:
                     continue
 
-                ctx.update({'goals': goals})
+                ctx.update({'challenge_lines': goals})
                 template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_perso', context)
-                body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.challenge', challenge.id, context=context)
-                # send message only to users
+                body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
+                # send message only to users, not on the challenge
                 self.message_post(cr, uid, 0,
                                   body=body_html,
                                   partner_ids=[(4, user.partner_id.id)],
@@ -600,7 +649,7 @@ class gamification_challenge(osv.Model):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
         self.message_post(cr, uid, challenge_ids, body=message, context=context)
-        self.write(cr, uid, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
+        self.write(cr, SUPERUSER_ID, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
         return self.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
 
     def discard_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
@@ -608,7 +657,7 @@ class gamification_challenge(osv.Model):
         user_id = user_id or uid
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has refused the challenge" % user.name
-        self.message_post(cr, uid, challenge_ids, body=message, context=context)
+        self.message_post(cr, SUPERUSER_ID, challenge_ids, body=message, context=context)
         return self.write(cr, uid, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
 
     def reply_challenge_wizard(self, cr, uid, challenge_id, context=None):
@@ -710,7 +759,7 @@ class gamification_challenge(osv.Model):
             for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
                 if goal.state != 'reached':
                     all_reached = False
-                if goal.definition_condition == 'higher':
+                if goal.condition == 'higher':
                     # can be over 100
                     total_completness += 100.0 * goal.current / goal.target_goal
                 elif goal.state == 'reached':
@@ -761,7 +810,7 @@ class gamification_challenge_line(osv.Model):
         goal_definition = goal_definition.browse(cr, uid, definition_id, context=context)
         ret = {
             'value': {
-                'definition_condition': goal_definition.condition,
+                'condition': goal_definition.condition,
                 'definition_full_suffix': goal_definition.full_suffix
             }
         }
@@ -781,7 +830,7 @@ class gamification_challenge_line(osv.Model):
             required=True),
         'sequence': fields.integer('Sequence',
             help='Sequence number for ordering'),
-        'definition_condition': fields.related('definition_id', 'condition', type="selection",
+        'condition': fields.related('definition_id', 'condition', type="selection",
             readonly=True, string="Condition", selection=[('lower', '<='), ('higher', '>=')]),
         'definition_suffix': fields.related('definition_id', 'suffix', type="char", readonly=True, string="Unit"),
         'definition_monetary': fields.related('definition_id', 'monetary', type="boolean", readonly=True, string="Monetary"),
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 5464b51a4ea..52eebb63857 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -76,6 +76,7 @@ class gamification_goal_definition(osv.Model):
         'display_mode': fields.selection([
                 ('progress', 'Progressive (using numerical values)'),
                 ('checkbox', 'Checkbox (done or not-done)'),
+                ('boolean', 'Exclusive (done or not-done)'),
             ],
             string="Displayed as", required=True),
         'model_id': fields.many2one('ir.model',
diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index d831ab2ea25..408ddddf082 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from openerp.osv import osv
-
+from challenge import MAX_VISIBILITY_RANKING
 
 class res_users_gamification_group(osv.Model):
     """ Update of res.users class
@@ -58,14 +58,23 @@ class res_users_gamification_group(osv.Model):
                 challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, write_res)]}, context=context)
         return write_res
 
-    def get_goals_todo_info(self, cr, uid, context=None):
-        """Return the list of goals assigned to the user, grouped by challenge
+    # def get_goals_todo_info(self, cr, uid, context=None):
 
-        This method intends to return processable data in javascript in the
-        goal_list_to_do template. The output format is not constant as the
-        required information is different between individual and board goal
-        definitions
-        :return: list of dictionnaries for each goal to display
+    def get_serialised_gamification_summary(self, cr, uid, context=None):
+        return self._serialised_goals_summary(cr, uid, user_id=uid, context=context)
+
+    def _serialised_goals_summary(self, cr, uid, user_id, context=None):
+        """Return a serialised list of goals assigned to the user, grouped by challenge
+
+        [
+            {
+                'id': <gamification.challenge id>,
+                'name': <gamification.challenge name>,
+                'visibility_mode': <visibility {ranking,personal}>,
+                'currency': <res.currency id>,
+                'lines': [(see gamification_challenge._get_serialized_challenge_lines() format)]
+            },
+        ]
         """
         all_goals_info = []
         challenge_obj = self.pool.get('gamification.challenge')
@@ -74,78 +83,14 @@ class res_users_gamification_group(osv.Model):
         challenge_ids = challenge_obj.search(cr, uid, [('user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
         for challenge in challenge_obj.browse(cr, uid, challenge_ids, context=context):
             # serialize goals info to be able to use it in javascript
-            serialized_goals_info = {
+            all_goals_info.append({
                 'id': challenge.id,
                 'name': challenge.name,
                 'visibility_mode': challenge.visibility_mode,
-                'currency': user.company_id.currency_id.id
-            }
+                'currency': user.company_id.currency_id.id,
+                'lines': challenge_obj._get_serialized_challenge_lines(cr, uid, challenge, user_id, restrict_top=MAX_VISIBILITY_RANKING, context=context),
+            })
 
-            if challenge.visibility_mode == 'ranking':
-                # board report should be grouped by line for all users
-                goals_info = challenge_obj.get_board_goal_info(cr, uid, challenge, subset_goal_ids=False, context=context)
-
-                if not goals_info:
-                    # challenge with no valid lines
-                    continue
-
-                serialized_goals_info['lines'] = []
-                for line_board in goals_info:
-                    vals = {'definition_name': line_board['goal_definition'].name,
-                            'definition_description': line_board['goal_definition'].description,
-                            'definition_condition': line_board['goal_definition'].condition,
-                            'computation_mode': line_board['goal_definition'].computation_mode,
-                            'definition_monetary': line_board['goal_definition'].monetary,
-                            'definition_suffix': line_board['goal_definition'].suffix,
-                            'definition_action': True if line_board['goal_definition'].action_id else False,
-                            'definition_display': line_board['goal_definition'].display_mode,
-                            'target_goal': line_board['target_goal'],
-                            'goals': []}
-                    for goal in line_board['board_goals']:
-                        # Keep only the Top 3 and the current user
-                        if goal[0] > 2 and goal[1].user_id.id != uid:
-                            continue
-
-                        vals['goals'].append({
-                            'rank': goal[0] + 1,
-                            'id': goal[1].id,
-                            'user_id': goal[1].user_id.id,
-                            'user_name': goal[1].user_id.name,
-                            'state': goal[1].state,
-                            'completeness': goal[1].completeness,
-                            'current': goal[1].current,
-                            'target_goal': goal[1].target_goal,
-                        })
-                        if uid == goal[1].user_id.id:
-                            vals['own_goal_id'] = goal[1].id
-                    serialized_goals_info['lines'].append(vals)
-
-            else:
-                # individual report are simply a list of goal
-                goals_info = challenge_obj.get_indivual_goal_info(cr, uid, uid, challenge, subset_goal_ids=False, context=context)
-
-                if not goals_info:
-                    continue
-
-                serialized_goals_info['goals'] = []
-                for goal in goals_info:
-                    serialized_goals_info['goals'].append({
-                        'id': goal.id,
-                        'definition_name': goal.definition_id.name,
-                        'definition_description': goal.definition_description,
-                        'definition_condition': goal.definition_id.condition,
-                        'definition_monetary': goal.definition_id.monetary,
-                        'definition_suffix': goal.definition_id.suffix,
-                        'definition_action': True if goal.definition_id.action_id else False,
-                        'definition_display': goal.definition_id.display_mode,
-                        'state': goal.state,
-                        'completeness': goal.completeness,
-                        'computation_mode': goal.computation_mode,
-                        'current': goal.current,
-                        'target_goal': goal.target_goal,
-                    })
-
-            all_goals_info.append(serialized_goals_info)
         return all_goals_info
 
     def get_challenge_suggestions(self, cr, uid, context=None):
@@ -171,7 +116,9 @@ class res_groups_gamification_group(osv.Model):
     _name = 'res.groups'
     _inherit = 'res.groups'
 
+    # No need to overwrite create as very unlikely to be the value in the autojoin_group_id field
     def write(self, cr, uid, ids, vals, context=None):
+        """Overwrite to autosubscribe users if add users to a group marked as autojoin, these will be added to the challenge"""
         write_res = super(res_groups_gamification_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('users'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
index cc20afede80..fd39b130fad 100644
--- a/addons/gamification/static/src/css/gamification.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -73,7 +73,7 @@
     width: 280px;
     border-radius: 2px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside > .oe_gamification_goal {
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_challenge_list {
     background-color: #EDEDF6;
 }
 .openerp .oe_mail_wall_aside .oe_gamification_suggestion {
@@ -188,7 +188,7 @@
     width: 24px;
     padding-right: 5px;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan.oe_e,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_challenge.oe_e,
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action.oe_e {
     visibility: hidden;
     font-size: 25px;
@@ -196,7 +196,7 @@
     /*margin-right: 15px;*/
     position: relative;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan,
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_challenge,
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action,
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action {
     visibility: visible;
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 9e34d8f09fc..cf5b2228b08 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -2,12 +2,12 @@ openerp.gamification = function(instance) {
     var QWeb = instance.web.qweb;
 
     instance.gamification.Sidebar = instance.web.Widget.extend({
-        template: 'gamification.user_wall_sidebar',
+        template: 'gamification.UserWallSidebar',
         init: function (parent, action) {
             var self = this;
             this._super(parent, action);
             this.deferred = $.Deferred();
-            this.res_user = new instance.web.DataSetSearch(this, 'res.users');
+            // this.res_user = new instance.web.DataSetSearch(this, 'res.users');
             this.goals_info = {};
             this.challenge_suggestions = {};
         },
@@ -51,54 +51,53 @@ openerp.gamification = function(instance) {
                 });
             }
         },
-        renderElement: function() {
+        start: function() {
             var self = this;
             this._super.apply(this, arguments);
             self.get_goal_todo_info();
             self.get_challenge_suggestions();
         },
-        render_template: function(target,template) {
-            var self = this;
-            target.append(QWeb.render(template,{'widget': self}));
-        },
+        // render_template: function(target,template) {
+        //     var self = this;
+        //     target.append(QWeb.render(template,{'widget': self}));
+        // },
         render_template_replace: function(target,template) {
             var self = this;
             target.html(QWeb.render(template,{'widget': self}));
         },
         get_goal_todo_info: function() {
             var self = this;
-            var goals_info = this.res_user.call('get_goals_todo_info', {}).then(function(res) {
-                self.goals_info['info'] = res;
-            });
-            $.when(goals_info).done(function() {
-                if(self.goals_info.info.length > 0){
-                    self.render_template_replace(self.$el.filter(".oe_gamification_goal"),'gamification.goal_list_to_do');
-                    self.render_money_fields(self.goals_info.info[0].currency);
-                    self.render_user_avatars();
+            var challenges = new instance.web.Model('res.users').call('get_serialised_gamification_summary', []).then(function(result) {
+                if (result.length === 0) {
+                    self.$el.find(".oe_gamification_challenge_list").hide();
                 } else {
-                    self.$el.filter(".oe_gamification_goal").hide();
+                    _.each(result, function(item){
+                        console.log(item);
+                        var $item = $(QWeb.render("gamification.ChallengeSummary", {challenge: item}));
+                        self.render_money_fields($item);
+                        self.render_user_avatars($item);
+                        self.$el.find('.oe_gamification_challenge_list').append($item);
+                    });
                 }
             });
         },
         get_challenge_suggestions: function() {
             var self = this;
-            var challenge_suggestions = this.res_user.call('get_challenge_suggestions', {}).then(function(res) {
-                self.challenge_suggestions['info'] = res;
-            });
-            $.when(challenge_suggestions).done(function() {
-                if(self.challenge_suggestions.info.length > 0){
-                    self.render_template_replace(self.$el.filter(".oe_gamification_suggestion"),'gamification.challenge_suggestions');
+            var challenge_suggestions = new instance.web.Model('res.users').call('get_challenge_suggestions', []).then(function(result) {
+                if (result.length === 0) {
+                    self.$el.find(".oe_gamification_suggestion").hide();
                 } else {
-                    self.$el.filter(".oe_gamification_suggestion").hide();
+                    var $item = $(QWeb.render("gamification.ChallengeSuggestion", {challenges: result}));
+                    self.$el.find('.oe_gamification_suggestion').append($item);
                 }
             });
         },
-        render_money_fields: function(currency_id) {
+        render_money_fields: function(item) {
             var self = this;
-
             self.dfm = new instance.web.form.DefaultFieldManager(self);
             // Generate a FieldMonetary for each .oe_goal_field_monetary
-            self.$(".oe_goal_field_monetary").each(function() {
+            item.find(".oe_goal_field_monetary").each(function() {
+                var currency_id = parseInt( $(this).attr('data-id'), 10);
                 money_field = new instance.web.form.FieldMonetary(self.dfm, {
                     attrs: {
                         modifiers: '{"readonly": true}'
@@ -110,9 +109,9 @@ openerp.gamification = function(instance) {
                 money_field.replace($(this));
             });
         },
-        render_user_avatars: function() {
+        render_user_avatars: function(item) {
             var self = this;
-            self.$(".oe_user_avatar").each(function() {
+            item.find(".oe_user_avatar").each(function() {
                 var user_id = parseInt( $(this).attr('data-id'), 10);
                 var url = instance.session.url('/web/binary/image', {model: 'res.users', field: 'image_small', id: user_id});
                 $(this).attr("src", url);
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 19c622dcb97..6316ca886f0 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -1,10 +1,12 @@
 <templates>
-    <t t-name="gamification.user_wall_sidebar" class="oe_gamification_user_wall_sidebar">
-        <div class="oe_gamification_suggestion"><em>No challenge suggestions</em></div>
-        <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
+    <t t-name="gamification.UserWallSidebar" class="oe_gamification_user_wall_sidebar">
+        <div>
+            <div class="oe_gamification_suggestion"></div>
+            <div class="oe_gamification_challenge_list"></div>
+        </div>
     </t>
-    <t t-name="gamification.goal_list_to_do">
-        <div t-foreach="widget.goals_info.info" t-as="challenge" class="oe_goal">
+    <t t-name="gamification.ChallengeSummary">
+        <div class="oe_goal">
             <div>
                 <a class="oe_update_challenge oe_e" rol="button" t-attf-id="{challenge.id}">e</a>
                 <h4><t t-esc="challenge.name" /></h4>
@@ -12,29 +14,29 @@
 
             <t t-if="challenge.visibility_mode == 'personal'">
                 <div class="oe_table oe_goals_list">
-                    <div t-foreach="challenge.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.definition_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="goal.definition_display == 'progress'">
+                    <div t-foreach="challenge.lines" t-as="line" t-attf-class="oe_row oe_goal_outer_box #{line.state == 'reached' ? 'oe_goal_reached' : ''} #{line.display_mode != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="line.display_mode == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{goal.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
-                                <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
+                                <div class="oe_goal_progress" t-attf-style="#{line.display_mode == 'progress' ? 'width: '+line.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_cell oe_goal_current"><t t-esc="line.current" /></div>
                             </t>
                             <div class="oe_cell">
-                                <t t-if="goal.computation_mode != 'manually' and !goal.definition_action">
-                                    <span t-att-title="goal.definition_description"><t t-esc="goal.definition_name" /></span>
+                                <t t-if="line.computation_mode != 'manually' and !line.action">
+                                    <span t-att-title="line.description"><t t-esc="line.name" /></span>
                                 </t>
-                                <t t-if="goal.definition_action or goal.computation_mode == 'manually'">
-                                    <span t-att-title="goal.definition_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.definition_name" /></a></span>
+                                <t t-if="line.action or line.computation_mode == 'manually'">
+                                    <span t-att-title="line.description"><a class="oe_goal_action" t-att-id="line.id"><t t-esc="line.name" /></a></span>
                                 </t>
-                                <t t-if="goal.definition_display == 'progress'"><br/>
+                                <t t-if="line.display_mode == 'progress'"><br/>
                                     <div class="oe_grey">
-                                        <t t-if="goal.definition_condition == 'higher'">
+                                        <t t-if="line.definition_condition == 'higher'">
                                             Target:
                                         </t>
-                                        <t t-if="goal.definition_condition == 'lower'">
+                                        <t t-if="line.definition_condition == 'lower'">
                                             Target: &lt;=
                                         </t>
-                                        <span t-attf-class="#{goal.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.definition_suffix"><t t-esc="goal.definition_suffix"/></t>
+                                        <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="line.target"/></span>
+                                        <t t-if="line.suffix"><t t-esc="line.suffix"/></t>
                                     </div>
                                 </t>
                             </div>
@@ -45,8 +47,8 @@
             <t t-if="challenge.visibility_mode == 'ranking'">
                 <div t-foreach="challenge.lines" t-as="line" class="oe_goals_list oe_table">
                     <div class="oe_row">
-                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.definition_description ? line.definition_description : ''}">
-                            <strong><t t-esc="line.definition_name"/></strong>
+                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.description ? line.description : ''}">
+                            <strong><t t-esc="line.name"/></strong>
                             <br/>
                             <div class="oe_grey">
                                 <t t-if="line.definition_condition == 'higher'">
@@ -55,39 +57,39 @@
                                 <t t-if="line.definition_condition == 'lower'">
                                     Target: &lt;=
                                 </t>
-                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="line.target_goal" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
+                                <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="line.target" /></span><t t-if="line.suffix"> <t t-esc="line.suffix"/></t>
                             </div>
                         </div>
                     </div>
                     <div t-foreach="line.goals" t-as="goal" t-attf-class="#{goal.id == line.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{line.definition_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="line.definition_display == 'progress'">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{line.display_mode != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="line.display_mode == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{line.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{line.display_mode == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
                             
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
-                                <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
+                                <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
-                                    <t t-if="line.definition_display == 'progress'">
+                                    <t t-if="line.display_mode == 'progress'">
                                         <!-- progress, action on current value -->
-                                        <t t-esc="goal.user_name"/><br/>
-                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
-                                            <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
+                                        <t t-esc="goal.name"/><br/>
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.action)">
+                                            <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="goal.current" /></span><t t-if="line.suffix"> <t t-esc="line.suffix"/></t>
                                         </t>
-                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
+                                        <t t-if="goal.id == line.own_goal_id and (line.action or line.computation_mode == 'manually')">
                                             <a class="oe_goal_action" t-att-id="line.own_goal_id">
-                                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
+                                                <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="goal.current" /></span><t t-if="line.suffix"> <t t-esc="line.suffix"/></t>
                                             </a>
                                         </t>
                                     </t>
-                                    <t t-if="line.definition_display != 'progress'">
+                                    <t t-if="line.display_mode != 'progress'">
                                         <!-- not progress, action on user name -->
-                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
-                                            <t t-esc="goal.user_name"/>
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.action)">
+                                            <t t-esc="goal.name"/>
                                         </t>
-                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
-                                            <a class="oe_goal_action" t-att-id="line.own_goal_id"><t t-esc="goal.user_name"/></a>
+                                        <t t-if="goal.id == line.own_goal_id and (line.action or line.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="line.own_goal_id"><t t-esc="goal.name"/></a>
                                         </t>
                                     </t>
                                 </div>
@@ -98,10 +100,10 @@
         </div>
     </t>
 
-    <t t-name="gamification.challenge_suggestions">
+    <t t-name="gamification.ChallengeSuggestion">
         <div class="oe_goal">
             <h4>Invited Challenges</h4>
-            <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
+            <ul t-foreach="challenges" t-as="challenge" class="oe_goals_list">
                 <li>
                     <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>
                 </li>
diff --git a/addons/gamification/templates/badge_received.mako b/addons/gamification/templates/badge_received.mako
deleted file mode 100644
index b846ab7ff4f..00000000000
--- a/addons/gamification/templates/badge_received.mako
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style type="text_css">${css}</style>
-  </head>
-  <body>
-    <p>Congratulation, you have received the badge <strong>${badge_user.badge_id.name}</strong> !
-        % if user_from
-            This badge was granted by <strong>${user_from.name}</strong>.
-        % endif
-    </p>
-
-    % if badge_user.comment
-        <p><em>${badge_user.comment}</em></p>
-    % endif
-  </body>
-</html>
\ No newline at end of file
diff --git a/addons/gamification/templates/base.mako b/addons/gamification/templates/base.mako
deleted file mode 100644
index d5bb0c24c99..00000000000
--- a/addons/gamification/templates/base.mako
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style type="text_css">${css}</style>
-</head>
-<body>
-	<header>
-	    <strong>${object.name}</strong>
-	</header>
-	<p class="oe_grey">${object.report_header or ''}</p>
-<% block body %><% endblock %>
-
-</body>
\ No newline at end of file
diff --git a/addons/gamification/templates/group_progress.mako b/addons/gamification/templates/group_progress.mako
deleted file mode 100644
index 5d71c36032f..00000000000
--- a/addons/gamification/templates/group_progress.mako
+++ /dev/null
@@ -1,38 +0,0 @@
-<% extends 'base.mako' %>
-
-<% block body %>
-	% for line in lines_boards: 
-        <table width="100%" border="1">
-        	<tr>
-        		<th colspan="4">${line.goal_definition.name}</th>
-        	</tr>
-        	<tr>
-	            <th>#</th>
-	            <th>Person</th>
-	            <th>Completeness</th>
-	            <th>Current</th>
-	        </tr>
-	        % for idx, goal in line.board_goals:
-                % if idx < 3 or goal.user_id.id == uid:
-    	            <tr
-    	                % if goal.completeness >= 100:
-    	                    style="font-weight:bold;"
-    	                % endif
-    	                >
-    	                <td>${idx+1}</td>
-    	                <td>${goal.user_id.name}</td>
-    	                <td>${goal.completeness}%</td>
-    	                <td>${goal.current}/${goal.target_goal}
-                        % if goal.definition_suffix:
-                            ${goal.definition_suffix}
-                        % endif
-                        </td>
-    	            </tr>
-                % endif
-	        % endfor
-        </table>
-
-        <br/><br/>
-
-    % endfor
-<% endblock %>
\ No newline at end of file
diff --git a/addons/gamification/templates/personal_progress.mako b/addons/gamification/templates/personal_progress.mako
deleted file mode 100644
index 85d2fbb2b16..00000000000
--- a/addons/gamification/templates/personal_progress.mako
+++ /dev/null
@@ -1,31 +0,0 @@
-<% extends 'base.mako' %>
-
-<% block body %><table width="100%" border="1">
-    <tr>
-        <th>Goal</th>
-        <th>Target</th>
-        <th>Current</th>
-        <th>Completeness</th>
-    </tr>
-    % for goal in goals:
-        <tr
-            % if goal.completeness >= 100:
-                style="font-weight:bold;"
-            % endif
-            >
-            <td>${goal.definition_id.name}</td>
-            <td>${goal.target_goal}
-            % if goal.definition_suffix:
-                ${goal.definition_suffix}
-            % endif
-            </td>
-            <td>${goal.current}
-            % if goal.definition_suffix:
-                ${goal.definition_suffix}
-            % endif
-            </td>
-            <td>${goal.completeness} %</td>
-        </tr>
-    % endfor
-    </table>
-<% endblock %>
\ No newline at end of file
diff --git a/addons/gamification/templates/reminder.mako b/addons/gamification/templates/reminder.mako
deleted file mode 100644
index 4d44861a0bc..00000000000
--- a/addons/gamification/templates/reminder.mako
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style type="text_css">${css}</style>
-</head>
-<body>
-	<header>
-	    <strong>Reminder ${object.name}</strong>
-	</header>
-
-	<p class="oe_grey">${object.report_header or ''}</p>
-    
-    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
-
-    <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
-</body>
-</html>
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index 5403630b5b6..973194738cd 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -76,7 +76,7 @@
                                     <tree string="Line List" version="7.0" editable="bottom" >
                                         <field name="sequence" widget="handle"/>
                                         <field name="definition_id" on_change="on_change_definition_id(definition_id)" />
-                                        <field name="definition_condition"/>
+                                        <field name="condition"/>
                                         <field name="target_goal"/>
                                         <field name="definition_full_suffix"/>
                                     </tree>
@@ -101,6 +101,9 @@
                                     <field name="invited_user_ids" widget="many2many_tags" />
                                 </group>
                                 <group string="Notification Messages">
+                                    <div class="oe_grey">
+                                    <p>Depending on the Diasplay mode, reports will be individual or shared.</p>
+                                </div>
                                     <field name="report_message_frequency" />
                                     <field name="report_header" placeholder="e.g. The following message contains the current progress of the sale team..." attrs="{'invisible': [('report_message_frequency','=','never')]}" />
                                     <field name="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
@@ -247,7 +250,7 @@
                             <tree string="Challenge Lines" version="7.0" editable="bottom" >
                                 <field name="sequence" widget="handle"/>
                                 <field name="definition_id"/>
-                                <field name="definition_condition"/>
+                                <field name="condition"/>
                                 <field name="target_goal"/>
                                 <field name="definition_full_suffix"/>
                             </tree>
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml
index dbb208ad5fd..d76b41882df 100644
--- a/addons/gamification/views/goal.xml
+++ b/addons/gamification/views/goal.xml
@@ -154,7 +154,7 @@
                                     </div>
                                     <field name="user_id" />
                                     <div class="oe_goal_state_block">
-                                        <t t-if="record.definition_display.raw_value == 'checkbox'">
+                                        <t t-if="record.definition_display.raw_value == 'boolean'">
                                             <div class="oe_goal_state oe_e">
                                                 <t t-if="record.state.raw_value=='reached'"><span class="oe_green" title="Goal Reached">W</span></t>
                                                 <t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'"><span title="Goal in Progress">N</span></t>

From b92ad3900514875bc97d135af5feb0cdef1481e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Dec 2013 15:46:52 +0100
Subject: [PATCH 521/547] [FIX] email_template: support of email_recipients in
 send_mail. email_recipients is a char fields holding a comma separated list
 of partner_ids that are the email recipients. This field is correctly handled
 in the composer but was not taken into account in the send_mail method
 email_template. However due to model limitations, this field can only be
 taken into account when sending the email directly using force_send. When the
 email is queued, no field is available to hold the value of email_recipients.
 This is already fixed in trunk/v8 as a field has been added to handle this
 value.

[FIX] mail: when sending email to some recipients_ids, filter to have only
the existing partner_ids. Trusting email template to generate valid
partner_ids is a bit risky.

[TESTS] email_template: added tests for send_mail

bzr revid: tde@openerp.com-20131220144652-h18yam60vpedbh7x
---
 addons/email_template/email_template.py  | 24 ++++++++++-----
 addons/email_template/tests/test_mail.py | 37 ++++++++++++++++++++++++
 addons/mail/mail_mail.py                 |  4 ++-
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 356d903b03d..bf1341da34b 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -377,7 +377,17 @@ class email_template(osv.osv):
         # create a mail_mail based on values, without attachments
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
         assert values.get('email_from'), 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
-        del values['email_recipients']  # TODO Properly use them.
+
+        # process email_recipients field that is a comma separated list of partner_ids -> recipient_ids
+        # NOTE: only usable if force_send is True, because otherwise the value is
+        # not stored on the mail_mail, and therefore lost -> fixed in v8
+        recipient_ids = []
+        email_recipients = values.pop('email_recipients', '')
+        if email_recipients:
+            for partner_id in email_recipients.split(','):
+                if partner_id:  # placeholders could generate '', 3, 2 due to some empty field values
+                    recipient_ids.append(int(partner_id))
+
         attachment_ids = values.pop('attachment_ids', [])
         attachments = values.pop('attachments', [])
         msg_id = mail_mail.create(cr, uid, values, context=context)
@@ -386,11 +396,11 @@ class email_template(osv.osv):
         # manage attachments
         for attachment in attachments:
             attachment_data = {
-                    'name': attachment[0],
-                    'datas_fname': attachment[0],
-                    'datas': attachment[1],
-                    'res_model': 'mail.message',
-                    'res_id': mail.mail_message_id.id,
+                'name': attachment[0],
+                'datas_fname': attachment[0],
+                'datas': attachment[1],
+                'res_model': 'mail.message',
+                'res_id': mail.mail_message_id.id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
@@ -399,7 +409,7 @@ class email_template(osv.osv):
             mail_mail.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
 
         if force_send:
-            mail_mail.send(cr, uid, [msg_id], context=context)
+            mail_mail.send(cr, uid, [msg_id], recipient_ids=recipient_ids, context=context)
         return msg_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index a4ecb9b6f91..2e1a8c5267a 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -21,6 +21,7 @@
 
 import base64
 from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.tools import mute_logger
 
 
 class test_message_compose(TestMailBase):
@@ -199,3 +200,39 @@ class test_message_compose(TestMailBase):
         # Generate messsage with default email and partner on template
         mail_value = mail_compose.generate_email_for_composer(cr, uid, email_template_id, uid)
         self.assertEqual(set(mail_value['partner_ids']), set(send_to), 'mail.message partner_ids list created by template is incorrect')
+
+    @mute_logger('openerp.osv.orm', 'openerp.osv.orm')
+    def test_10_email_templating(self):
+        """ Tests designed for the mail.compose.message wizard updated by email_template. """
+        cr, uid, context = self.cr, self.uid, {}
+
+        # create the email.template on mail.group model
+        group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]
+        email_template = self.registry('email.template')
+        email_template_id = email_template.create(cr, uid, {
+            'model_id': group_model_id,
+            'name': 'Pigs Template',
+            'email_from': 'Raoul Grosbedon <raoul@example.com>',
+            'subject': '${object.name}',
+            'body_html': '${object.description}',
+            'user_signature': True,
+            'email_to': 'b@b.b c@c.c',
+            'email_cc': 'd@d.d',
+            'email_recipients': '${user.partner_id.id},%s,%s,-1' % (self.user_raoul.partner_id.id, self.user_bert.partner_id.id)
+        })
+
+        # not force send: email_recipients is not taken into account
+        msg_id = email_template.send_mail(cr, uid, email_template_id, self.group_pigs_id, context=context)
+        mail = self.mail_mail.browse(cr, uid, msg_id, context=context)
+        self.assertEqual(mail.subject, 'Pigs', 'email_template: send_mail: wrong subject')
+        self.assertEqual(mail.email_to, 'b@b.b c@c.c', 'email_template: send_mail: wrong email_to')
+        self.assertEqual(mail.email_cc, 'd@d.d', 'email_template: send_mail: wrong email_cc')
+
+        # force send: take email_recipients into account
+        email_template.send_mail(cr, uid, email_template_id, self.group_pigs_id, force_send=True, context=context)
+        sent_emails = self._build_email_kwargs_list
+        email_to_lst = ['"Followers of Pigs" <admin@example.com>', '"Followers of Pigs" <raoul@raoul.fr>', '"Followers of Pigs" <bert@bert.fr>']
+        self.assertEqual(len(sent_emails), 3, 'email_template: send_mail: 3 valid email recipients -> should send 3 emails')
+        for email in sent_emails:
+            self.assertEqual(len(email['email_to']), 1, 'email_template: send_mail: email_recipient should send email to one recipient at a time')
+            self.assertIn(email['email_to'][0], email_to_lst, 'email_template: send_mail: wrong email_recipients')
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index fbf9d5ecb6f..d49c84bbd6d 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -282,7 +282,9 @@ class mail_mail(osv.Model):
                 # specific behavior to customize the send email for notified partners
                 email_list = []
                 if recipient_ids:
-                    for partner in self.pool.get('res.partner').browse(cr, SUPERUSER_ID, recipient_ids, context=context):
+                    partner_obj = self.pool.get('res.partner')
+                    existing_recipient_ids = partner_obj.exists(cr, SUPERUSER_ID, recipient_ids, context=context)
+                    for partner in partner_obj.browse(cr, SUPERUSER_ID, existing_recipient_ids, context=context):
                         email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
                 else:
                     email_list.append(self.send_get_email_dict(cr, uid, mail, context=context))

From aec8f50b20bf330fbe3c997924e20f0dbff43e55 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 20 Dec 2013 16:05:57 +0100
Subject: [PATCH 522/547] [IMP] gamification: use constances

bzr revid: mat@openerp.com-20131220150557-xaomxnrdb4bxcex3
---
 addons/gamification/models/badge.py | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 99ad7f93edd..b1380627e39 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -29,6 +29,11 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
+CAN_GRANT = 1
+NOBODY_CAN_GRANT = 2
+USER_NOT_VIP = 3
+BADGE_REQUIRED = 4
+TOO_MANY = 5
 
 class gamification_badge_user(osv.Model):
     """User having received a badge"""
@@ -217,15 +222,15 @@ class gamification_badge(osv.Model):
         Do not check for SUPERUSER_ID
         """
         status_code = self._can_grant_badge(cr, uid, badge_id, context=context)
-        if status_code == 1:
+        if status_code == CAN_GRANT:
             return True
-        elif status_code == 2:
+        elif status_code == NOBODY_CAN_GRANT:
             raise osv.except_osv(_('Warning!'), _('This badge can not be sent by users.'))
-        elif status_code == 3:
+        elif status_code == USER_NOT_VIP:
             raise osv.except_osv(_('Warning!'), _('You are not in the user allowed list.'))
-        elif status_code == 4:
+        elif status_code == BADGE_REQUIRED:
             raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
-        elif status_code == 5:
+        elif status_code == TOO_MANY:
             raise osv.except_osv(_('Warning!'), _('You have already sent this badge too many time this month.'))
         else:
             _logger.exception("Unknown badge status code: %d" % int(status_code))
@@ -237,31 +242,26 @@ class gamification_badge(osv.Model):
         :param uid: the id of the res.users trying to send the badge
         :param badge_id: the granted badge id
         :return: integer representing the permission.
-            1: can grant
-            2: nobody can send
-            3: user not in the allowed list
-            4: don't have the required badges
-            5: user's monthly limit reached
         """
         if uid == SUPERUSER_ID:
-            return 1
+            return CAN_GRANT
 
         badge = self.browse(cr, uid, badge_id, context=context)
 
         if badge.rule_auth == 'nobody':
-            return 2
+            return NOBODY_CAN_GRANT
 
         elif badge.rule_auth == 'users' and uid not in [user.id for user in badge.rule_auth_user_ids]:
-            return 3
+            return USER_NOT_VIP
 
         elif badge.rule_auth == 'having':
             all_user_badges = self.pool.get('gamification.badge.user').search(cr, uid, [('user_id', '=', uid)], context=context)
             for required_badge in badge.rule_auth_badge_ids:
                 if required_badge.id not in all_user_badges:
-                    return 4
+                    return BADGE_REQUIRED
 
         if badge.rule_max and badge.stat_my_monthly_sending >= badge.rule_max_number:
-            return 5
+            return TOO_MANY
 
         # badge.rule_auth == 'everyone' -> no check
-        return 1
+        return CAN_GRANT

From 931f52f0f5d7761a05951ae0a7aa0e38d97d9729 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 23 Dec 2013 05:47:46 +0000
Subject: [PATCH 523/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131221061900-mrdvau1f6w722vsn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131222055708-jg10h0irjyde2qii
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054746-koli3yft4vt25ld4
---
 addons/account/i18n/fr.po    | 10 ++--
 addons/hr_payroll/i18n/sl.po | 52 ++++++++++---------
 addons/resource/i18n/sl.po   | 90 ++++++++++++++++++++-------------
 addons/stock/i18n/es_PE.po   | 12 ++---
 addons/survey/i18n/sl.po     | 98 +++++++++++++++++++-----------------
 5 files changed, 145 insertions(+), 117 deletions(-)

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index af85ad650ee..7de6d516636 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-12-11 11:02+0000\n"
-"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
+"PO-Revision-Date: 2013-12-22 18:36+0000\n"
+"Last-Translator: Cedric Le Brouster <cedric.lebrouster@kerbois.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-12 05:58+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-23 05:47+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4560,7 +4560,7 @@ msgstr "Le journal doit avoir un compte de crédit et crédit par défaut"
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr "Configurer les compte bancaires"
+msgstr "Configurer les comptes bancaires"
 
 #. module: account
 #: xsl:account.transfer:0
diff --git a/addons/hr_payroll/i18n/sl.po b/addons/hr_payroll/i18n/sl.po
index 5294aaef1fc..f9b8a10799c 100644
--- a/addons/hr_payroll/i18n/sl.po
+++ b/addons/hr_payroll/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-07 07:13+0000\n"
+"PO-Revision-Date: 2013-12-22 12:21+0000\n"
 "Last-Translator: Darja Zorman <darja.zorman@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-08 05:46+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-23 05:47+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -312,7 +312,7 @@ msgstr "Skupaj delovnih dni"
 #. module: hr_payroll
 #: constraint:hr.payroll.structure:0
 msgid "Error ! You cannot create a recursive Salary Structure."
-msgstr ""
+msgstr "Napaka! Ne morete kreirati rekurzivne plačne strukture."
 
 #. module: hr_payroll
 #: help:hr.payslip.line,code:0
@@ -356,7 +356,7 @@ msgstr ""
 #: help:hr.payslip.line,condition_range_max:0
 #: help:hr.salary.rule,condition_range_max:0
 msgid "The maximum amount, applied for this rule."
-msgstr ""
+msgstr "Maksimalni znesek, uporabljen za to pravilo."
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_python:0
@@ -365,6 +365,8 @@ msgid ""
 "Applied this rule for calculation if condition is true. You can specify "
 "condition like basic > 1000."
 msgstr ""
+"Uporabi to pravilo za izračun, če je pogoj izpolnjen. Lahko določite pogoj "
+"kot: osnova > 1000."
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -398,7 +400,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Search Salary Rule"
-msgstr ""
+msgstr "Išči plačno pravilo"
 
 #. module: hr_payroll
 #: field:hr.payslip,employee_id:0
@@ -421,13 +423,13 @@ msgstr "E-pošta"
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Search Payslip Batches"
-msgstr ""
+msgstr "Išči pakete kuvert"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount_percentage_base:0
 #: field:hr.salary.rule,amount_percentage_base:0
 msgid "Percentage based on"
-msgstr ""
+msgstr "Odstotek temelji na"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:90
@@ -438,7 +440,7 @@ msgstr "%s (kopija)"
 #. module: hr_payroll
 #: help:hr.config.settings,module_hr_payroll_account:0
 msgid "Create journal entries from payslips"
-msgstr ""
+msgstr "Kreiraj postavke dnevnika iz kuvert"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
@@ -683,7 +685,7 @@ msgstr "Kategorija"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Company Contribution"
-msgstr ""
+msgstr "Delež podjetja"
 
 #. module: hr_payroll
 #: help:hr.payslip.run,credit_note:0
@@ -702,7 +704,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
 msgid "Salary Structures"
-msgstr ""
+msgstr "Struktura plač"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
@@ -725,7 +727,7 @@ msgstr "Osnutek"
 #: report:payslip:0
 #: field:payslip.lines.contribution.register,date_from:0
 msgid "Date From"
-msgstr ""
+msgstr "Datum od"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
@@ -795,7 +797,7 @@ msgstr "Aktivno"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Child Rules"
-msgstr ""
+msgstr "Podrejena pravila"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range_min:0
@@ -807,7 +809,7 @@ msgstr ""
 #: selection:hr.payslip.line,condition_select:0
 #: selection:hr.salary.rule,condition_select:0
 msgid "Python Expression"
-msgstr ""
+msgstr "Python izraz"
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -824,7 +826,7 @@ msgstr "Podjetja"
 #: report:paylip.details:0
 #: report:payslip:0
 msgid "Authorized Signature"
-msgstr ""
+msgstr "Avtoriziran podpis"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0
@@ -845,18 +847,18 @@ msgstr "Za pripravo kuvert(e) morate izbrati zaposlene(ga)."
 #: report:paylip.details:0
 #: report:payslip:0
 msgid "Credit"
-msgstr ""
+msgstr "V dobro"
 
 #. module: hr_payroll
 #: field:hr.contract,schedule_pay:0
 msgid "Scheduled Pay"
-msgstr ""
+msgstr "Načrtovano plačilo"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_python:0
 #: field:hr.salary.rule,condition_python:0
 msgid "Python Condition"
-msgstr ""
+msgstr "Python pogoj"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0
@@ -948,7 +950,7 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
 msgid "Salary Structure"
-msgstr ""
+msgstr "Struktura plače"
 
 #. module: hr_payroll
 #: field:hr.contribution.register,register_line_ids:0
@@ -984,7 +986,7 @@ msgstr ""
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
 msgid "Bi-monthly"
-msgstr ""
+msgstr "Dvo-mesečno"
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -1018,7 +1020,7 @@ msgstr "Tiskanje"
 #. module: hr_payroll
 #: view:hr.payslip.line:0
 msgid "Calculations"
-msgstr ""
+msgstr "Izračun"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1056,7 +1058,7 @@ msgstr "Opis"
 #. module: hr_payroll
 #: field:hr.employee,total_wage:0
 msgid "Total Basic Salary"
-msgstr ""
+msgstr "Skupaj osnovna plača"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0
@@ -1098,7 +1100,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
 msgid "Salary Categories"
-msgstr ""
+msgstr "Kategorije plač"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -1117,12 +1119,12 @@ msgstr "Ime"
 #: help:hr.payslip.line,amount_percentage:0
 #: help:hr.salary.rule,amount_percentage:0
 msgid "For example, enter 50.0 to apply a percentage of 50%"
-msgstr ""
+msgstr "Npr. vnesite 50.0, kar pomeni 50%"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Payroll Structures"
-msgstr ""
+msgstr "Struktura plače"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
diff --git a/addons/resource/i18n/sl.po b/addons/resource/i18n/sl.po
index 915569f9b14..b15c1872293 100644
--- a/addons/resource/i18n/sl.po
+++ b/addons/resource/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-11 09:02+0000\n"
+"PO-Revision-Date: 2013-12-22 12:10+0000\n"
 "Last-Translator: Darja Zorman <darja.zorman@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:32+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-23 05:47+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -23,16 +23,18 @@ msgid ""
 "If empty, this is a generic holiday for the company. If a resource is set, "
 "the holiday/leave is only for this resource"
 msgstr ""
+"Če je prazno, je privzet dopust za podjetje. Če je vir nastavljen, je "
+"dopust/odsotnost samo za ta vir."
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Material"
-msgstr ""
+msgstr "Material"
 
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
-msgstr ""
+msgstr "Vrsta vira"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_leaves
@@ -43,12 +45,12 @@ msgstr "Podrobnosti odhoda"
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "Odstotnosti vira"
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
 msgid "Day of Week"
-msgstr ""
+msgstr "Dan v tednu"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_calendar_form
@@ -59,6 +61,11 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Določite delovne ure in urnik, ki se lahko načrtuje za člane "
+"vašega projekta\n"
+"              </p>\n"
+"            "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -79,50 +86,52 @@ msgstr "Nedelja"
 #. module: resource
 #: field:resource.resource,time_efficiency:0
 msgid "Efficiency Factor"
-msgstr ""
+msgstr "Faktor učinkovitosti"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
-msgstr ""
+msgstr "Iskanje vira"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_resource_tree
 #: view:resource.resource:0
 msgid "Resources"
-msgstr ""
+msgstr "Viri"
 
 #. module: resource
 #: code:addons/resource/resource.py:455
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
-msgstr ""
+msgstr "Zagotovite, da bo delovni čas nastavljen s pravimi dnevi v tednu!"
 
 #. module: resource
 #: code:addons/resource/resource.py:373
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopija)"
 
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Išči delovni čas"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Napaka! Datum pričetka odsotnosti mora biti manjši kot datum končanja "
+"odsotnosti."
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Koledar virov"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -162,27 +171,27 @@ msgstr "Datum"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Search Working Period Leaves"
-msgstr ""
+msgstr "Iskanje odsotnosti v delovnem intervalu"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Začetni datum"
 
 #. module: resource
 #: field:resource.calendar,manager:0
 msgid "Workgroup Manager"
-msgstr ""
+msgstr "Vodja delovne skupine"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Končni datum"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
 msgid "Closing Days"
-msgstr ""
+msgstr "Zaključni dnevi"
 
 #. module: resource
 #: model:ir.ui.menu,name:resource.menu_resource_config
@@ -190,7 +199,7 @@ msgstr ""
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
 msgid "Resource"
-msgstr ""
+msgstr "Vir"
 
 #. module: resource
 #: field:resource.calendar,name:0
@@ -213,13 +222,13 @@ msgstr "Delovni čas"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Start and End time of working."
-msgstr ""
+msgstr "Začetni in končni čas dela"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Working Period"
-msgstr ""
+msgstr "Delovno obdobje"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -229,7 +238,7 @@ msgstr "Sreda"
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Podrobnost vira"
 
 #. module: resource
 #: field:resource.resource,active:0
@@ -242,26 +251,28 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Če je aktivno polje nastavljeno, bo doboljeno skriti zapis vira, ne da bi ga "
+"brisali."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Koledar virov"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Dela od"
 
 #. module: resource
 #: help:resource.resource,user_id:0
 msgid "Related user name for the resource to manage its access."
-msgstr ""
+msgstr "Povezano uporabniško ime za vir za upravljanje njegovega dostopa."
 
 #. module: resource
 #: help:resource.resource,calendar_id:0
 msgid "Define the schedule of resource"
-msgstr ""
+msgstr "Določite urnik za ta vir"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -271,7 +282,7 @@ msgstr "Začetni datum odhoda"
 #. module: resource
 #: field:resource.resource,code:0
 msgid "Code"
-msgstr ""
+msgstr "Koda"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -281,12 +292,12 @@ msgstr "Ponedeljek"
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Dela do"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "Podrobnosti dela"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -301,12 +312,16 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficiency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"Polje prikazuje učinkovitost vira za zaključek nalog. Npr.: uporaba samo "
+"tega vira na fazi 5 dni s 5 prirejenimi nalogami, bo prikazala 100% "
+"zasedenost za to fazo; če pa vpišemo učinkovitost 200%, bo njegova "
+"zasedenost samo 50%."
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
 #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Odsotnosti vira"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -315,6 +330,9 @@ msgid ""
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
 msgstr ""
+"Viri vam omogočajo kreiranje in upravljanje virov, ki morajo biti vključeni "
+"v specifično projektno fazo. Prav tako lahko nastavite njihovo stopnjo "
+"učinkovitosti in zasedenosti, ki temelji na njihovih tedenskih delovnih urah."
 
 #. module: resource
 #: view:resource.resource:0
@@ -325,7 +343,7 @@ msgstr "Neaktivno"
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(počitnice)"
 
 #. module: resource
 #: code:addons/resource/resource.py:455
@@ -336,17 +354,17 @@ msgstr "Konfiguracijska napaka"
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Human"
-msgstr ""
+msgstr "Oseba"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Začetni daum"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
diff --git a/addons/stock/i18n/es_PE.po b/addons/stock/i18n/es_PE.po
index 465024862b5..181f43df41d 100644
--- a/addons/stock/i18n/es_PE.po
+++ b/addons/stock/i18n/es_PE.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-09 19:32+0000\n"
-"Last-Translator: Pepe B. @TelFast Peru Partner <pepebalbuena@gmail.com>\n"
+"PO-Revision-Date: 2013-12-21 04:37+0000\n"
+"Last-Translator: Pepe B. @TelFast Perú <pepebalbuena@gmail.com>\n"
 "Language-Team: Spanish (Peru) <es_PE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-11 06:28+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-22 05:57+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -285,7 +285,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
 msgid "Incoming Products"
-msgstr ""
+msgstr "Productos Entrantes"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -2603,7 +2603,7 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Entregar Productos"
 
 #. module: stock
 #: code:addons/stock/stock.py:2249
diff --git a/addons/survey/i18n/sl.po b/addons/survey/i18n/sl.po
index c168779026c..df7a9fd1661 100644
--- a/addons/survey/i18n/sl.po
+++ b/addons/survey/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-21 11:45+0000\n"
+"PO-Revision-Date: 2013-12-22 12:26+0000\n"
 "Last-Translator: Darja Zorman <darja.zorman@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-23 05:47+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -1403,42 +1403,44 @@ msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
 "use a number that is smaller than %d."
 msgstr ""
+"#zahtevano odgovor, ki ste ga vnesli, je večji kot število odgovorov. "
+"Prosimo, vnesite število, manjše od %d."
 
 #. module: survey
 #: help:survey,max_response_limit:0
 msgid "Set to one if survey is answerable only once"
-msgstr ""
+msgstr "Nastavite na ena, če se na anketo odgovarja le enkrat."
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr ""
+msgstr "Končano "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
 msgid "Survey Question Column Heading"
-msgstr ""
+msgstr "Naziv stolpca anketnega vprašanja"
 
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "#Povprečno"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "Matrika možnosti (več odgovorov na vrstico)"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 msgid "Give Survey Answer"
-msgstr ""
+msgstr "Podajte anketni odgovor"
 
 #. module: survey
 #: help:survey.browse.answer,response_id:0
 msgid ""
 "If this field is empty, all answers of the selected survey will be print."
-msgstr ""
+msgstr "Če je to polje prazno, bodo natisnjeni vsi odgovori izbrane ankete"
 
 #. module: survey
 #: selection:survey.response.line,state:0
@@ -1448,28 +1450,28 @@ msgstr "Odgovorjeno"
 #. module: survey
 #: field:survey,send_response:0
 msgid "Email Notification on Answer"
-msgstr ""
+msgstr "Elektronsko sporočilo na odgovor"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:445
 #, python-format
 msgid "Complete Survey Answer"
-msgstr ""
+msgstr "Zaključi odgovor ankete"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Comment/Essay Box"
-msgstr ""
+msgstr "Polje za komentar"
 
 #. module: survey
 #: field:survey.answer,type:0
 msgid "Type of Answer"
-msgstr ""
+msgstr "Tip odgovora"
 
 #. module: survey
 #: field:survey.question,required_type:0
 msgid "Respondent must answer"
-msgstr ""
+msgstr "Pozvani mora odgovoriti"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
@@ -1481,22 +1483,22 @@ msgstr "Pošlji vabilo"
 #: code:addons/survey/wizard/survey_selection.py:80
 #, python-format
 msgid "You cannot give response for this survey more than %s times."
-msgstr ""
+msgstr "Ne morete odgovoriti na to anketo več kot %s krat."
 
 #. module: survey
 #: view:survey.question:0
 msgid "Search Question"
-msgstr ""
+msgstr "Iskanje vprašanja"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Single Textbox"
-msgstr ""
+msgstr "Enostaven tekstovni okvirček"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_question_form
 msgid "Survey Questions"
-msgstr ""
+msgstr "Vprašanje ankete"
 
 #. module: survey
 #: field:survey,note:0
@@ -1522,37 +1524,37 @@ msgstr "survey.send.invitation.log"
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Portrait(Vertical)"
-msgstr ""
+msgstr "Pokončno (vertikalno)"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:67
 #: code:addons/survey/wizard/survey_send_invitation.py:68
 #, python-format
 msgid "Invitation for %s"
-msgstr ""
+msgstr "Povabilo za %s"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "Mora biti določene dolžine"
 
 #. module: survey
 #: model:survey.type,name:survey.survey_type3
 msgid "Supplier Selection"
-msgstr ""
+msgstr "Izbira dobavitelja"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:992
 #, python-format
 msgid "You cannot select same answer more than one time.'"
-msgstr ""
+msgstr "Ne morete izbrati istega odgovora več kot enkrat."
 
 #. module: survey
 #: code:addons/survey/survey.py:685
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "Ne morete podvojiti vira!"
 
 #. module: survey
 #: code:addons/survey/survey.py:523
@@ -1561,22 +1563,24 @@ msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
 "Please use a number that is smaller than %d."
 msgstr ""
+"Minimalni zahtevan odgovor, ki ste ga vnesli, je večji kot številka "
+"odgovora. Prosimo, uporabite število, ki je manjše od %d."
 
 #. module: survey
 #: view:survey:0
 msgid "All Open Survey"
-msgstr ""
+msgstr "Vse odprte ankete"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
 #: field:survey.browse.answer,response_id:0
 msgid "Survey Answers"
-msgstr ""
+msgstr "Anketni odgovori"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_answer
 msgid "Surveys Answers"
-msgstr ""
+msgstr "Odgovori anket"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
@@ -1591,12 +1595,14 @@ msgid ""
 "than the number of answer.                                    Please use a "
 "number that is smaller than %d."
 msgstr ""
+"#zahtevan odgovor, ki ste ga vnesli, je večji kot število odgovorov. "
+"Prosimo, uporabite število, manjše od %d."
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Legal (8.5\" x 14\")"
 
 #. module: survey
 #: field:survey.type,name:0
@@ -1606,17 +1612,17 @@ msgstr "Ime"
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "#vprašanj"
 
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "Vsota vseh izbir"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Request"
-msgstr ""
+msgstr "Zahteva"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
@@ -1690,6 +1696,8 @@ msgid ""
 "greater than the number of answer.                                    Please "
 "use a number that is smaller than %d."
 msgstr ""
+"Minimalni zahtevan odgovor, ki ste ga vnesli, je večji kot število "
+"odgovorov. Prosimo, uporabite število, manjše od %d."
 
 #. module: survey
 #: field:survey.answer,menu_choice:0
@@ -1707,12 +1715,12 @@ msgstr "ID"
 msgid ""
 "Maximum Required Answer is greater                                     than "
 "Minimum Required Answer"
-msgstr ""
+msgstr "Maksimalni zahtevan odgovor je večji kot minimalni zahtevan odgovor."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "User creation"
-msgstr ""
+msgstr "Kreiranje uporabnika"
 
 #. module: survey
 #: selection:survey.question,required_type:0
@@ -1723,17 +1731,17 @@ msgstr "Vse"
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be An Email Address"
-msgstr ""
+msgstr "Mora biti elektronski naslov"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Only One Answer)"
-msgstr ""
+msgstr "Več izbir (Samo en odgovor)"
 
 #. module: survey
 #: field:survey.answer,in_visible_answer_type:0
 msgid "Is Answer Type Invisible??"
-msgstr ""
+msgstr "Ali tip odgovora ni viden?"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_answer
@@ -1763,7 +1771,7 @@ msgstr "ali"
 #. module: survey
 #: field:survey,title:0
 msgid "Survey Title"
-msgstr ""
+msgstr "Naziv ankete"
 
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
@@ -1792,17 +1800,17 @@ msgstr "Naziv stolpca"
 #: model:ir.ui.menu,name:survey.menu_survey_page_form1
 #: view:survey.page:0
 msgid "Survey Pages"
-msgstr ""
+msgstr "Strani ankete"
 
 #. module: survey
 #: field:survey.question,type:0
 msgid "Question Type"
-msgstr ""
+msgstr "Tip vprašanja"
 
 #. module: survey
 #: field:survey.question,in_visible_answer_type:0
 msgid "Is Answer Type Invisible?"
-msgstr ""
+msgstr "Ali je tip neviden?"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -1814,20 +1822,20 @@ msgstr "Razpredelnica"
 #: code:addons/survey/wizard/survey_answer.py:117
 #, python-format
 msgid "You cannot answer because the survey is not open."
-msgstr ""
+msgstr "Ne morete odgovarjati, ker anketa ni odprta."
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
 #: field:survey.question,validation_minimum_date:0
 msgid "Minimum date"
-msgstr ""
+msgstr "Minimalni datum"
 
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "Maksimalno odgovorov po uporabniku"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "Pozicija strani"

From 2c9ef5b3d5c1b5fa586b6a3a9d027f8220e4c1e6 Mon Sep 17 00:00:00 2001
From: Rifakat <rha@tinyerp.com>
Date: Mon, 23 Dec 2013 15:48:41 +0530
Subject: [PATCH 524/547] [FIX] hr_payroll: put a check for the structure used
 in the contract. When any structure is already assigned into contract and
 that is deleted, it will affet the Payslips which were already created and
 will have [False] value.

bzr revid: rha@tinyerp.com-20131223101841-6fbwfm90gn7sj17m
---
 addons/hr_payroll/hr_payroll.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 5fd74ff9fe0..95ae878e40f 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -146,7 +146,9 @@ class hr_contract(osv.osv):
         @return: the structures linked to the given contracts, ordered by hierachy (parent=False first, then first level children and so on) and without duplicata
         """
         all_structures = []
-        structure_ids = [contract.struct_id.id for contract in self.browse(cr, uid, contract_ids, context=context)]
+        structure_ids = [contract.struct_id.id for contract in self.browse(cr, uid, contract_ids, context=context) if contract.struct_id]
+        if not structure_ids:
+            return []
         return list(set(self.pool.get('hr.payroll.structure')._get_parent_structure(cr, uid, structure_ids, context=context)))
 
 hr_contract()

From 36846db2c3d172ceacf1890c40e3040900f93771 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 23 Dec 2013 16:46:31 +0100
Subject: [PATCH 525/547] [FIX] account_check_writing: display real currency
 name on check print

Instead of 'Euro' hardcoded.
As the currency complete name is not available in res.curreny model, exceptions are made for currencies EUR, USD and BRL, the mosts used currencies for checks (+75% of cases)

bzr revid: dle@openerp.com-20131223154631-21oenwn8mxszyo5t
---
 addons/account_check_writing/account_voucher.py    | 14 +++++++++++++-
 addons/account_check_writing/report/check_print.py |  1 -
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py
index 7a5d12f5cff..f7b35dccacc 100644
--- a/addons/account_check_writing/account_voucher.py
+++ b/addons/account_check_writing/account_voucher.py
@@ -49,9 +49,21 @@ class account_voucher(osv.osv):
         if 'value' in default:
             amount = 'amount' in default['value'] and default['value']['amount'] or amount
 
+            # Currency complete name is not available in res.currency model
+            # Exceptions done here (EUR, USD, BRL) cover 75% of cases
+            # For other currencies, display the currency code
+            currency = self.pool['res.currency'].browse(cr, uid, currency_id, context=context)
+            if currency.name.upper() == 'EUR':
+                currency_name = 'Euro'
+            elif currency.name.upper() == 'USD':
+                currency_name = 'Dollars'
+            elif currency.name.upper() == 'BRL':
+                currency_name = 'reais'
+            else:
+                currency_name = currency.name
             #TODO : generic amount_to_text is not ready yet, otherwise language (and country) and currency can be passed
             #amount_in_word = amount_to_text(amount, context=context)
-            amount_in_word = amount_to_text(amount)
+            amount_in_word = amount_to_text(amount, currency=currency_name)
             default['value'].update({'amount_in_word':amount_in_word})
             if journal_id:
                 allow_check_writing = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).allow_check_writing
diff --git a/addons/account_check_writing/report/check_print.py b/addons/account_check_writing/report/check_print.py
index 57360025623..add79fcc35a 100644
--- a/addons/account_check_writing/report/check_print.py
+++ b/addons/account_check_writing/report/check_print.py
@@ -34,7 +34,6 @@ class report_print_check(report_sxw.rml_parse):
             'fill_stars' : self.fill_stars,
         })
     def fill_stars(self, amount):
-        amount = amount.replace('Dollars','')
         if len(amount) < 100:
             stars = 100 - len(amount)
             return ' '.join([amount,'*'*stars])

From 87aae0efca04e10c923bf778d0a20ffc94da5686 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 24 Dec 2013 05:52:13 +0000
Subject: [PATCH 526/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131224055213-dm6b0zx4e0fn18ex
---
 addons/account/i18n/ja.po    | 14 +++++++-----
 addons/base_gengo/i18n/sl.po | 44 ++++++++++++++++++++----------------
 addons/crm_claim/i18n/hr.po  | 14 +++++++-----
 3 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index a1fde32a549..af0e1b1bc6d 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-11-24 10:34+0000\n"
-"Last-Translator: Yoshi Tashiro <yostashiro@gmail.com>\n"
+"PO-Revision-Date: 2013-12-23 17:35+0000\n"
+"Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-25 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-24 05:52+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5526,7 +5526,7 @@ msgstr "貸借対照表"
 #: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr "損益（損益勘定）"
+msgstr "損益計算書（収益勘定）"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -8693,7 +8693,7 @@ msgstr ""
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr "損益計算書 / 貸借対照表分類"
+msgstr "損益計算書 / 貸借対照表区分"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9176,6 +9176,8 @@ msgid ""
 "You cannot select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
 msgstr ""
+"設定エラー！\n"
+"内部タイプが「売掛金/買掛金」のアカウントは「未消込」以外の繰延方法でアカウントタイプを選択できません。"
 
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
diff --git a/addons/base_gengo/i18n/sl.po b/addons/base_gengo/i18n/sl.po
index 57655fa36db..c8ac7601055 100644
--- a/addons/base_gengo/i18n/sl.po
+++ b/addons/base_gengo/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-09 10:27+0000\n"
-"Last-Translator: Darja Zorman <darja.zorman@mentis.si>\n"
+"PO-Revision-Date: 2013-12-23 14:46+0000\n"
+"Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:02+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-24 05:52+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: base_gengo
 #: view:res.company:0
@@ -47,12 +47,12 @@ msgstr "Gengo privatni ključ"
 #: constraint:ir.translation:0
 msgid ""
 "The Gengo translation service selected is not supported for this language."
-msgstr ""
+msgstr "Genko ni podprt za ta jezik"
 
 #. module: base_gengo
 #: view:res.company:0
 msgid "Add Gengo login Public Key..."
-msgstr ""
+msgstr "Dodaj Genko javni ključ"
 
 #. module: base_gengo
 #: model:ir.model,name:base_gengo.model_base_gengo_translations
@@ -62,7 +62,7 @@ msgstr "base.gengo.translations"
 #. module: base_gengo
 #: view:ir.translation:0
 msgid "Gengo Comments & Activity..."
-msgstr ""
+msgstr "Genko komentarji&aktivnosti"
 
 #. module: base_gengo
 #: help:res.company,gengo_auto_approve:0
@@ -91,7 +91,7 @@ msgstr "Gengo Sync Translation (Response)"
 msgid ""
 "Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
 "authentication parameters under `Settings > Companies > Gengo Parameters`."
-msgstr ""
+msgstr "Parameter"
 
 #. module: base_gengo
 #: selection:ir.translation,gengo_translation:0
@@ -101,7 +101,7 @@ msgstr "Strojno prevajanje"
 #. module: base_gengo
 #: view:res.company:0
 msgid "Add Gengo login Private Key..."
-msgstr ""
+msgstr "Dodaj Genko privatni ključ"
 
 #. module: base_gengo
 #: code:addons/base_gengo/wizard/base_gengo_translations.py:155
@@ -112,11 +112,15 @@ msgid ""
 "--\n"
 " Commented on %s by %s."
 msgstr ""
+"%s\n"
+"\n"
+"--\n"
+" Komentar na %s od %s."
 
 #. module: base_gengo
 #: field:ir.translation,gengo_translation:0
 msgid "Gengo Translation Service Level"
-msgstr ""
+msgstr "Genko - nivo"
 
 #. module: base_gengo
 #: view:res.company:0
@@ -143,7 +147,7 @@ msgstr "Ponovni zagon pošiljanja"
 #. module: base_gengo
 #: view:ir.translation:0
 msgid "To Approve In Gengo"
-msgstr ""
+msgstr "Potrditev v Genko"
 
 #. module: base_gengo
 #: view:res.company:0
@@ -174,20 +178,20 @@ msgstr "Prevodi"
 #. module: base_gengo
 #: field:res.company,gengo_auto_approve:0
 msgid "Auto Approve Translation ?"
-msgstr ""
+msgstr "Prevod samodejno potrjen ?"
 
 #. module: base_gengo
 #: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
 #: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
 msgid "Gengo: Manual Request of Translation"
-msgstr ""
+msgstr "Gengo:zahtevek za prevod"
 
 #. module: base_gengo
 #: code:addons/base_gengo/ir_translation.py:62
 #: code:addons/base_gengo/wizard/base_gengo_translations.py:109
 #, python-format
 msgid "Gengo Authentication Error"
-msgstr ""
+msgstr "Gengo napaka avtorizacije"
 
 #. module: base_gengo
 #: model:ir.model,name:base_gengo.model_res_company
@@ -213,7 +217,7 @@ msgstr ""
 #. module: base_gengo
 #: view:res.company:0
 msgid "Gengo Parameters"
-msgstr ""
+msgstr "Gengo- Parametri"
 
 #. module: base_gengo
 #: view:base.gengo.translations:0
@@ -223,7 +227,7 @@ msgstr "Pošlji"
 #. module: base_gengo
 #: selection:ir.translation,gengo_translation:0
 msgid "Ultra"
-msgstr ""
+msgstr "Ultra"
 
 #. module: base_gengo
 #: model:ir.model,name:base_gengo.model_ir_translation
@@ -233,17 +237,17 @@ msgstr "ir.translation"
 #. module: base_gengo
 #: view:ir.translation:0
 msgid "Gengo Translation Service"
-msgstr ""
+msgstr "Gengo - Prevajanje"
 
 #. module: base_gengo
 #: selection:ir.translation,gengo_translation:0
 msgid "Pro"
-msgstr ""
+msgstr "Pro"
 
 #. module: base_gengo
 #: view:base.gengo.translations:0
 msgid "Gengo Request Form"
-msgstr ""
+msgstr "Gengo obrazec zahtevka"
 
 #. module: base_gengo
 #: code:addons/base_gengo/wizard/base_gengo_translations.py:114
@@ -256,7 +260,7 @@ msgstr "Opozorilo"
 msgid ""
 "This comment will be automatically be enclosed in each an every request sent "
 "to Gengo"
-msgstr ""
+msgstr "Ta komentar bo dodan vsakemu zahtevku"
 
 #. module: base_gengo
 #: view:base.gengo.translations:0
diff --git a/addons/crm_claim/i18n/hr.po b/addons/crm_claim/i18n/hr.po
index c4d79ced14d..0c14864345a 100644
--- a/addons/crm_claim/i18n/hr.po
+++ b/addons/crm_claim/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-23 13:03+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:05+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2013-12-24 05:52+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -23,6 +23,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Ova faza nije vidljiva, na primjer u statusnoj liniji ili kanban pogledu, "
+"kada nema zapisa u toj fazi za prikaz."
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -65,7 +67,7 @@ msgstr "Odgodi zatvaranje"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Nepročitane poruke"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -100,7 +102,7 @@ msgstr "#Zahtjeva"
 #. module: crm_claim
 #: field:crm.claim.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Naziv faze"
 
 #. module: crm_claim
 #: view:crm.claim.report:0

From d1b4aa974d28cd919dd3675b62bc61077e02de4b Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 24 Dec 2013 11:35:35 +0100
Subject: [PATCH 527/547] [FIX] account_voucher: computed writeoff and invoices
 selected were not right on partial invoice payment in account voucher wizard.

Due to the algorithm which did not handle the fact that an invoice could have several move lines

bzr revid: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
---
 addons/account_voucher/account_voucher.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index ef2b861bd4e..e4aa535083c 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -755,7 +755,7 @@ class account_voucher(osv.osv):
             ids = context['move_line_ids']
         invoice_id = context.get('invoice_id', False)
         company_currency = journal.company_id.currency_id.id
-        move_line_found = False
+        move_lines_found = []
 
         #order the lines by most old first
         ids.reverse()
@@ -770,21 +770,20 @@ class account_voucher(osv.osv):
                 if line.invoice.id == invoice_id:
                     #if the invoice linked to the voucher line is equal to the invoice_id in context
                     #then we assign the amount on that line, whatever the other voucher lines
-                    move_line_found = line.id
-                    break
+                    move_lines_found.append(line.id)
             elif currency_id == company_currency:
                 #otherwise treatments is the same but with other field names
                 if line.amount_residual == price:
                     #if the amount residual is equal the amount voucher, we assign it to that voucher
                     #line, whatever the other voucher lines
-                    move_line_found = line.id
+                    move_lines_found.append(line.id)
                     break
                 #otherwise we will split the voucher amount on each line (by most old first)
                 total_credit += line.credit or 0.0
                 total_debit += line.debit or 0.0
             elif currency_id == line.currency_id.id:
                 if line.amount_residual_currency == price:
-                    move_line_found = line.id
+                    move_lines_found.append(line.id)
                     break
                 total_credit += line.credit and line.amount_currency or 0.0
                 total_debit += line.debit and line.amount_currency or 0.0
@@ -809,15 +808,16 @@ class account_voucher(osv.osv):
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
                 'amount_original': amount_original,
-                'amount': (move_line_found == line.id) and min(abs(price), amount_unreconciled) or 0.0,
+                'amount': (line.id in move_lines_found) and min(abs(price), amount_unreconciled) or 0.0,
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled': amount_unreconciled,
                 'currency_id': line_currency_id,
             }
+            price -= rs['amount']
             #in case a corresponding move_line hasn't been found, we now try to assign the voucher amount
             #on existing invoices: we split voucher amount by most old first, but only for lines in the same currency
-            if not move_line_found:
+            if not move_lines_found:
                 if currency_id == line_currency_id:
                     if line.credit:
                         amount = min(amount_unreconciled, abs(total_debit))

From 0c048780710dabb7b19e6eda659cc8294238d01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 23 Dec 2013 10:20:57 +0100
Subject: [PATCH 528/547] [REV] document: reverted a change in spacingf to
 lessen the diff

bzr revid: tde@openerp.com-20131223092057-drrvt9w12r5uwrn4
---
 addons/document/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index ea63f495902..eb51ad5ac57 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -1035,7 +1035,7 @@ class node_dir(node_database):
                     print "Cannot eval %s." % dfld.expr
                     print e
                     pass
-    
+
     def __eq__(self, other):
         if type(self) != type(other):
             return False

From c5148a640c2b7e29bece920a3ccee49b1fe8551c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 23 Dec 2013 10:28:19 +0100
Subject: [PATCH 529/547] [IMP] hr_recruitment: improved template + xml_id of
 templates for interest / refuse

bzr revid: tde@openerp.com-20131223092819-nxiqqy21wd8f2wk8
---
 addons/hr_recruitment/hr_recruitment_data.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 59d1589e7ff..72337ac31af 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -18,7 +18,7 @@
     </record>
 
     <!-- Templates for approval / refusing applicants -->
-    <record id="email_template_refuse_applicant" model="email.template">
+    <record id="applicant_refuse" model="email.template">
         <field name="name">Application refused</field>
         <field name="subject">Application refused</field>
         <field name="email_to">${object.email_from}</field>
@@ -26,7 +26,7 @@
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field name="user_signature" eval="0"/>
-        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name or 'applicant'},</p>
         <p>We thank you for your interest in our company and for your application.
         Unfortunately, your profile does not match with our needs or our recruitment
         campaign has reached its term.</p>
@@ -36,7 +36,7 @@
          ${object.user_id and object.user_id.signature or ''}]]></field>
     </record>
 
-    <record id="email_template_approve_applicant" model="email.template">
+    <record id="applicant_interest" model="email.template">
         <field name="name">Application approved</field>
         <field name="subject">Application approved</field>
         <field name="email_to">${object.email_from}</field>
@@ -44,7 +44,7 @@
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field name="user_signature" eval="0"/>
-        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name or 'applicant'},</p>
         <p>Congrats! Your resume's got our interest!
         I will call you as soon as possible to make a 10 minutes phone interview and  plan a first meeting.</p>
         <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030
@@ -95,7 +95,7 @@
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
-        <field name="template_id" ref="email_template_approve_applicant"/>
+        <field name="template_id" ref="applicant_interest"/>
         <field name="sequence">2</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
@@ -114,7 +114,7 @@
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
         <field name="sequence">6</field>
-        <field name="template_id" ref="email_template_refuse_applicant"/>
+        <field name="template_id" ref="applicant_refuse"/>
         <field name="fold" eval="True"/>
     </record>
 

From b9e8df4a436745290b95086f381da160144e42e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 23 Dec 2013 10:28:31 +0100
Subject: [PATCH 530/547] [DOC] hr_recruitment: added changelog about
 template_id field

bzr revid: tde@openerp.com-20131223092831-lg6j9as0go1r2g7e
---
 addons/hr_recruitment/doc/changelog.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
index 404b94ee6d1..7cfce3f677d 100644
--- a/addons/hr_recruitment/doc/changelog.rst
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -3,6 +3,13 @@
 Changelog
 =========
 
+`trunk (saas-3)`
+----------------
+
+- ``hr.recruitment.stage``: added template_id field. If an email template is linked
+  to the stage, it is used to render and post a message on the applicant. This
+  allows for example to have template for accepted or refused applicants.
+
 `trunk (saas-2)`
 ----------------
 

From c0eef311602c986e5ab54ebba016eb12d49e1467 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 23 Dec 2013 16:54:04 +0100
Subject: [PATCH 531/547] [REF] gamification: add user_from_id on badge, remove
 outdated-doc, remove useless message_post call

bzr revid: mat@openerp.com-20131223155404-h4in4ocr8jakq3ff
---
 addons/gamification/data/badge.xml            | 240 +++++++++++++++++-
 .../doc/gamification_plan_howto.rst           | 107 --------
 addons/gamification/doc/goal.rst              |  44 ----
 addons/gamification/doc/goal_type.rst         |  42 ---
 addons/gamification/doc/index.rst             |  24 --
 addons/gamification/models/badge.py           |  21 +-
 addons/gamification/models/challenge.py       |   5 +-
 .../static/src/js/gamification.js             |  41 ++-
 addons/gamification/views/badge.xml           |   2 +-
 addons/gamification/wizard/grant_badge.py     |   3 +-
 addons/hr_gamification/models/gamification.py |  11 -
 addons/hr_gamification/wizard/grant_badge.py  |   3 +-
 12 files changed, 292 insertions(+), 251 deletions(-)
 delete mode 100644 addons/gamification/doc/gamification_plan_howto.rst
 delete mode 100644 addons/gamification/doc/goal.rst
 delete mode 100644 addons/gamification/doc/goal_type.rst
 delete mode 100644 addons/gamification/doc/index.rst

diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml
index 35686b0ec4d..5588d327f82 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -616,6 +616,242 @@
                                 c3eZ58/32vV1fV1f19f1dX1dX9fX9XV9XV/X1/V1fb0a1/8He8q//0YPCp0AAAAASUVORK5CYII=</field>
         </record>
 
+        <record id="badge_hidden" model="gamification.badge">
+            <field name="name">Hidden</field>
+            <field name="description">You have found the hidden badge</field>
+            <field name="rule_auth">nobody</field>
+            <field name="image">iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY51AAAABmJLR0QAFAA2AIJPc/ETAAAACXBI
+                                WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QwXDzEYtCf/rwAAIABJREFUeNrtnXeUZNdd5z/3vcrV
+                                OXdP6slRI1mWZcnIki2MscEBgzFRYGOMDSyGxXhhd88hLIfFrO0D2GRjFrAXGxs5IBsHWRZyUhxp
+                                NKOJmtAzPd09nauqK1e9d/ePek/9pjQjTequ96p+n3NK3ROO5vUN3/f93fu7vwuCIAiCIAiCIAiC
+                                IAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiC
+                                IAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiC
+                                IAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiCIAiC8GIoaQLhGsfKlY4hfYW/LwgiWMKL
+                                jon6r53AFmAUGAZGgEHAfJGxpIFFYM75zAKTwITzVXvE6lJfRdAEESzhAlFa6wjQMHAjsB3Y7Hz6
+                                YwYkI5ClHdMIEQ8roqbCUC9upyoWlCxNydIou0ySHMUqFKpg1f7aOPCs8zkAnHLE7TwwA9h1IiZC
+                                JoIltJA4KWAj8NPAjzoC9dwfbuwK0dM1wLixm209BjPhXcxb3df9gWwMXpP4LqdSFpOpLJusfTwz
+                                WyFVtOs17xngP4AvAE87AuaKmP0CrkwQwRIC1r/KCd/eArzOCevWtxnEent66eoa4lzoZnriipzZ
+                                TzwSIWV1ABqFja1BoVErpAM2Ru0hlUJjAIp+c550ySJmLVAuF+gtHyabmSKdmmO+TNUJJceAbwGf
+                                A444wmVdIsQURLAEH/fnMLAbeBPw4zGTwVC0g3iii20DHRTab2TMuAV0GW3bmFR8+wPVZNNEKZOY
+                                qVmvD1POnGB8ZppCYQG7uEi+ShH4LHAfcBA4XefCRMBEsASf9WEYeAfwB9TWorhtWJHueyOz8Vua
+                                9oevEuImvg3T3+TbZ0tYNUnKAB8G/grIOc7L675EuESwhAb0XQfwfuCNwK7tXYSKva/ESm4hluhh
+                                QfejdBWF3dQNYWOAMulQS1jFWTqLhynP7eP4XBHgOPAg8LfAUUe4Lua+BBEsYQX6awB4BfAbYcWd
+                                kUQPmwd6Kfa+mrnQVrDLGO7eW4tiYaJVlDXGGcyZb3JiehYKM+QtjgB/5gjYeJ14ScgogiVcx35a
+                                D/wzcKcCNo3uJTpyNzPVHmmdyyCqygwufIHDp5+hWAXgCeA9juuqesRLXJcIlnAN/fMbwC8BO3at
+                                GWGh5/WEkiMUdAy0vWK7d82IViZJlYP8OOXZJ5mfOkQFTgD/Qm3Nq8zz17sEESzhRfpkCLgH+EA8
+                                llAbhjbAyBuYtvowdUla6FqFCwUqxIg5yfzEoxRmD7CYL2rg/zguduwirksQwRLq+iJKbXH45zqj
+                                sH3nazkZubPpF839QG/pIPPHPkttnZ4vAu8C8kBFhEsES7iwD9qAvwfevKanJ6pH3kC0fS0ZKyFi
+                                tWquyyCkbGKFZ+mY/iwHp4sWcD/wa9SOCJVFuESwWp0+4JeB/9XR3sfgxrtYSNyKsiXsayQVI8n2
+                                yoOcPPE9UukFLPg7aruLZ8VxiWC1arv/EvCXvTHMPTe+kYP65RjipnzHiH6WxaOfYHwJgA8BfwwU
+                                PcIli/MiWE3d3m8BPtgdYVP75jdD526ydkLEyrehosJUGpaOY4x9kvN5ZoEPOiG8K1ySDiGC1XTt
+                                PAJ8NGyqt6wZ3kHHpjdxrtguQhUguiIWlYn/IDXxOOky+6ilnBwESnXCJYhgBbqNfx340w2dJsb2
+                                32CJzkB6DW1X0VYJ0zAxjFoGmHoBZ2ITeu5XaI3WFlprlBEGZaJUcIdg+9hHOD0zB/D/gN+ktqNY
+                                kjBRBCvIbbsOuG8wyt74lrdS7thLyVL+T/bUFnZ+AlNnQdtQSZGdPUw5v4BlVZ774V7sp1BGBJQC
+                                bWMo0Fo7ghXBiLTT0dlLONaBHV2DNqJgRLFVAiPW6/vOjZkalTuFPvlPnMtxHvhtatUi6te3BBGs
+                                QLTruw34696+9SS3/DRLdtLXQqXLKcL2PEZxkqkTD2IojWWt7pnESDhMuVIhluyhc+3t2LFRtDIh
+                                1AlG2J/tZsZpG/8HZqeOkLf4GPCHQMpxW1WQmF8Ey990AIcVrHnlLa/lsHGHTxVKo5RNjBQzR+7F
+                                KpynWq368lGNUJx1e38MO7qOsh3Gsk2ceNI3dOtJzjz5t5QtXQbuBg4DBZYz5sVtiWD5ri3fAfzZ
+                                7pG+9tSad1BQXb6snNAWyjJ5+PNYufNYlaVgNbIRZmD9jXStfzXzxXb/6D+KqCrTOXMvR04fBvgn
+                                J0zMIWtbIlg+Iwz8iWEY/3X35pdwrudtvjzzZ5SnWTz1H1Qyp5ui0aM9u+nd8AoqkXVon8hARcXY
+                                Vn6QA4e+SalcegR4N7WE04InRBTREsFqWPuFgRMhg3Ubbn4PaWPEZ49oY5ZnmDv6r1jF+abshFCs
+                                l85tb0NFh3wVKkaP/TET6UIZeC1wyHFbsiB/DZjSBNfEDwBP7hrs6GfX+8mrbl+9AQxdIH30EyyN
+                                P4BdzTdtJ9jVAoXpfViZYyQ7h7HNDn88V/+djCYy5uzC1NuBELCP519ZJohgrYqz+mUFn9656YbI
+                                1LrfRGnLV2Jll9MsHv441fxUy3SKVV4ie34fWDmiHevRKtTwZ8ok9rKzFxbnTt1uafYCDyDFAiUk
+                                XOU2uzdi8Jahve8kHxn11ZjT5TS5ye9QnN0HutqynWSEEvTu+Al0YqMvnqddZVja/yHmSiwCdwBT
+                                1Na1JENeHNaKCVUUeDgRjX7/1pt/jkVzo6/GWTV9hNTRf6SaPUurp/9ou0Jx7gBWKUXbwC4su7H9
+                                VCJG2/DLSOSPxLPFwk8DjwDzXFhTXhDBum70Ao8OdcRvTOz+dRbVoK8SQcsLB0if+BzYFekpV7S0
+                                ppqfopqfJNq1BVTjkk8VUCGC1X8XG/Sh2NxS9qeo1ZWf5sJbfAQRrGsmAYxt7k2sK2z771gq4ptY
+                                2jQUSyfvJXfuQXlRX8p5FuYoLRwh3rsbjGhjbbq2yHe+XLVHDSO3eOpt1G6tHhfREsG6XuwAjg+P
+                                7OosbHyPvzrP0GRPfobC3EHppRdzW9UCpbmniMcTEGt06omG5Chr2kOk5069Wdfys54W0RLBulZu
+                                VPDM6PCGSHXDz2P7aBgpBfbC46THvyO9dLkyYVcpp08S79kBobaGP08hupHtnSXm58bvsGCB2pVj
+                                IloiWFfFWuDw7vWjxuKad/pOrEpT32Jx7Osyrq8Q27YpzB4gOXgzGJHG9iOahcg29g6GOTd18m5q
+                                u4bPsJxYKjG+CNZlcTNwaM/mPaGF4Xt8JVYAxYmvs3TuP0WsrtpqWZTm9tPetwnbbOx5RAPNormB
+                                m4YizEyfvNPSRKklmFZFtESwLoe9Cp66cXTUmBu6h4rlL1GwsydJn/qyiNU1h4cVyumTtI28HFs3
+                                fgtlxhhlT0+FmZmzL3PCw2PI2UMRrBehCzi2Y92G0PTQO33nrHR5gYVD/wDakp66DljVIuWFQySG
+                                b2v44WkDzVxoKzv6w0yeP3k3MAmcRG7oEcG66HJCreb6qdF1uxLZNT/vP7HSNumj/4hdzkhvXU/R
+                                quTp6OjEjgz7YBBq0qENbO4OszBz8rU2TDiiJU5LBOsC2oGne3rW9Vmjb8fS/hsX5fMPUZyX9IWV
+                                IDd3nP7Nr6bik5NMmfAo3eECmdS5u4HvUsuIF9ECDBmuKOB767vja4wt78L2oVjZlSWyE9+SnlpB
+                                9zr+2J/5JtQ2sMkOvJnv27YxBHwO2Emtkm3UMRktewa41QVLAQ8MtEX2qO3v9e1D5sfvR9v+P8hs
+                                KBPDMC/SxAEYCJUUXVH/VF8NUeZk98+zY7gP4JPUjoa1AxFn3qpWnbCtLFa/2xbm99v2vo+q2eHL
+                                5rDLKRae/ojvKi8opTCi3UQ7NxJODmNGOjEMA5TCUkk0BtglsMvoSoZKZoxi+jR2Oe3bARFqW0PX
+                                rnf7q/9VFPPIHzKbyR4C3gbMAktAmRZMeWhlwfrFsOJjW1/2LqZZ79sbbQoTD5CbeMhfg8aMkhx6
+                                KbH+W1CRXvRlDiNtV7ALUyyNfZVqbtKX823NjT9DKbrdV8/UYy4x+fgHyVb5MvA+YA7IslyapmVo
+                                xUV3BWwAvn7bDbcaZ8K3+las7MoSSyc+W7sb0Ce0D99C59afJNS1G8zEFb3zlDIxIp3E+28gkuyn
+                                nJtCW0V/vSBSE8SGbvPXkoCOMdC/joWpp7dR2zk8xXKpZRGsJqcDmNyyfmdorOceTPxbjqUw9R0q
+                                mVO+eJZwrIOuHfcQ7ru1dunptVk0jPgg4Y6NVDKn0NWCf14SVoH1G3eTt5K+esPmzUG2dJSYmzv7
+                                Gg0PUds5bLn68K0mWAr4Ql/C2Ka2vAdb+/flpG2L7KnPoe1y4wdJrJeBm34NO9RzXf+/RriNZP8e
+                                cucf85WLXJofI9L3EpQyfTRwbbLRzXRUTpLNpe8CvuAIlnvvYUvQSruECvjfyYjxuuQN7yNvR3z9
+                                sNX8JLYP7gw0ot0M7H0XZXtlit/ZRhuDN/0KZrTbN21fzs8ToujLcWFufgcjHdEh4K+BHiBJ7eam
+                                lliPbiXB2gL89tbtd5PT7b6+Nh6gNPtU4xXejDKw5+eokFjRf8cK9dK99a0YPhEtrS2iOuXLcVG0
+                                DIwt70LBrcCPAZ1AnNqtPE0/n1tFsJLA4d2bb1Bn4nf7/mGtcpri3FMNHxpta++iaq6SiCTW0TP6
+                                GpRP7hU8u+9jqKofj0Ep8qFh3nDzjQC/D4yynFTa9PlZrSBYCvjoSILQXO+PYuL/BEwre67hWdeR
+                                zo0kh29f1SFidO4knBzyx6BRCl3N+XTSWnw39DbW9PYB/AW1pNI2lpNKRbACLFZvihi8I7Tnt7AI
+                                BeKhy6mjjW00I0LHuruo2qu76GwTomP09b4wCVpr4vaEjyeuRdf2nyFisg24B+imdvdAU4eGrSBY
+                                f795wy7ydBCE3V9tlSiljjf0GcxYH8nu0cb8/NEhjHCbL/qikDrj67EyWe3nhj0/CPAbwF4nNIzR
+                                xOcNm1mwFPClzb3RvvnBnw3MQ1cyJxuelxTr2kCx0pjxrswYvRu+zxd9MTdxECoLvh0rJjYT8e9j
+                                XV8fwO9y4a5hU65nNbNg3QW8Pr/+F7Ht4NyAXFo43PBnaB+5vaEXj9qdt6BC8cZPDgWU5vz9grMV
+                                XTt+nmjI2OmEhl2e0FAEK0A/12f3btxKOTISmIdWaOz8eGMbLtJJxehqbDuYEULxwYb3h23bYGV9
+                                P2amyp3s2rQb4BdYrurQlLuGzShYCvhwIpboSw/9BCpA5YQr+Rkqhcbm/0R7dvuiLRK9O3zxHBFr
+                                LhBjZ7L3p9jYE2sDPkBtAb4pE0qbUbCSwLu3b72NnBUJ1INXF59u6PBSZpT44K2+aItQ106UGWv4
+                                c2QXTqECcPKlallER98K8Apqtz415QJ8swmWAr6xZaA3fibxg4F68JCpyM8coJG3IYSiXRiRLn90
+                                pBkl0rml4c+RWZyhWsoEYOBrZsO7uX1NBOD9jsvy5mY1hWg1k2Ap4Bbg5ea6N6F0KVAPr7WNthv7
+                                zEakvXZLqy/ao3bouuHzTFexK9lgTABd4fSa3yYeNrYBP8KFx3ZEsHzIX+xZ089saHvgeieiM9DA
+                                ygxKKULxAf+MayMCRrjxIqAUbbHgFDWpEmZoaDvA2x2X1VRllZtJsH6yM8Kt59f8GoYuB+7hVTWF
+                                bmA4qLWGcJd/2sMIYYQSDX8OrTURsxqosdSx8Y0kTQaBNzWby2oWwTKA310ztDGwP8DcqQcbrBAh
+                                QolBX7VJIh7DD6cTwjodqLE0Xuykf8vroJYBP9xMLqsZBEsBdyYMdkTWvzmwP0Qhfa6h/3687wbC
+                                Hf4S/FCsC3xQRG9hfi5gk9qi1HEzMZMQ8IOOy0rQBGkOzSJYX9m9bS9j5YHA/hC6wbfiGKZ7MNw/
+                                5y0t7ZMd+QBO8bKRYP3W1wD8MheuZQU6zSHogqWAu4HYYsddhKgG8ocIh4yG14EyjIjToP4Zy5aN
+                                L0onR8KR4E0MbTPf+SoSsXiE2gJ8B01wZKcZHNaf3L5pkHk1EtgfIBwy0XaDJ6ZSPhyc/rhfoVIN
+                                5otQaZvh4Z04YWEXTZCXFXTBurMtxM3P9v0qpq4E9ofwg1YoI+SzgBCK6TO+eKIgL/q0r3sNUUU/
+                                8HLHZQV6xzDIgqWA3wt3jtIcNHhi+tBhlXLT8ka5Rs4Uuxjd/DKA36G2+J4MsssKsmDFgTs2b7wl
+                                8FIVNn3ga1TYd+3il/sKqwENCQFMquQ7b4PaonvgzxgGVbAU8IGh7p7w6dDLEK6HifDXUNC2j47E
+                                6GDfU5oPjbB3IAzwRke4vJUcAiVaQRWsduC/tI3c0dDjLNdTfYU67BJW4bxPgvWA95Cukt3wHgy4
+                                E+intvjuuixxWKswv19pKFQxudP39wte3oSQZ3gelTTa9kdZl1AkEejxpdCk1QDtbR1QS3FoJ6CL
+                                70EVrPdtWbeFgupoCjPhj4jDZy9bHznnjq6+JnDxmk3D66BW0aTDCQujBGwtK4iC1R9RvNoafpMv
+                                kgqvB7mijRnvb/BI8JdgWcVZH832cFOMs0L/6zFhCNjguKzALb4HTbAU8NvRZDdp3dUU4SBA1bIx
+                                Gl5d019tmZve748BpxSZfLUpxtl5q5/NIyNQO67TRgDPF4YC1uYKeN3GwREmaS6iyW7Q5ZpwaJ4/
+                                hpSJMiMX/v5zv/ci7x1loMxo3U6gAiOEUgZaa8zEWv+EyFaBSm7KJ+G6olw1aAaPFdIllrrvhslP
+                                3kjNac07YWEJsAnAxZ1BE6w2YKc18P1g0VTEN/wYcXXpV512/6Mu/E3dhHuMujgN2h+uRoVimLGu
+                                pmnbjvY+nFfBLmDMCQvzQDUIghWkkFAB/3NHf4wJe33zTVIUWivsS3y0Vs/9He35dTOil07450XS
+                                vck3de6vB7N6iD3DHVArGuDuFgbm4tWgCdZv0n8nhi4iNCd2JcfiuYf9Y+m7R2mmTDmlq3SM/jDU
+                                btdJsnxUJxA5WUERLAXsAELp6DYMbJnZTYqqZsD2z0F2QzWXi1XYHLN20x6LALzKEazA7BYGyWHd
+                                3hYGI9Yvs7qJKc34x10ppagktjffSwGbZLIX4C5HsAITFgbJYd2zfcNWinZIZnWTYhUXyPoknQFA
+                                mXFUuKMp27qzfxfAOkewEixXcBCHdV1ednDXQs8bUVrCwaYVrPRBXz1Pz9qbm7atC913oKAH6HUE
+                                KxBZ70EQLAX8SFfcZIkuaJJkUaFuIFoZls592z/PYxgQX9e07Z3VSbb2JQBe5whWjACcLQyKw/rx
+                                WLxLZnWzipXSFM99DW355/ygUgrdxIJl21V6B7ZArXyyK1i+L+wXBMEygD1r+wZkZjcppbkDZKb9
+                                FQ5GurahQm1N2+YhqpwN3QK1ZOxBlo/p+Dos9LtguQXGRpfapFBfMxIzi5Sn7vfdsBva+trmd7ax
+                                Xvfb9dR2Cn2/jhUEh7U1aZCci94gs7sJmT3yaQr5jL8mRaSdrNXe9G1fMHoYajMBtjmC5V3H8qVo
+                                BUGwfjbZvRatLZndTYRSkBu7j1LqlO+erWfkJlDNnz6jtU3nwF6AmxyxirGcjyUO6ypDwp8a7B3E
+                                tiWdoakmS+40xdkn/DfgjCiJNa9CN8WVnS/WCTa9gztdh1UvWOKwroIEsHE2vBOTqszyYM+O5UGn
+                                C8wd/iTah5c7RDvWkq+0RnKyQnPc2kF7rXbOOpZ3Cn17rtDwdXvCGgAVkZSGZpgeLovH/tVX5wUv
+                                CAc33t1yPWOFOwH2UFt0dwVLHNZVsBYgFk3IfG8Sl1U4/VkqmVO+fDoz2oUdW99yvdIWjbhhoVew
+                                fBkW+t1hbeuJGyzRLXO9CfxVaf4AudmD/nw+I8TW295B1Wq9kxSxZB/AgCNYUXyc8e53wXr5ur5B
+                                X651CFdG7swXWDp5r2+fL9K+joVCZ0v2TaRtLdRu0gk7Dsu3C+9+DwlfupS4AaT+VaDDQCY/T376
+                                Sd8+oRHtZs1N78BuhZ3BixBtG4RaxrsrWCG/aoNfe8hNXNvzkiETMVgBJnuMuXNP+foRhzbexlIL
+                                F7ENJ0dgeYfQdVi+XHj38yulLWrAg4XvkwqjAaWSOc38kU/5Oxzq2o7ueUVLvxTPlgcYqN0yt8ER
+                                KwkJr4I9iQgiVkEL/1yLXJokN/Z5X68/hmM99Gx7C5Vqa1t4rTVDHQbAZkesQiznYvlKtPwcEm7P
+                                ye5gwKiNbVPnmT/yaarFlH+fVCk6Nr6eKpIyY+oq59gBteTRsCck9J0++NlhbW+LKNGAgBELQ/bM
+                                V7DLKV8/Z3z4DlT7dukwwNKatR2mK1ghlhfdJSS8glf1qBmKymgKkr9SkD79ZXIzT/tbVBPdtK25
+                                UzrMExKGY51Qq4sV8oSEvqva4GeHNWCFOmU0BQRDaXKnPsPS5KM+F1WTnm0/gq3kZegSUhZj1VFY
+                                vu4rJCHhlTustqGkKaMpKGHF9DfJzz7jdw/I4PbXU45slA6rD5FDzxmpuCNWktZwBWKlgGRvQtaw
+                                gkB1/lHmxx7y/XN2jd5NteNW6bCLkAjjFSzvGpaEhJfbhgcqUmXU96FgeYalsa/6/jmj3duJDt4h
+                                HXYJ5uy+5+adx2FJSHgFLivZEzNkJPkazfyxz2JZ/q4Gq0Jx2je/FUvLEsOliF06JBSHdZmCleiN
+                                i2D5mfLiUazCtK+fMRyJM3TTr4Ihi+wvRDL8PMEyPPrgG9Hys2DFe0SwfEtl7gkyz/r72E00EmNg
+                                51upGB3SYS/Wn0ZCHNa1cqQqiX1+pC1SYunMV/z9kMpk4MZfpBTdKh12GWTt5wTLXXD3ZRE/P+8S
+                                UrQjMpL8hq5ybt/fYVsV3z6iaRj0b38LBSWX717JpPM2IZLpfi3tJ/imY/KnqRZmff2MyQ0/hNG1
+                                VzrrSvtWXWAYDD+KVki6Sbjst5udIz3h70z2wV1vxWrbiyVFPq7cPOvnRznisITAUs6ep7x0xrfP
+                                F28fwG7bLR11NUKgnlN4X9faEcESLvP1W6G4eAxtlXwqVv303fRe9HNlnKRM7ZXQbz5XXcPX3lRC
+                                QuEyxMoic+Jeyqnjvnw8FYrTvedXKJS8c02WQa8EazketPys+L52WDFVlpHkA+xyhvLiUdD+u33b
+                                CMXo2/OLlC3JYr8mwbIvECztV9Hys2DZ20LHZCT5gOLcfl9GCqYRYnDnj6Mj/dJJ10hluXtdwfKl
+                                aPlZsHLTOdnqafgAKZ4jP/GgL5+ta+tbqMQlMfS6CNbyBbIVj2CJw7pMNJCdzVkykhrcDelx/5WN
+                                UUrRs+kHMLqkmsf1orw81VzBskWwLl+sNLC0TR2UkdTIjqjmKWfG/DVglaJjaC9G3yvlvsrrSJS8
+                                +23JI1a+c1l+DgkzE1lxWA0VrNwp36UxdI68lMj6H5POud6CpXPPmS1HsMRhXQE2kJ7NVWQkNUqs
+                                7Aqp01/z1TNF4h1ERl4jzmoFKCxvABfrBEsc1mVyJmEvyEhqFJU0dnnJN4+jlMnw3p/DUnKP4EqQ
+                                r+j6kNASh3UFL3jgVK4su4QNE4jiWV+N1zXb7yavpfrCSlAlxLbQUYCMR6xcl4WfBoKfBeukZUni
+                                aEMGhdJkJx/xzfMMjt5MqfOVcthmxfobFnJFgPMewbIkJLx8sdLAqdjyQqCwmtFgfpbi0nl/OD0z
+                                gt17t6xbrSCmUoxnqgDn6hyWCNYV8GyuDJaW89mrjZWbRKnGn8ULmSHWvfTdaFNKHK90SLiVo65g
+                                WUDVI1r+coM+DgnLZQ0viR/BloOsq4pdOIf2gaVJDL2UPH3SIStM0qxwYhGAU45YVZFF9yufN8Bk
+                                ITuLEsFabYvli8fo3vhapOrCyrNZHaOga6lE4rCu3mFp4MyxBYWSMbuqqGrj0xkGt7+BXDksnbEK
+                                HFnUAHlHoOodlqxhXYFoPbWrej82Ujpk1cQKi0J2rvEmr22PdMYqMVp5DGDJEamK85GQ8CoE6/GH
+                                J23azaKMqlWiWkxTLecbqJgGvZteC6YkiK4Wz8xpV7CqHsGSXcKrEKwzlg1WOSujarWcTbGx7soM
+                                xTF6b5OOWEXClVmAccdVlcVhXZ1Y2dS2WVGVlIyq1RoQurHJuuHkCFquGljdyVZOAzzrcVdV5PDz
+                                VTEF2IVSXkbVakVkurHVGdpGXg5KBGs1yZUsr2B5HZb/Xqg+Dwkt4BvhzEG0kvsyVkewGlshI9a9
+                                XTph1SaYwVD+O1iw6LiqMrXDz1Wk4uhVh4Wf6so9g6WiMsJWAbvauA2OWMdaqrbksKzaBFMmXZmH
+                                AI45IlVyRMsNCcVhXen8Ab58JA0vix2QEbYKFPOZxv3j8TVYtlToWC3ajTzfHS8BHPeEgyURrKt3
+                                WNppxMnU3AkZYasSEzZuSETjnShEsFYLq7TgHiqfduZZ0fnqy6TRoDisKnD6zMyUjLBVGRCN2yVM
+                                9m7DlsPuq+QGFEZp1v3ltOOsvILl0/Hp93atNd79maVFGWWrQCTcuOMwZqwXuWJ+tZx0CJ0+BHDS
+                                ESv3400aFcG6Spf1KUqLWMhO4UpTrjRyl1Ahh51XKRw0YlTmDwE86AkHi/h4/SpIgjVTtJnaUbgP
+                                LecKV97TNmIghtuk9tkqsks/xvkCFrUdwjJQcATLe5GqCNZVTB/tNOKnzp15DCVJhStschrjcMxo
+                                l2S4ryIL008DzDiOqugIlnfBXRzWNTgsC3hgPGMRs+ZktK2gtbKsaoNGYsQXVU5bhfG5OYDTHncl
+                                gnU9Q27gAIBZOIuWdY6mo5qdkF5dJRJGCaM4A/DIRQTLt+FgUATLzXjPAF/Pzh1CyTGdlYwJG/bP
+                                ViVpdBUmk0E8/ShLFTLAhBMO5gnAgnuQHJZ2GvMP8jOH6QhJfayVE44GDQkjjGVJSsNKEzctlsYf
+                                AHjY467y1FIafB0OBlGwni1ozkfnH5KR12RUPoZgAAASQ0lEQVQOyzDENa/KRCrNMpnVAEcckco5
+                                guXrhNGgCRaOVS0DTy3OHJSR12wyKWH+Kkwgg0ThmDuXxj3hYAGfpzME0WHZTqN+JJWex1ZyQUEz
+                                hYTR3p3S9istWEac/OS3AL7hvPzzjsMKxPoVEKjUcTcsfKJoMXHz0qfWHG37CQz/u9hAhYLhtvXo
+                                SnbVhCvcsYl4z04Iy2WpK81O/TAPp0sW8IAnHMyxvH7le4ImWG5Y+JHHjh74k+Fb30zBFqd1PYn1
+                                v4RY/0ukIZqQc2OPQ21nsOKEgVnHZQUiHAxSSLgchtca9+tVGyq5SRmFgnAZVAmRTo0DfM956ecc
+                                wQpMOBhEwXLDwnHgya6Fr1BVMRmNgvCCb3mTl1a/RKZkl4EnHXe1xPL6le/TGYIsWLYTc7/r6MQk
+                                eyLHZEQKwgvQbhZ5+ODDAF+rc1duOBiYjN0gnjZ1D0NPACfOnPqejEhBeAHKuSnyFQ1w0HFUWcdh
+                                FVi+cEIEawUFy3Ia/uPpueNEDNkpFISLYRkxItNfhlrd9nnHXbnhYBkfF+trJsFydws/kSlZmUTq
+                                u2gpOyMIz2OjPsiZ6SmAT3rcVYYLdwcDQ1Bnubv4XgD+aOLEN4hquWxVEOqZOfUAwBlHoPKOWLm7
+                                g4FZbG8GwbKoLb7fV6hiGZlDUnZGEJ6bIIpOI83iwiTAl525suQRrMCFg0EWLFe0KsAs8EH77BfB
+                                lBQHQQBAhRg891FyFqeoFepz3VWG5dyrwJXHCLpguYvvfzuZZ75r5l4ZqIIAtFfG+N65MsBXPO4q
+                                7birUhDdVdAFC5Yz33PApycnDhA2pAic0NpUVYzkzH1Qq9k+5rirtPPJB9VdNYNgeRffP1Qo5nPb
+                                M5/Clpt1hBZmuHKAQ+cmAf7GcVMZIMXy2lXgFtubRbBc0XJd1v/41pFjtOlZGbVCS2JjkDp9H9QK
+                                9Ln5Vl53FbhUhmYTLNvjsu6zNQvGzH9iqYiMXqHlxGpDdR9Ti2mAf6O2vpsBFh3xCkQZ5GYXLFe0
+                                yk6n/PjYmf1s4pCM4CtEqYt/hGDQZaR5+qnPA3yJ5QX2xWZxV0DT3P3u7hgWgBPAI1PHv3SbvfV9
+                                GMgi/GW9ufLPYlVKaDRuMT9Xq7QyLq+EsTJe+B2oau9IpUz0xZRQa8zkGmy5AfqKsQhjzz2CrbGB
+                                R1leaE81i7tqJsFyXVbFeav8+uTi4qN7SvuYit6CkqqkL+qsMme/QTEztVr/4iXfO+tv/x3yVkI6
+                                5QpZo05z9MS3Af6B5fOCi45g5ZrBXTVTSOh1WUVqlRz+8JmnP087CzKaX6zhNGhbr3JXXewDhiHu
+                                6mqYPnYv1VqC6LOOQKW4cO0qkHlXzSxYXpeVo3bYMxU//wUp8ic078tGmQznv8Vcah7gn7lwoT1F
+                                wPOuml2wvC4rDbztyNmTem3pURnZgelAWeW/EhLWPAef+Qa6tiu45HwWnI+bdxWIeu2tKFiuaFWd
+                                N8uzwH3jx74kIzswiGBdLpaKkpz4Zxw39YQz5lOOWKWpbUJZ0Dw7T80qWG4Z5SXgd9KF0tTwxEeJ
+                                mXIVuu9jeumiy2Zt6l6OTs2VgY96oop5R7Dchfam2iZv1hVOm+U0hzTw3oMTs5hLh9DIoq74q+CH
+                                zUnSHD3xBMBXqa1ZeUNBtyJD4NMYWkWwXNEqO3H8k8Bfzh7+DH2htIz4SxpTIQjEjTKZA39KxbIP
+                                Uru2yw0F553wMHC12kWwLgwNM8Bf5W2OZo9+DKup0s+EVqKqYiSm7mWxaFvAvY44pYA5Llxob4o0
+                                hlYSLNdlVT1voF+aWEhVti19GiVnToQAhoLrC9/k+JnDGvgzLtwVnKO2/NGUoWCrCFZ9aDgOvPfR
+                                IwdIFI7LDBACJVYbItOcOvxVgG8C086YnqdWddebc9W059GMlujrWge6CXUPAh87f+gTbAqfkZkg
+                                BIIuI8PRx/+ebJX9wP2OOC06YjVfFwo2La2yZeYtQZMC/qJk8dSh/fcSMyoyG3zVUbKLW49pKJZO
+                                f5F8qZgBPu+8fN11qzknLCzSpOtWrShYrtNyj+0sAL+Uy6VSA2MfkPNrvhIsqRZbT//Ux5mZPl4C
+                                Puw4qbQjVLNcWPa46UuTtJpguVeDLTk2+heePF9hcO4zlJVUCBB8Jt4qTHf6IQ6dGYNaFQb35ht3
+                                3cqbINoSeSmtZi28NeDTwCHgnQdPHNA3FT6NpC0KfnKaa0uP8OyxB9DwL9QqMbiL7DOeULBpKjGI
+                                YF0aN9VhEXgE+NB3Dz5BsjzWwqIliaN+otue4Jn9XwT4OnDAs5Qx63wyNElRPhGsF5+Z3jI0C8An
+                                Lc1fTR34OP3VY1ha1lGERg1ORZIME0//LTY8Tm1XO+e8XGecT4omzmYXwbqU617Oz5oHPl62+crk
+                                gU8yqo5KmROhIWLVyRyZ/R+iWLEOU9sRdJOeZ6jlXi2yXJ+95ep/Gy09Pi5chJ8Dfi9d5Tun9n+C
+                                LZFxES1hVekLZcge+HMWy0xRK0BZqBMr9+hNS4pVqwuWK1reRfhZ4P3pMvcffezvGFFnsORChFVE
+                                teggVAyEl1h4+k+ZKTIO/MVFxKplkkNFsC7PaXkHyO+nyzw5s//v2WweE6e1anql0C32gnDDwPl9
+                                H2Q2Vz1H7bZm9wU6A5znwkX2ltkRFMG6NN5MeHdx873TJR47uu8TbAxLeCgOa2XoMTOk9v8500Vm
+                                gb+ue3Ged5YqWnJH8GLIdtiFTsvdQXTLyn6vbDOYmty3bbBvhLw5iGrS8VKefQyrnGuwXhm0r31V
+                                S1Qd1RhErRRz+/+UTFmfqHNWsx5nlRaxEsG6XNGygP0Vzdrc+YOb+3oGKIaHmlK0RLBWD4sQA9Wj
+                                TDz5NxQt/QzLt914ndUMy+ViWi59QQTrykTLrhOtJy1IpGae2fOGkSlOqZuaTrREsFaPbZWH2P/U
+                                57FgH/CZi4SBrrNqyVwrEaxrE62q8zkEzB2enLuj35jF7n4p2q42kWA97gvBalv7amzdnPMzYkJk
+                                9uscOfKfAPcBX+P5u4Ez1NasRKxEsK5KtCxn4FjUCgAeS2dmXrmx+li42HkLFqGmWCouz+7DKmdF
+                                sFaIuFEmMvFvnDmzz6J2NnAfy8fDpj1hYEbCwEsju4QvjHuExzuwvgXc88xUemnpqT+iR802iTrL
+                                3FjR9j36YU6PHyoBfwIcZPmExRQwiaxZicO6jk5Le5xW1RGxb1RsNuWmH1+7pUuRCm9BBTifrzT7
+                                uDis60yVEMP2cWYP/DXzueIZajuBKY9Yuc5qHkldEMFaAdGyPYJVAR6zbN12fub0zg3xDKXEVmxU
+                                IENEvwhWcu2raAa90irMutw3OPL0Fyhb1tPUdgKzLB8DO+98FpzfK4tYXcYQkSa44vYKAVGgDegF
+                                +oFbgA9u7wJ75/tZtNoD94NVxj9HMTfHhWqxWsNDAwrDCJHc/o7AD8uIqjB05gM8eb4C8Clq5WEK
+                                LBffc+tZuQeZm/ZaLhEsf7SZCUQc0eoG+oDNwG/FQuqGtZvvpthzF0VLGquVsDHpK+5n6tn7WCoU
+                                54B/pJaikGe5rPGMI1r1pY1FrCQkXFFLUB8e5oGHqzahhfnTOxP2jBFrX09FxaS1mn4wKBJGieT8
+                                /Zw+8lWK1eo+4P86olS/XlWfY2VLC4rDWi0MIAzEgHYnROwDhoGPJEN099/wTrLhUXmBNjFxnaZ0
+                                8MPMFNHAXwIT1Hb73EtOZz0hoFtxQXYCxWE1BDcbvuoMxIrz9YGKjZ06/9QNPaUjDAxsIm23Ne1Z
+                                xNYL/xRtoSqh8X/l/PF/Z6nC49Quipjlwgqhbn6V9xp5WVwXh9XwdjQdt5UAOoAex23tAH4zbLB+
+                                287XstB2O2UdEuEKcPiHCjFYepKp4//OYr6UolYZ9Di1tISsI1bzHlfl3hso61UiWL5qS4MLdxG7
+                                nTCxF/hB4N0b2mFg9z2ctrdKiwWQDpWmfewjPD1dAXgU+HfHNbm7gIuOULkL67k6VyViJYLlKwzn
+                                E3HcVifLO4kbgJ9Q8Oq+vnWs3fZDjFVHMZHbp/0d/hmsj2fIjn2J8YmjlKr2SeDL1DLUXVeVcsK+
+                                eY+rKrBczliESgQrEG4r5ritLidM7AF2Ae+OwIbhTa/A7rmNvNmH0lVpOZ8JVULlMTKHSD37RTJV
+                                UsD9wFOOa8p7XNW8I1gZj6uqiqsSwQqa2/KubbXXCdde4L8BkVu27+Vk509iIqLlF7G6kW/zxP6v
+                                sVRGA1+kdu1WxXFOrqtadITKPXLjpivIwroIVuDdVpTlRfluR7S6gVcAb++MGcm+gR0UR95G0Q6j
+                                kMzT1USj0EaMTUufZ+zs08wt5QC+Qq2ygrtwnvO4qkVP+OdevSWuSgSrKdrZFS43bytJbX2ryxGt
+                                TuCHgdd0mvS3b3gluuslVCMDVG0tu4or6qZMojpHNHcIzn6RsSwFwL0XsEJtnSrvCJPrqlJ14Z+s
+                                VYlgNa1wuUd73PUtV7i6HPd1E/ArQHzjwAChTT/Lot0lrbcCxI0ym9Kf5btHj1Gt1dh5EHiA5by6
+                                vBPqpS8iVMU6oRKxEsFq6jDRFa64I1wdjmh1Ot/vBt4YUeyOt/XQM3ILZv9tzJdjstZ1lViYGGaU
+                                /uJ+CpPfZHphmmLFSgNfBY45QlRieZ0q7Xxcoco6fy6pCiJYLStcIY9wJR2x6nQ+7cAg8FPAjnaT
+                                9rUbbiDTfhvR5AAZKw5ajqO9EBoD0wBVXmC4+DgTZx9nNlusUqsg+yBwguUTCq6jcsO/tPO966hc
+                                oZLwTwSrpfvBrHNcSUesOjyfJLWUiLcDPe1haF///Zh9t1HQUWnFS9BX3I8e/xzHFh2TVUtN+Lbz
+                                vXeNyl1Q937yIlQiWMLFMViuueWucSU84WK7R7jWAjcAr06aDOj4AOv7+ugevpnD+mYMu9hyYaOF
+                                iWGEGAnPEVn4LqcmxzAKk8wXqQAPA89QO5jsuqlinaPKOF+zHqGqeIQKESsRLOGFHZebfOq6rjZH
+                                uNqd7xOOeN0NbAWG1rWjOgZuIJvcixUZohjqQ2sbrW2MJppvGgOtTNrVEpXiPIPlQ5w9f5r5hQmc
+                                UO4c8BjwLMulgFyhynmEyhWpHLW1q7IIlQiWcHX9Y3iEy+u6XPFq8whX3PnzVzgCNggwkDToHryR
+                                waGdHK7uaIqGSRglenKPUZl9hEPnl9zfrgCPAA+xXBzPrVdWdMTIFaqsR6TyLC+kuweUJfQTwRKu
+                                oZ+8ritMLQnVdV5tjoC5n7jz6QTWABud8HFzbwzKoR6i8U529LcxG7uJaNsI58p9KKrYNg0/22hh
+                                olTNPSllclPkAOfm57HSJ8hmZykUcxRLRco2aWr5UsdZruRpeZxUyRP25Txila9bm6rUrU+JUIlg
+                                CddRuJTHdYXrnFf9x3VdEeeziVrJm80sp1BEN3VAJrqFdV0xThk30hk1wEximQnaI7Bg92FrN31V
+                                o7DRujazjYsUzdROyHbBg6vadzbGc79uM/KE7DyZkqZLzZEqwTBjZLMLRAunmEnlmSsDy4vgM9TS
+                                D445guO9zcgrUgWPULkCVagTKa+bkrBPBEtYBfEyLuK8vO6r/uP+ecT5++4a2Q5gOzBKrWLqBYRN
+                                xZo2g5F2E6J9nGEn6zpM+tqTPFJ8yfMertPMcUv0ANmyJlvRpIo2qaJNoVTilsgTnM9ajGcsZvMX
+                                TckoA2eAk44wTXuExVswseIJ5Yp1QlXwfLzhXn3IJyIlgiU0oA/rxStUJ2BRj2DFnE+9eLkCZnrW
+                                yFyn5mbkez9uvtgLXchb9giKKyZZj2NKsZxW4Doib4hWL1DecK9UJ1Tur0uef7fq+X+JSIlgCT4W
+                                L/cT8giYG0J6xapeuCKev296RMzwfFV1X72uj4uEWF6h8N7zqD3CVC9Q9SLlFar678uev29dZE1K
+                                REoESwhI/xp1ImZ6RMwrZOG6UNHrukIe4fJ+6kXsYoKl60TKFZIXEimvWFU8604Vz59XX8BBiUiJ
+                                YAlN4r4uJmKuEzPqhOlS319MtLybApdyU7pOYNzvq3XCVf/VrnNOlxInESkRLKEFRKw+nPSKWb2w
+                                1f/auIjDulg4eLFQ0Ou67Iv8nr7ER8RJBEsQnjcm1AsIm6pzbJdCv4CIvdD3iDgJIljC9R4vVzKO
+                                9FX+mSAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAI
+                                giAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIgiAIghBg/j+I/UnoNLmiuQAAAABJRU5ErkJggg==</field>
+            <field name="active" eval="False" />
+        </record>
+
+
         <record id="badge_idea" model="gamification.badge">
             <field name="name">Brilliant</field>
             <field name="description">With your brilliant ideas, you are an inspiration to others.</field>
@@ -892,8 +1128,8 @@
             <field name="name">Received Badge</field>
             <field name="body_html"><![CDATA[
         <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !
-            % if ctx["user_from"]
-                This badge was granted by <strong>${ctx["user_from"]}</strong>.
+            % if object.user_from_id
+                This badge was granted by <strong>${object.user_from_id.name}</strong>.
             % endif
         </p>
 
diff --git a/addons/gamification/doc/gamification_plan_howto.rst b/addons/gamification/doc/gamification_plan_howto.rst
deleted file mode 100644
index b0e8d1603b8..00000000000
--- a/addons/gamification/doc/gamification_plan_howto.rst
+++ /dev/null
@@ -1,107 +0,0 @@
-How to create new challenge for my addon
-========================================
-
-Running example
-+++++++++++++++
-
-A module to create and manage groceries lists has been developped. To motivate users to use it, a challenge (gamification.goal.plan) is developped. This how to will explain the creation of a dedicated module and the XML file for the required data.
-
-Module
-++++++
-
-The challenge for my addon will consist of an auto-installed module containing only the definition of goals. Goal type are quite technical to create and should not be seen or modified through the web interface. By default, goal types can only be modified by "Gamification Manager". After installing the hr_gamification module, HR Officers will be able to see goal types but not modying it.
-
-If our groceries module is called ``groceries``, the addons structure will be consisted of three addons :
-
-::
-
-  addons/
-    ...
-    gamification/
-    groceries/
-    groceries_gamification/
-      __openerp__.py
-      groceries_goals.xml
-
-The ``__openerp__.py`` file containing the following information :
-
-::
-
-  {
-    ...
-    'depends': ['gamification','groceries'],
-    'data': ['groceries_goals.xml'],
-    'auto_install': True,
-  }
-
-
-Goal type definition
-+++++++++++++++++++++
-
-For our groceries module, we would like to evaluate the total number of items written on lists during a month. The evaluated value being a number of line in the database, the goal type computation mode will be ``count``. The XML data file will contain the following information :
-
-::
-
-  <record model="gamification.goal.type" id="type_groceries_nbr_items">
-    <field name="name">Number of items</field>
-    <field name="computation_mode">count</field>
-    ...
-  </record>
-
-To be able to compute the number of lines, the model containing groceries is required. To be able to refine the computation on a time period, a reference date field should be mention. This field date must be a field of the selected model. In our example, we will use the ``gorceries_item`` model and the ``shopping_day`` field.
-
-::
-
-  <record model="gamification.goal.type" id="type_groceries_nbr_items">
-    ...
-    <field name="model_id" eval="ref('groceries.model_groceries_item')" />
-    <field name="field_date_id" eval="ref('groceries.field_groceries_item_shopping_day')" />
-  </record>
-
-As we do not want to count every recorded item, we will use a domain to restrict the selection on the user (display the count only for the items the users has bought) and the state (only the items whose list is confirmed are included). The user restriction is made with the keyword ``user`` in the domain and should correspond to a many2one field with the relation ``res.users``. During the evaluation, it is replaced by the user of the linked goal. As we need the user ID of, we user ``user.id``.
-
-::
-
-  <record model="gamification.goal.type" id="type_groceries_nbr_items">
-    ...
-    <field name="domain">[('shopper_id', '=', user.id), ('list_id.state', '=', 'confirmed')]</field>
-  </record>
-
-An action can also be defined to help users to quickly reach the screen where they will be able to modify their current value. This is done by adding the XML ID of the ir.action we want to call. In our example, we would like to open the grocery list form view owned by the user.
-
-If we do not specify a res_id to the action, only the list of records can be displayed. The restriction is done with the field ``res_id_field`` containing the field name from the user profile containing the required id. The parsing mechanism is the same as for the domain of a goal, using the keyword 'user' that wil lbe replaced by the current user. In our example, we assume the res.users model has been extended with a many2one field ``groceries_list`` to the model ``groceries.list``.
-
-::
-
-  <record model="gamification.goal.type" id="type_groceries_nbr_items">
-    ...
-    <field name="action_id">groceries.action_groceries_list_form</field>
-    <field name="res_id_field">user.groceries_list.id</field>
-  </record>
-
-
-Plan definition
-++++++++++++++++
-
-Once all the goal types are defined, a challenge (or goal plan) can be created. In our example, we would like to create a plan "Discover the Groceries Module" with simple tasks applied to every new user in the group ``groceries.shoppers_group``. This goal plan should only be applied once by user and with no ending period, no dates or peridocity is then selected. The goal will be started manually but specifying a value to ``start_date`` can make it start automatically.
-
-::
-
-  <record model="gamification.goal.plan" id="plan_groceries_discover">
-    <field name="name">Discover the Groceries Module</field>
-    <field name="period">once</field>
-    <field name="visibility_mode">progressbar</field>
-    <field name="report_message_frequency">never</field>
-    <field name="planline_ids" eval="[(4, ref('planline_groceries_discover1'))]"/>
-    <field name="autojoin_group_id" eval="ref('groceries.shoppers_group')" />
-  </record>
-
-To add goal types to a plan, planlines must be created. The value to reach is defined for a planline, this will be the ``target_goal`` for each goal generated.
-
-::
-
-  <record model="gamification.goal.planline" id="planline_groceries_discover1">
-    <field name="type_id" eval="ref('type_groceries_nbr_items')" />
-    <field name="target_goal">3</field>
-    <field name="plan_id" eval="ref('plan_groceries_discover')" />
-  </record>
\ No newline at end of file
diff --git a/addons/gamification/doc/goal.rst b/addons/gamification/doc/goal.rst
deleted file mode 100644
index f82cb7b4cbb..00000000000
--- a/addons/gamification/doc/goal.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-.. _gamification_goal:
-
-gamification.goal
-=================
-
-Models
-++++++
-
-``gamification.goal`` for the generated goals from plans
-
-Fields
-++++++
-
- - ``type_id`` : The related gamification.goal.type object.
- - ``user_id`` : The user responsible for the goal. Goal type domain filtering on the user id will use that value.
- - ``planline_id`` : if the goal is generated from a plan, the planline used to generate this goal
- - ``plan_id`` : if the goal is generated from a plan, related link from planline_id.plan_id
- - ``start_date`` : the starting date for goal evaluation. If a goal is evaluated using a date field (eg: creation date of an invoice), this field will be used in the domain. Without starting date, every past recorded data will be considered in the goal type computation.
- - ``end_date`` : the end date for goal evaluation, similar to start_date. When an end_date is passed, the goal update method will change to status to reached or failed depending of the current value.
- - ``target_goal`` : the numerical value to reach (higher or lower depending of goal type) to reach a goal
- - ``current`` : current computed value of the goal
- - ``completeness`` : percentage of completion of a goal
- - ``state`` : 
-    - ``draft`` : goal not active and displayed in user's goal list. Only present for manual creation of goal as plans generate goals in progress.
-    - ``inprogress`` : a goal is started and is not closed yet
-    - ``inprogress_update`` : in case of manual goal, a number of day can be specified. If the last manual update from the user is older than this number of days, a reminder will be sent and the state changed to this.
-    - ``reached`` : the goal is succeeded
-    - ``failed`` : the goal is failed
-    - ``canceled`` : state if the goal plan is canceled
- - ``remind_update_delay`` : the number of day before an inprogress goal is set to inprogress_update and a reminder is sent.
- - ``last_update`` : the date of the last modification of this goal
- - ``computation_mode`` : related field from the linked goal type
- - ``type_description`` : related field from the linked goal type
- - ``type_suffix`` : related field from the linked goal type
- - ``type_condition`` : related field from the linked goal type
- - ``type_display`` : related field from the linked goal type
-
-Methods
-+++++++
-
- - ``update`` :
-   Compute the current value of goal and change states accordingly and send reminder if needed.
- - ``get_action`` :
-   Returns the action description specified for the goal modification. If an action XML ID is specified in the goal type definition it will be used. If a goal is manual, the action is a simple wizard to input a new value.
diff --git a/addons/gamification/doc/goal_type.rst b/addons/gamification/doc/goal_type.rst
deleted file mode 100644
index 4da960b3371..00000000000
--- a/addons/gamification/doc/goal_type.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-.. _gamification_goal_type:
-
-gamification.goal.type
-======================
-
-Models
-++++++
-
-``gamification.goal.type`` for the shared behaviour of goals
-
-Fields
-++++++
-
- - ``name`` : The name of the goal type.
- - ``description`` : Explain briefly in non-technical terms what the goal evaluates
- - ``computation_mode`` : How is computed the current value for each individual goal
-    - ``manually`` : the user will set the value itself, no computation
-    - ``count`` : the result is the number of lines returned by a search (eg: number of phone calls)
-    - ``sum`` : the total of the value of a chosen field for each record returned by the search (eg: total amount of all invoices)
-    - ``python`` : for complex computation, will execute a chosen method
- - ``display_mode`` : How is represented the current value of a goal
-    - ``progress`` : numerical value (eg: an amount)
-    - ``checkbox`` : boolean value with only two state: todo and done (eg: select a timezone)
-
- - ``suffix`` : text suffix added to the result
- - ``full_suffix`` : function field combining the monetary and suffix field (eg: €/month, $ expected)
- - ``model_id`` : the model to evaluate for count and sum goals (eg: Invoices)
- - ``field_id`` : for sum goals only, the field of model_id that will be evaluated through the computation
- - ``field_date_id`` : the date to evaluate to restrict the search on a time interval for count and sum goals (eg: validation date)
- - ``domain`` : Additional restrictions in the form of a domain. To restric the search to a user, use the keyword 'user', can be chained. Eg: ``[('state', '=', 'done'), ('user_id', '=', user.id)]`` or ``[('company_id', '=', user.company_id.id)]``
- - ``compute_code`` : for python goals only, the method of type gamification.goal.type to execute (eg: self.my_method(cr, uid))
- - ``condition`` : when is the goal considered as reacher
-    - ``higher`` : when the current value is higher or equal than the target
-    - ``lower`` : when the current value is smaller or equal than the target
- - ``sequence`` : to order list of goals in a challenger
- - ``action_id`` : the XML id to of an ir.actions.act_window to execute when the user clicks on a goal on the home page
- - ``res_id_field`` : the res_id used by the action, using user as for the domain (eg: user.company_id.id)
-
-Methods
-+++++++
-
-Add new methods inheriting from this class to add goal type with python computation mode. Look at the example in ``gamification/goal_type_data.py``
\ No newline at end of file
diff --git a/addons/gamification/doc/index.rst b/addons/gamification/doc/index.rst
deleted file mode 100644
index 85d4ffe2048..00000000000
--- a/addons/gamification/doc/index.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-Gamification module documentation
-=================================
-
-The Gamification module holds all the module and logic related to goals, plans and badges. The computation is mainly done in this module, other modules inherating from it should only add data and tests.
-
-Goals
------
-A **Goal** is an objective applied to an user with a numerical target to reach. It can have a starting and end date. Users usually do not create goals but relies on goal plans.
-
-A **Goal Type** is a generic objective that can be applied to any structure stored in the database and use numerical value. The creation of goal types is quite technical and should rarely be done. Once a generic goal is created, it can be associated to several goal plans with different numerical targets.
-
-A **Goal Plan** (also called Challenge in the interface) is a a set of goal types with a target value to reach applied to a group of users. It can be periodic to create and evaluate easily the performances of a team.
-
-Badges
-------
-A **Badge** is a symbolic token granted to a user as a sign of reward. It can be offered by a user to another freely or with some required conditions (selected users, max. number of time per month, etc.).
-
-.. toctree::
-   :maxdepth: 1
-   
-   goal_type
-   goal
-   gamification_plan_howto
-   
\ No newline at end of file
diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index b1380627e39..2b997384467 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -44,6 +44,7 @@ class gamification_badge_user(osv.Model):
 
     _columns = {
         'user_id': fields.many2one('res.users', string="User", required=True),
+        'user_from_id': fields.many2one('res.users', string="User From"),
         'badge_id': fields.many2one('gamification.badge', string='Badge', required=True),
         'comment': fields.text('Comment'),
         'badge_name': fields.related('badge_id', 'name', type="char", string="Badge Name"),
@@ -52,14 +53,13 @@ class gamification_badge_user(osv.Model):
     }
 
 
-    def _send_badge(self, cr, uid, ids, user_from=False, context=None):
+    def _send_badge(self, cr, uid, ids, context=None):
         """Send a notification to a user for receiving a badge
 
         Does not verify constrains on badge granting.
         The users are added to the owner_ids (create badge_user if needed)
         The stats counters are incremented
         :param ids: list(int) of badge users that will receive the badge
-        :param user_from: optional id of the res.users object that has sent the badge
         """
         res = True
         temp_obj = self.pool.get('email.template')
@@ -68,7 +68,6 @@ class gamification_badge_user(osv.Model):
         ctx = context.copy()
         for badge_user in self.browse(cr, uid, ids, context=context):
 
-            ctx.update({'user_from': user_obj.browse(cr, uid, user_from).name})
             body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.badge.user', badge_user.id, context=ctx)
 
             res = user_obj.message_post(cr, uid, badge_user.user_id.id, body=body_html, context=context)
@@ -180,6 +179,7 @@ class gamification_badge(osv.Model):
 
         'owner_ids': fields.one2many('gamification.badge.user', 'badge_id',
             string='Owners', help='The list of instances of this badge granted to users'),
+        'active': fields.boolean('Active'),
         'unique_owner_ids': fields.function(_get_owners_info,
             string='Unique Owners',
             help="The list of unique users having received this badge.",
@@ -213,6 +213,7 @@ class gamification_badge(osv.Model):
 
     _defaults = {
         'rule_auth': 'everyone',
+        'active': True,
     }
 
     def check_granting(self, cr, uid, badge_id, context=None):
@@ -265,3 +266,17 @@ class gamification_badge(osv.Model):
 
         # badge.rule_auth == 'everyone' -> no check
         return CAN_GRANT
+
+    def check_progress(self, cr, uid, context=None):
+        try:
+            model, res_id = template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'badge_hidden')
+        except ValueError:
+            return True
+        badge_user_obj = self.pool.get('gamification.badge.user')
+        if not badge_user_obj.search(cr, uid, [('user_id', '=', uid), ('badge_id', '=', res_id)], context=context):
+            values = {
+                'user_id': uid,
+                'badge_id': res_id,
+            }
+            badge_user_obj.create(cr, SUPERUSER_ID, values, context=context)
+        return True
\ No newline at end of file
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 7cbd784b9bf..83ec0fd5beb 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -626,7 +626,7 @@ class gamification_challenge(osv.Model):
                     continue
 
                 ctx.update({'challenge_lines': goals})
-                template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_progress_perso', context)
+                template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'email_template_goal_progress_perso', context)
                 body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
                 # send message only to users, not on the challenge
                 self.message_post(cr, uid, 0,
@@ -642,7 +642,6 @@ class gamification_challenge(osv.Model):
         return self.write(cr, uid, challenge.id, {'last_report_date': fields.date.today()}, context=context)
 
     ##### Challenges #####
-
     def accept_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user accept the suggested challenge"""
         user_id = user_id or uid
@@ -788,7 +787,7 @@ class gamification_challenge(osv.Model):
         """
         badge_user_obj = self.pool.get('gamification.badge.user')
         user_badge_id = badge_user_obj.create(cr, uid, {'user_id': user_id, 'badge_id': badge_id}, context=context)
-        return badge_user_obj._send_badge(cr, uid, [user_badge_id], user_from=None, context=context)
+        return badge_user_obj._send_badge(cr, uid, [user_badge_id], context=context)
 
 
 class gamification_challenge_line(osv.Model):
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index cf5b2228b08..22cfd5f3ab5 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -57,14 +57,6 @@ openerp.gamification = function(instance) {
             self.get_goal_todo_info();
             self.get_challenge_suggestions();
         },
-        // render_template: function(target,template) {
-        //     var self = this;
-        //     target.append(QWeb.render(template,{'widget': self}));
-        // },
-        render_template_replace: function(target,template) {
-            var self = this;
-            target.html(QWeb.render(template,{'widget': self}));
-        },
         get_goal_todo_info: function() {
             var self = this;
             var challenges = new instance.web.Model('res.users').call('get_serialised_gamification_summary', []).then(function(result) {
@@ -72,7 +64,6 @@ openerp.gamification = function(instance) {
                     self.$el.find(".oe_gamification_challenge_list").hide();
                 } else {
                     _.each(result, function(item){
-                        console.log(item);
                         var $item = $(QWeb.render("gamification.ChallengeSummary", {challenge: item}));
                         self.render_money_fields($item);
                         self.render_user_avatars($item);
@@ -122,12 +113,38 @@ openerp.gamification = function(instance) {
     instance.mail.Widget.include({
         start: function() {
             this._super();
-            var self = this;
-            var sidebar = new instance.gamification.Sidebar(self);
+            var sidebar = new instance.gamification.Sidebar(this);
             sidebar.appendTo($('.oe_mail_wall_aside'));
         }
     });
 
+    instance.web_kanban.KanbanView.include({
+        start: function() {
+            this._super();
+            $(document).off('keydown.klistener');
+        },
+        events: {
+            'click': function(event) {
+                var self = this;
+                if (this.ViewManager.dataset.model === 'gamification.badge') {
+                    this.kkeys = [];
+                    $(document).off('keydown.klistener');
+                    $(document).on('keydown.klistener', function(event) {
+                        if ("37,38,39,40,65,66".indexOf(event.keyCode) < 0) {
+                            $(document).off('keydown.klistener');
+                        } else {
+                            self.kkeys.push(event.keyCode);
+                            if (self.kkeys.toString().indexOf("38,38,40,40,37,39,37,39,66,65") >= 0) {
+                                new instance.web.Model('gamification.badge').call('check_progress', []);
+                                $(document).off('keydown.klistener');
+                            }
+                        }
+                    });
+                }
+            }
+        }
+    });
+
     instance.web_kanban.KanbanRecord.include({
         // open related goals when clicking on challenge kanban view
         on_card_clicked: function() {
@@ -136,7 +153,7 @@ openerp.gamification = function(instance) {
             } else {
                 this._super.apply(this, arguments);
             }
-        }
+        },
     });
     
 };
diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml
index 33c0e21ea7a..0b37e62051d 100644
--- a/addons/gamification/views/badge.xml
+++ b/addons/gamification/views/badge.xml
@@ -56,7 +56,7 @@
                             <field name="description" nolabel="1" placeholder="Badge Description" />
                         </group>
                         <group string="Granting">
-                            <div class="oe_grey">
+                            <div class="oe_grey" colspan="4">
                                 Security rules to define who is allowed to manually grant badges. Not enforced for administrator.
                             </div>
                             <field name="rule_auth" widget="radio" />
diff --git a/addons/gamification/wizard/grant_badge.py b/addons/gamification/wizard/grant_badge.py
index e100b2dce29..1b80c490ef3 100644
--- a/addons/gamification/wizard/grant_badge.py
+++ b/addons/gamification/wizard/grant_badge.py
@@ -46,10 +46,11 @@ class grant_badge_wizard(osv.TransientModel):
             #create the badge
             values = {
                 'user_id': wiz.user_id.id,
+                'user_from_id': uid,
                 'badge_id': wiz.badge_id.id,
                 'comment': wiz.comment,
             }
             badge_user = badge_user_obj.create(cr, uid, values, context=context)
-            result = badge_obj._send_badge(cr, uid, badge_user, user_from=uid, context=context)
+            result = badge_obj._send_badge(cr, uid, badge_user, context=context)
 
         return result
diff --git a/addons/hr_gamification/models/gamification.py b/addons/hr_gamification/models/gamification.py
index 27c1834bc39..f07ed9c95c4 100644
--- a/addons/hr_gamification/models/gamification.py
+++ b/addons/hr_gamification/models/gamification.py
@@ -49,17 +49,6 @@ class gamification_badge(osv.Model):
     _name = 'gamification.badge'
     _inherit = ['gamification.badge']
 
-    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
-        """Overwrite the message_post method to send the badge to the employee"""
-        # badge_user included in the send_badge method and 'badge_id' in the wizard view
-        if 'badge_user' in context and 'badge_id' in context:
-            # badge = self.browse(cr, uid, context['badge_id'], context=context)
-            badge_user = context['badge_user']
-            if badge_user.employee_id:
-                return self.pool.get('hr.employee').message_post(cr, SUPERUSER_ID,
-                    badge_user.employee_id.id, context=context, **kwargs)
-        return super(gamification_badge, self).message_post(cr, uid, thread_id, context=context, **kwargs)
-
     def get_granted_employees(self, cr, uid, badge_ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/hr_gamification/wizard/grant_badge.py b/addons/hr_gamification/wizard/grant_badge.py
index 967324b7b87..22e72e84e27 100644
--- a/addons/hr_gamification/wizard/grant_badge.py
+++ b/addons/hr_gamification/wizard/grant_badge.py
@@ -49,11 +49,12 @@ class hr_grant_badge_wizard(osv.TransientModel):
 
             values = {
                 'user_id': wiz.user_id.id,
+                'user_from_id': uid,
                 'badge_id': wiz.badge_id.id,
                 'employee_id': wiz.employee_id.id,
                 'comment': wiz.comment,
             }
 
             badge_user = badge_user_obj.create(cr, uid, values, context=context)
-            result = badge_user_obj._send_badge(cr, uid, [badge_user], user_from=uid, context=context)
+            result = badge_user_obj._send_badge(cr, uid, [badge_user], context=context)
         return result
\ No newline at end of file

From f4e42879d3430f36033d416c205a63e547aa4068 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 23 Dec 2013 17:01:43 +0100
Subject: [PATCH 532/547] [REF] gamification: rename user_from_id -> sender_id,
 move constants

bzr revid: mat@openerp.com-20131223160143-8mgmwrgf6i3wo8ku
---
 addons/gamification/data/badge.xml           |  4 +-
 addons/gamification/models/badge.py          | 41 +++++++++-----------
 addons/gamification/wizard/grant_badge.py    |  2 +-
 addons/hr_gamification/wizard/grant_badge.py |  2 +-
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml
index 5588d327f82..dc9f1212ae1 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -1128,8 +1128,8 @@
             <field name="name">Received Badge</field>
             <field name="body_html"><![CDATA[
         <p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !
-            % if object.user_from_id
-                This badge was granted by <strong>${object.user_from_id.name}</strong>.
+            % if object.sender_id
+                This badge was granted by <strong>${object.sender_id.name}</strong>.
             % endif
         </p>
 
diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 2b997384467..943e236382a 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -29,12 +29,6 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
-CAN_GRANT = 1
-NOBODY_CAN_GRANT = 2
-USER_NOT_VIP = 3
-BADGE_REQUIRED = 4
-TOO_MANY = 5
-
 class gamification_badge_user(osv.Model):
     """User having received a badge"""
 
@@ -44,7 +38,7 @@ class gamification_badge_user(osv.Model):
 
     _columns = {
         'user_id': fields.many2one('res.users', string="User", required=True),
-        'user_from_id': fields.many2one('res.users', string="User From"),
+        'sender_id': fields.many2one('res.users', string="Sender", help="The user who has send the badge"),
         'badge_id': fields.many2one('gamification.badge', string='Badge', required=True),
         'comment': fields.text('Comment'),
         'badge_name': fields.related('badge_id', 'name', type="char", string="Badge Name"),
@@ -65,11 +59,8 @@ class gamification_badge_user(osv.Model):
         temp_obj = self.pool.get('email.template')
         user_obj = self.pool.get('res.users')
         template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_badge_received', context)
-        ctx = context.copy()
         for badge_user in self.browse(cr, uid, ids, context=context):
-
-            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.badge.user', badge_user.id, context=ctx)
-
+            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.badge.user', badge_user.id, context=context)
             res = user_obj.message_post(cr, uid, badge_user.user_id.id, body=body_html, context=context)
         return res
 
@@ -81,6 +72,12 @@ class gamification_badge_user(osv.Model):
 class gamification_badge(osv.Model):
     """Badge object that users can send and receive"""
 
+    CAN_GRANT = 1
+    NOBODY_CAN_GRANT = 2
+    USER_NOT_VIP = 3
+    BADGE_REQUIRED = 4
+    TOO_MANY = 5
+
     _name = 'gamification.badge'
     _description = 'Gamification badge'
     _inherit = ['mail.thread']
@@ -223,15 +220,15 @@ class gamification_badge(osv.Model):
         Do not check for SUPERUSER_ID
         """
         status_code = self._can_grant_badge(cr, uid, badge_id, context=context)
-        if status_code == CAN_GRANT:
+        if status_code == self.CAN_GRANT:
             return True
-        elif status_code == NOBODY_CAN_GRANT:
+        elif status_code == self.NOBODY_CAN_GRANT:
             raise osv.except_osv(_('Warning!'), _('This badge can not be sent by users.'))
-        elif status_code == USER_NOT_VIP:
+        elif status_code == self.USER_NOT_VIP:
             raise osv.except_osv(_('Warning!'), _('You are not in the user allowed list.'))
-        elif status_code == BADGE_REQUIRED:
+        elif status_code == self.BADGE_REQUIRED:
             raise osv.except_osv(_('Warning!'), _('You do not have the required badges.'))
-        elif status_code == TOO_MANY:
+        elif status_code == self.TOO_MANY:
             raise osv.except_osv(_('Warning!'), _('You have already sent this badge too many time this month.'))
         else:
             _logger.exception("Unknown badge status code: %d" % int(status_code))
@@ -245,27 +242,27 @@ class gamification_badge(osv.Model):
         :return: integer representing the permission.
         """
         if uid == SUPERUSER_ID:
-            return CAN_GRANT
+            return self.CAN_GRANT
 
         badge = self.browse(cr, uid, badge_id, context=context)
 
         if badge.rule_auth == 'nobody':
-            return NOBODY_CAN_GRANT
+            return self.NOBODY_CAN_GRANT
 
         elif badge.rule_auth == 'users' and uid not in [user.id for user in badge.rule_auth_user_ids]:
-            return USER_NOT_VIP
+            return self.USER_NOT_VIP
 
         elif badge.rule_auth == 'having':
             all_user_badges = self.pool.get('gamification.badge.user').search(cr, uid, [('user_id', '=', uid)], context=context)
             for required_badge in badge.rule_auth_badge_ids:
                 if required_badge.id not in all_user_badges:
-                    return BADGE_REQUIRED
+                    return self.BADGE_REQUIRED
 
         if badge.rule_max and badge.stat_my_monthly_sending >= badge.rule_max_number:
-            return TOO_MANY
+            return self.TOO_MANY
 
         # badge.rule_auth == 'everyone' -> no check
-        return CAN_GRANT
+        return self.CAN_GRANT
 
     def check_progress(self, cr, uid, context=None):
         try:
diff --git a/addons/gamification/wizard/grant_badge.py b/addons/gamification/wizard/grant_badge.py
index 1b80c490ef3..44f739fff4e 100644
--- a/addons/gamification/wizard/grant_badge.py
+++ b/addons/gamification/wizard/grant_badge.py
@@ -46,7 +46,7 @@ class grant_badge_wizard(osv.TransientModel):
             #create the badge
             values = {
                 'user_id': wiz.user_id.id,
-                'user_from_id': uid,
+                'sender_id': uid,
                 'badge_id': wiz.badge_id.id,
                 'comment': wiz.comment,
             }
diff --git a/addons/hr_gamification/wizard/grant_badge.py b/addons/hr_gamification/wizard/grant_badge.py
index 22e72e84e27..b8a51044d4c 100644
--- a/addons/hr_gamification/wizard/grant_badge.py
+++ b/addons/hr_gamification/wizard/grant_badge.py
@@ -49,7 +49,7 @@ class hr_grant_badge_wizard(osv.TransientModel):
 
             values = {
                 'user_id': wiz.user_id.id,
-                'user_from_id': uid,
+                'sender_id': uid,
                 'badge_id': wiz.badge_id.id,
                 'employee_id': wiz.employee_id.id,
                 'comment': wiz.comment,

From 7c6a6b26f181328b8d9a50dc09313a6e862252d0 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 23 Dec 2013 17:12:29 +0100
Subject: [PATCH 533/547] [FIX] gamification: goal.condition ->
 goal.definition_condition, user_ids not in vals -> not vals.get(user_ids)

bzr revid: mat@openerp.com-20131223161229-lpoevttkt6ezt2ia
---
 addons/gamification/models/badge.py     | 5 +----
 addons/gamification/models/challenge.py | 6 +++---
 addons/gamification/models/goal.py      | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index 943e236382a..1d879393ed2 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -90,10 +90,7 @@ class gamification_badge(osv.Model):
         """
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            res = set()
-            for owner in obj.owner_ids:
-                res.add(owner.user_id.id)
-            res = list(res)
+            res = list(set(owner.user_id.id for owner in obj.owner_ids))
             result[obj.id] = {
                 'unique_owner_ids': res,
                 'stat_count': len(obj.owner_ids),
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 83ec0fd5beb..feeb0b3642e 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -206,7 +206,7 @@ class gamification_challenge(osv.Model):
         if vals.get('autojoin_group_id'):
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
 
-            if 'user_ids' not in vals:
+            if not vals.get('user_ids'):
                 vals['user_ids'] = []
             vals['user_ids'] += [(4, user.id) for user in new_group.users]
 
@@ -226,7 +226,7 @@ class gamification_challenge(osv.Model):
         if vals.get('autojoin_group_id'):
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
 
-            if 'user_ids' not in vals:
+            if not vals.get('user_ids'):
                 vals['user_ids'] = []
             vals['user_ids'] += [(4, user.id) for user in new_group.users]
 
@@ -758,7 +758,7 @@ class gamification_challenge(osv.Model):
             for goal in goal_obj.browse(cr, uid, goal_ids, context=context):
                 if goal.state != 'reached':
                     all_reached = False
-                if goal.condition == 'higher':
+                if goal.definition_condition == 'higher':
                     # can be over 100
                     total_completness += 100.0 * goal.current / goal.target_goal
                 elif goal.state == 'reached':
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 52eebb63857..7c665f41e68 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -268,7 +268,7 @@ class gamification_goal(osv.Model):
                     towrite['current'] = new_value
 
             # check goal target reached
-            if (goal.definition_id.condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.definition_id.condition == 'lower' and towrite.get('current', goal.current) <= goal.target_goal):
+            if (goal.definition_condition == 'higher' and towrite.get('current', goal.current) >= goal.target_goal) or (goal.definition_condition == 'lower' and towrite.get('current', goal.current) <= goal.target_goal):
                 towrite['state'] = 'reached'
 
             # check goal failure

From 6f5815f44de8afa6fd357dd79c7ec8cca121c357 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 23 Dec 2013 17:32:14 +0100
Subject: [PATCH 534/547] [REF] gamification: cahnge some tde remarks, Long
 live Cthulhu

bzr revid: mat@openerp.com-20131223163214-f6yp2yxf5ja1wq22
---
 addons/gamification/models/goal.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 7c665f41e68..698d20d0159 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -89,7 +89,7 @@ class gamification_goal_definition(osv.Model):
             string='Date Field',
             help='The date to use for the time period evaluated'),
         'domain': fields.char("Filter Domain",
-            help="Technical filters rules to apply. Use 'user.id' (without marks) to limit the search to the evaluated user.",
+            help="Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)].",
             required=True),
         'compute_code': fields.char('Compute Code',
             help="The name of the python method that will be executed to compute the current value. See the file gamification/goal_definition_data.py for examples."),
@@ -124,7 +124,7 @@ class gamification_goal(osv.Model):
     _description = 'Gamification goal instance'
     _inherit = 'mail.thread'
 
-    def _get_completeness(self, cr, uid, ids, field_name, arg, context=None):
+    def _get_completion(self, cr, uid, ids, field_name, arg, context=None):
         """Return the percentage of completeness of the goal, between 0 and 100"""
         res = dict.fromkeys(ids, 0.0)
         for goal in self.browse(cr, uid, ids, context=context):
@@ -162,7 +162,7 @@ class gamification_goal(osv.Model):
             required=True,
             track_visibility='always'),  # no goal = global index
         'current': fields.float('Current Value', required=True, track_visibility='always'),
-        'completeness': fields.function(_get_completeness, type='float', string='Completeness'),
+        'completeness': fields.function(_get_completion, type='float', string='Completeness'),
         'state': fields.selection([
                 ('draft', 'Draft'),
                 ('inprogress', 'In progress'),
@@ -346,7 +346,7 @@ class gamification_goal(osv.Model):
         goal = self.browse(cr, uid, goal_id, context=context)
 
         if goal.definition_id.action_id:
-            #open a the action linked on the goal
+            # open a the action linked to the goal
             action = goal.definition_id.action_id.read()[0]
 
             if goal.definition_id.res_id_field:
@@ -354,25 +354,20 @@ class gamification_goal(osv.Model):
                 action['res_id'] = safe_eval(goal.definition_id.res_id_field, {'user': current_user})
 
                 # if one element to display, should see it in form mode if possible
-                views = action['views']
-                for (view_id, mode) in action['views']:
-                    if mode == "form":
-                        views = [(view_id, mode)]
-                        break
-                action['views'] = views
+                action['views'] = [(view_id, mode) for (view_id, mode) in action['views'] if mode == 'form'] or action['views']
             return action
 
         if goal.computation_mode == 'manually':
-            #open a wizard window to update the value manually
+            # open a wizard window to update the value manually
             action = {
                 'name': _("Update %s") % goal.definition_id.name,
                 'id': goal_id,
                 'type': 'ir.actions.act_window',
                 'views': [[False, 'form']],
                 'target': 'new',
+                'context': {'default_goal_id': goal_id, 'default_current': goal.current},
+                'res_model': 'gamification.goal.wizard'
             }
-            action['context'] = {'default_goal_id': goal_id, 'default_current': goal.current}
-            action['res_model'] = 'gamification.goal.wizard'
             return action
 
         return False

From 68795d8a10c90cbd8321ac86f8da642f6472551d Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 24 Dec 2013 11:32:07 +0100
Subject: [PATCH 535/547] [IMP] changes the rng description of the xml grammar
 to add a 'stacked' attribute to the tag 'graph'

bzr revid: ged@openerp.com-20131224103207-48jd6gh78xmri8wd
---
 openerp/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index de0af811b83..5febbf2948c 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -663,6 +663,7 @@
             <rng:optional><rng:attribute name="string" /></rng:optional>
             <rng:optional><rng:attribute name="orientation" /></rng:optional>
             <rng:optional><rng:attribute name="type" /></rng:optional>
+            <rng:optional><rng:attribute name="stacked" /></rng:optional>
             <rng:optional><rng:attribute name="color"/></rng:optional>
             <rng:oneOrMore>
                 <rng:ref name="field"/>

From aefd64e8cfe41db54588dac2c50cf2a50316cc7a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 14:00:23 +0100
Subject: [PATCH 536/547] [REF] gamification: compute_code is now similar to
 ir.actions, cleanup code

bzr revid: mat@openerp.com-20131224130023-e4gc91ell38zdtfj
---
 addons/gamification/data/goal_base.xml        |  2 +-
 addons/gamification/data/goal_definition.py   |  9 ----
 addons/gamification/models/goal.py            | 49 +++++++++++++------
 .../static/src/js/gamification.js             | 45 +++++++----------
 addons/gamification/views/challenge.xml       |  6 +--
 addons/gamification/views/goal.xml            |  2 +-
 6 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 48dd770bbcc..5da7b86679d 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -61,7 +61,7 @@
             <field name="name">Mail Group Following</field>
             <field name="description">Follow mail groups to receive news</field>
             <field name="computation_mode">python</field>
-            <field name="compute_code">self.number_following(cr, uid, 'mail.group')</field>
+            <field name="compute_code">result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)</field>
             <field name="action_id" eval="ref('mail.action_view_groups')" />
         </record>
 
diff --git a/addons/gamification/data/goal_definition.py b/addons/gamification/data/goal_definition.py
index 937168fc0a2..e16f2c7b11f 100644
--- a/addons/gamification/data/goal_definition.py
+++ b/addons/gamification/data/goal_definition.py
@@ -30,12 +30,3 @@ class gamification_goal_definition_data(osv.Model):
     of a user's goal. The return definition must be a float or integer.
     """
     _inherit = 'gamification.goal.definition'
-
-    def number_following(self, cr, uid, xml_id="mail.thread", context=None):
-        """Return the number of 'xml_id' objects the user is following
-
-        The model specified in 'xml_id' must inherit from mail.thread
-        """
-        ref_obj = self.pool.get(xml_id)
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return ref_obj.search(cr, uid, [('message_follower_ids', '=', user.partner_id.id)], count=True, context=context)
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 698d20d0159..8792e219d71 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -25,9 +25,9 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.safe_eval import safe_eval
 from openerp.tools.translate import _
 
-from datetime import date, datetime, timedelta
-
 import logging
+import time
+from datetime import date, datetime, timedelta
 
 _logger = logging.getLogger(__name__)
 
@@ -75,7 +75,6 @@ class gamification_goal_definition(osv.Model):
             required=True),
         'display_mode': fields.selection([
                 ('progress', 'Progressive (using numerical values)'),
-                ('checkbox', 'Checkbox (done or not-done)'),
                 ('boolean', 'Exclusive (done or not-done)'),
             ],
             string="Displayed as", required=True),
@@ -91,8 +90,8 @@ class gamification_goal_definition(osv.Model):
         'domain': fields.char("Filter Domain",
             help="Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)].",
             required=True),
-        'compute_code': fields.char('Compute Code',
-            help="The name of the python method that will be executed to compute the current value. See the file gamification/goal_definition_data.py for examples."),
+        'compute_code': fields.text('Python Code',
+            help="Python code to be executed for each user. 'result' should contains the new current value. Evaluated user can be access through object.user_id."),
         'condition': fields.selection([
                 ('higher', 'The higher the better'),
                 ('lower', 'The lower the better')
@@ -114,6 +113,15 @@ class gamification_goal_definition(osv.Model):
         'display_mode': 'progress',
     }
 
+    def number_following(self, cr, uid, model_name="mail.thread", context=None):
+        """Return the number of 'model_name' objects the user is following
+
+        The model specified in 'model_name' must inherit from mail.thread
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return self.pool.get('mail.followers').search(cr, uid, [('res_model', '=', model_name), ('partner_id', '=', user.partner_id.id)], count=True, context=context)
+
+
 
 class gamification_goal(osv.Model):
     """Goal instance for a user
@@ -221,6 +229,8 @@ class gamification_goal(osv.Model):
         If a goal reaches the target value, the status is set to reached
         If the end date is passed (at least +1 day, time not considered) without
         the target value being reached, the goal is set as failed."""
+        if context is None:
+            context = {}
 
         for goal in self.browse(cr, uid, ids, context=context):
             towrite = {}
@@ -233,14 +243,25 @@ class gamification_goal(osv.Model):
 
             elif goal.definition_id.computation_mode == 'python':
                 # execute the chosen method
-                values = {'cr': cr, 'uid': goal.user_id.id, 'context': context, 'self': self.pool.get('gamification.goal.definition')}
-                result = safe_eval(goal.definition_id.compute_code, values, {})
-
-                if type(result) in (float, int, long) and result != goal.current:
-                    towrite['current'] = result
+                cxt = {
+                    'self': self.pool.get('gamification.goal'),
+                    'object': goal,
+                    'pool': self.pool,
+                    'cr': cr,
+                    'context': dict(context), # copy context to prevent side-effects of eval
+                    'uid': uid,
+                    'result': False,
+                    'date': date, 'datetime': datetime, 'timedelta': timedelta, 'time': time
+                }
+                code = goal.definition_id.compute_code.strip()
+                safe_eval(code, cxt, mode="exec", nocopy=True)
+                # the result of the evaluated codeis put in the 'result' local variable, propagated to the context
+                result = cxt.get('result', False)
+                if result and type(result) in (float, int, long):
+                    if result != goal.current:
+                        towrite['current'] = result
                 else:
-                    _logger.exception(_('Unvalid return content from the evaluation of %s' % str(goal.definition_id.compute_code)))
-                    # raise osv.except_osv(_('Error!'), _('Unvalid return content from the evaluation of %s' % str(goal.definition_id.compute_code)))
+                    _logger.exception(_('Invalid return content from the evaluation of %s' % code))
 
             else:  # count or sum
                 obj = self.pool.get(goal.definition_id.model_id.model)
@@ -249,7 +270,7 @@ class gamification_goal(osv.Model):
                 # eval the domain with user replaced by goal user object
                 domain = safe_eval(goal.definition_id.domain, {'user': goal.user_id})
 
-                #add temporal clause(s) to the domain if fields are filled on the goal
+                # add temporal clause(s) to the domain if fields are filled on the goal
                 if goal.start_date and field_date_name:
                     domain.append((field_date_name, '>=', goal.start_date))
                 if goal.end_date and field_date_name:
@@ -263,7 +284,7 @@ class gamification_goal(osv.Model):
                 else:  # computation mode = count
                     new_value = obj.search(cr, uid, domain, context=context, count=True)
 
-                #avoid useless write if the new value is the same as the old one
+                # avoid useless write if the new value is the same as the old one
                 if new_value != goal.current:
                     towrite['current'] = new_value
 
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 22cfd5f3ab5..2a8db5f369d 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -7,9 +7,9 @@ openerp.gamification = function(instance) {
             var self = this;
             this._super(parent, action);
             this.deferred = $.Deferred();
-            // this.res_user = new instance.web.DataSetSearch(this, 'res.users');
             this.goals_info = {};
             this.challenge_suggestions = {};
+            $(document).off('keydown.klistener');
         },
         events: {
             // update a challenge and related goals
@@ -49,6 +49,21 @@ openerp.gamification = function(instance) {
                         self.get_goal_todo_info();
                     });
                 });
+            },
+            'click .oe_goal h4': function(event) {
+                var self = this;
+                this.kkeys = [];
+                $(document).on('keydown.klistener', function(event) {
+                    if ("37,38,39,40,65,66".indexOf(event.keyCode) < 0) {
+                        $(document).off('keydown.klistener');
+                    } else {
+                        self.kkeys.push(event.keyCode);
+                        if (self.kkeys.toString().indexOf("38,38,40,40,37,39,37,39,66,65") >= 0) {
+                            new instance.web.Model('gamification.badge').call('check_progress', []);
+                            $(document).off('keydown.klistener');
+                        }
+                    }
+                });
             }
         },
         start: function() {
@@ -63,6 +78,7 @@ openerp.gamification = function(instance) {
                 if (result.length === 0) {
                     self.$el.find(".oe_gamification_challenge_list").hide();
                 } else {
+                    self.$el.find(".oe_gamification_challenge_list").empty();
                     _.each(result, function(item){
                         var $item = $(QWeb.render("gamification.ChallengeSummary", {challenge: item}));
                         self.render_money_fields($item);
@@ -115,34 +131,7 @@ openerp.gamification = function(instance) {
             this._super();
             var sidebar = new instance.gamification.Sidebar(this);
             sidebar.appendTo($('.oe_mail_wall_aside'));
-        }
-    });
-
-    instance.web_kanban.KanbanView.include({
-        start: function() {
-            this._super();
-            $(document).off('keydown.klistener');
         },
-        events: {
-            'click': function(event) {
-                var self = this;
-                if (this.ViewManager.dataset.model === 'gamification.badge') {
-                    this.kkeys = [];
-                    $(document).off('keydown.klistener');
-                    $(document).on('keydown.klistener', function(event) {
-                        if ("37,38,39,40,65,66".indexOf(event.keyCode) < 0) {
-                            $(document).off('keydown.klistener');
-                        } else {
-                            self.kkeys.push(event.keyCode);
-                            if (self.kkeys.toString().indexOf("38,38,40,40,37,39,37,39,66,65") >= 0) {
-                                new instance.web.Model('gamification.badge').call('check_progress', []);
-                                $(document).off('keydown.klistener');
-                            }
-                        }
-                    });
-                }
-            }
-        }
     });
 
     instance.web_kanban.KanbanRecord.include({
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index 973194738cd..3aa4410aaf2 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -101,9 +101,9 @@
                                     <field name="invited_user_ids" widget="many2many_tags" />
                                 </group>
                                 <group string="Notification Messages">
-                                    <div class="oe_grey">
-                                    <p>Depending on the Diasplay mode, reports will be individual or shared.</p>
-                                </div>
+                                    <div class="oe_grey" colspan="4">
+                                        <p>Depending on the Display mode, reports will be individual or shared.</p>
+                                    </div>
                                     <field name="report_message_frequency" />
                                     <field name="report_header" placeholder="e.g. The following message contains the current progress of the sale team..." attrs="{'invisible': [('report_message_frequency','=','never')]}" />
                                     <field name="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml
index d76b41882df..a269f710c02 100644
--- a/addons/gamification/views/goal.xml
+++ b/addons/gamification/views/goal.xml
@@ -244,7 +244,7 @@
                                 <field name="field_id" attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}" domain="[('model_id','=',model_id)]"  class="oe_inline"/>
                                 <field name="field_date_id" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))]}" domain="[('ttype', 'in', ('date', 'datetime')), ('model_id','=',model_id)]" class="oe_inline"/>
                                 <field name="domain" attrs="{'invisible':[('computation_mode','not in',('sum', 'count'))], 'required':[('computation_mode','in',('sum', 'count'))]}" class="oe_inline"/>
-                                <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}" placeholder="e.g. self.my_method(cr, uid)"/>
+                                <field name="compute_code" attrs="{'invisible':[('computation_mode','!=','python')], 'required':[('computation_mode','=','python')]}" placeholder="e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"/>
                                 <field name="condition" widget="radio"/>
                             </group>
                             <group string="Formating Options">

From 22a291d47a3808168cf96395a0c9ec9e59da1c3e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 14:44:05 +0100
Subject: [PATCH 537/547] [REF] gamification: use sass files instead of native
 css

bzr revid: mat@openerp.com-20131224134405-9k4potbzq7ea20p4
---
 addons/gamification/static/src/css/Makefile   |   3 +
 .../static/src/css/gamification.css           | 294 ++++++++----------
 .../static/src/css/gamification.sass          | 181 +++++++++++
 3 files changed, 318 insertions(+), 160 deletions(-)
 create mode 100644 addons/gamification/static/src/css/Makefile
 create mode 100644 addons/gamification/static/src/css/gamification.sass

diff --git a/addons/gamification/static/src/css/Makefile b/addons/gamification/static/src/css/Makefile
new file mode 100644
index 00000000000..3a6a70cf59b
--- /dev/null
+++ b/addons/gamification/static/src/css/Makefile
@@ -0,0 +1,3 @@
+gamification.css: gamification.sass
+	sass --trace -t expanded gamification.sass gamification.css
+
diff --git a/addons/gamification/static/src/css/gamification.css b/addons/gamification/static/src/css/gamification.css
index fd39b130fad..4ac3a0340fa 100644
--- a/addons/gamification/static/src/css/gamification.css
+++ b/addons/gamification/static/src/css/gamification.css
@@ -1,216 +1,190 @@
-/* Kanban views */
+@charset "UTF-8";
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
-    width: 230px;
-    min-height: 200px;
+  width: 230px;
+  min-height: 200px;
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
-    width: 250px;
-    min-height: 150px;
+  width: 250px;
+  min-height: 150px;
 }
 .openerp .oe_kanban_badge_avatars {
-    margin-top: 8px;
+  margin-top: 8px;
 }
 .openerp .oe_kanban_badge_avatars img {
-    width: 30px;
-    height: 30px;
-    padding-left: 0;
-    margin-top: 3px;
-    border-radius: 2px;
-    -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  width: 30px;
+  height: 30px;
+  padding-left: 0;
+  margin-top: 3px;
+  border-radius: 2px;
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 .openerp .oe_kanban_goal .oe_goal_state_block {
-    width:200px;
-    height:130px;
-    margin: auto;
-    margin-bottom: -20px;
+  width: 200px;
+  height: 130px;
+  margin: auto;
+  margin-bottom: -20px;
 }
-.oe_kanban_goal .oe_goal_state_block,
-.oe_kanban_goal p {
-    text-align: center;
+.openerp .oe_kanban_goal .oe_goal_state_block .oe_goal_state {
+  font-size: 2.5em;
+  font-weight: bold;
+  padding-top: 30px;
 }
-.oe_kanban_goal .oe_goal_state_block .oe_goal_state {
-    font-size: 2.5em;
-    font-weight: bold;
-    padding-top: 30px;
+.openerp .oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e {
+  font-size: 7em;
 }
-.oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e{
-    font-size: 7em;
+.openerp .oe_kanban_goal .oe_goal_state_block, .openerp .oe_kanban_goal p {
+  text-align: center;
 }
-.openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child {
-    margin: auto; /* avoid margin-right: 16px; */
+.openerp .oe_kanban_content .oe_goal_gauge:first-child {
+  margin: auto;
 }
-.oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg {
-    margin-top: -20px;
+.openerp .oe_kanban_content .oe_goal_gauge svg {
+  margin-top: -20px;
 }
 .openerp .oe_no_overflow {
-    overflow: hidden;
+  overflow: hidden;
 }
 .openerp .oe_red {
-    color: red;
+  color: red;
 }
 .openerp .oe_green {
-    color: green;
+  color: green;
 }
 .openerp .oe_orange {
-    color: orange;
+  color: orange;
 }
-/* compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell */
 .openerp .oe_form td .oe_no_padding {
-    margin-left: -6px;
+  margin-left: -6px;
 }
-
-
-/*
-   ============
-   Mail Sidebar 
-   ============
-*/
 .openerp .oe_mail_wall .oe_mail_wall_aside {
-    margin-top: 15px;
-    position: relative;
-    display: inline-block;
-    vertical-align: top;
-    width: 280px;
-    border-radius: 2px;
+  margin-top: 15px;
+  position: relative;
+  display: inline-block;
+  vertical-align: top;
+  width: 280px;
+  border-radius: 2px;
 }
 .openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_challenge_list {
-    background-color: #EDEDF6;
+  background-color: #ededf6;
 }
-.openerp .oe_mail_wall_aside .oe_gamification_suggestion {
-    background-color: rgb(211, 222, 241);
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_suggestion {
+  background-color: #d3def1;
 }
-.openerp .oe_mail_wall_aside .oe_gamification_suggestion ul {
-    padding-left: 15px;
+.openerp .oe_mail_wall .oe_mail_wall_aside .oe_gamification_suggestion ul {
+  padding-left: 15px;
 }
-.openerp .oe_mail_wall_aside > div {
-    border-bottom: solid 5px white;
-    border-radius: 2px;
+.openerp .oe_mail_wall .oe_mail_wall_aside h4, .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list .oe_thead {
+  text-align: center;
+  padding-bottom: 15px;
 }
-.openerp .oe_mail_wall_aside .oe_goal {
-    border-bottom: solid 3px white;
+.openerp .oe_mail_wall .oe_mail_wall_aside > div {
+  border-bottom: solid 5px white;
+  border-radius: 2px;
 }
-.openerp .oe_mail_wall_aside h3 {
-    font-size: 1.3em;
-    line-height: 1em;
+.openerp .oe_mail_wall .oe_goal {
+  border-bottom: solid 3px white;
+  padding: 5px 10px;
 }
-.openerp .oe_mail_wall_aside .oe_goal {
-    /*padding: 5px 5px 0 15px;*/
-    padding: 5px 10px;
+.openerp .oe_mail_wall .oe_goal .oe_update_challenge.oe_e, .openerp .oe_mail_wall .oe_goal .oe_goal_action.oe_e {
+  visibility: hidden;
+  font-size: 25px;
+  float: right;
+  position: relative;
 }
-.openerp .oe_mail_wall_aside .oe_goal h4,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goals_list .oe_thead {
-    text-align: center;
-    padding-bottom: 15px;
+.openerp .oe_mail_wall .oe_goal div:hover > .oe_update_challenge, .openerp .oe_mail_wall .oe_goal div:hover > .oe_goal_action, .openerp .oe_mail_wall .oe_goal th:hover > .oe_goal_action {
+  visibility: visible;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress div {
-    display: inline-block;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list {
+  padding-left: 0;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  width: 100%;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress::before {
-    content: "•";
-    padding-right: 4px;
-    /*font-size: 175%;*/
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress div {
+  display: inline-block;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached::before {
-    /*color: rgb(27, 70, 7);*/
-    content: "✓";
-    padding-right: 0;
-    margin-left: -2px;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress::before {
+  content: "•";
+  padding-right: 4px;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell.oe_goal_current {
-    font-size: 150%;
-    font-weight: bold;
-    min-width: 50px;
-    padding: 0 5px;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress.oe_goal_reached::before {
+  content: "✓";
+  padding-right: 0;
+  margin-left: -2px;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell {
-    text-decoration: line-through;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_no_progress.oe_goal_reached .oe_cell {
+  text-decoration: line-through;
 }
-
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box {
-    display: inline-block;
-    position: relative;
-    z-index: 0;
-    vertical-align: middle;
-    width: 100%;
-    border: solid 1px rgba(0,0,0,0.03);
-    border-radius: 2px;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_cell.oe_goal_current {
+  font-size: 150%;
+  font-weight: bold;
+  min-width: 50px;
+  padding: 0 5px;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_outer_box.oe_no_progress {
-    border: none;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_outer_box {
+  display: inline-block;
+  position: relative;
+  z-index: 0;
+  vertical-align: middle;
+  width: 100%;
+  border: solid 1px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress_background {
-    background-color: white;
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    z-index: -2;
-    top: 0; left: 0;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_outer_box.oe_no_progress {
+  border: none;
 }
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_progress {
-    background-color: rgb(212, 233, 222);
-    /*background-color: #7c7bad;*/
-    position: absolute;
-    height: 100%;
-    width: 0;
-    z-index: -1;
-    top: 0; left: 0;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_progress_background {
+  background-color: white;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  z-index: -2;
+  top: 0;
+  left: 0;
 }
-
-.openerp .oe_mail_wall_aside .oe_goals_list {
-    padding-left: 0;
-    margin-top: 5px;
-    margin-bottom: 10px;
-    width: 100%;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_goal_progress {
+  background-color: #d4e9de;
+  position: absolute;
+  height: 100%;
+  width: 0;
+  z-index: -1;
+  top: 0;
+  left: 0;
 }
-
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_thead {
-    font-weight: normal;
-    padding: 5px;
-    text-align: center;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_thead {
+  font-weight: normal;
+  padding: 5px;
+  text-align: center;
 }
-
-.openerp .oe_mail_wall_aside .oe_goals_list .oe_cell {
-    padding: 3px 0;
+.openerp .oe_mail_wall .oe_goal .oe_goals_list .oe_cell {
+  padding: 3px 0;
 }
-.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col0 {
-    font-size: 200%;
-    font-weight: bold;
-    width: 25px;
-    text-align: center;
+.openerp .oe_mail_wall .oe_table.oe_goals_list .col0 {
+  font-size: 200%;
+  font-weight: bold;
+  width: 25px;
+  text-align: center;
 }
-.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col1 {
-    padding: 0 5px;
+.openerp .oe_mail_wall .oe_table.oe_goals_list .col1 {
+  padding: 0 5px;
 }
-.openerp .oe_mail_wall_aside .oe_table.oe_goals_list .col2 {
-    width: auto;
+.openerp .oe_mail_wall .oe_table.oe_goals_list .col2 {
+  width: auto;
 }
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar {
-    width: 24px;
-    padding-right: 5px;
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_challenge.oe_e,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_goal_action.oe_e {
-    visibility: hidden;
-    font-size: 25px;
-    float: right;
-    /*margin-right: 15px;*/
-    position: relative;
-}
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_challenge,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action,
-.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action {
-    visibility: visible;
+.openerp .oe_mail_wall .oe_user_avatar {
+  width: 24px;
+  padding-right: 5px;
 }
 .openerp .oe_mail_wall .oe_mail {
-    display: inline-block;
+  display: inline-block;
 }
-.openerp .oe_table {
-    display: table;
+.openerp .oe_mail_wall .oe_table {
+  display: table;
 }
-.openerp .oe_row {
-    display: table-row;
+.openerp .oe_mail_wall .oe_row {
+  display: table-row;
+}
+.openerp .oe_mail_wall .oe_cell {
+  display: table-cell;
+  vertical-align: middle;
 }
-.openerp .oe_cell {
-    display: table-cell;
-    vertical-align: middle;
-}
\ No newline at end of file
diff --git a/addons/gamification/static/src/css/gamification.sass b/addons/gamification/static/src/css/gamification.sass
new file mode 100644
index 00000000000..3bb6b570e66
--- /dev/null
+++ b/addons/gamification/static/src/css/gamification.sass
@@ -0,0 +1,181 @@
+@charset "utf-8"
+
+.openerp
+    // Kanban views
+    .oe_kanban_view 
+        .oe_kanban_card.oe_kanban_goal
+            width: 230px
+            min-height: 200px
+        .oe_kanban_card.oe_kanban_badge
+            width: 250px
+            min-height: 150px
+    .oe_kanban_badge_avatars
+        margin-top: 8px
+        img
+            width: 30px
+            height: 30px
+            padding-left: 0
+            margin-top: 3px
+            border-radius: 2px
+            -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2)
+
+    .oe_kanban_goal
+        .oe_goal_state_block
+            width: 200px
+            height: 130px
+            margin: auto
+            margin-bottom: -20px
+            .oe_goal_state
+                font-size: 2.5em
+                font-weight: bold
+                padding-top: 30px
+            .oe_goal_state.oe_e
+                font-size: 7em
+        .oe_goal_state_block,p
+            text-align: center
+    
+    .oe_kanban_content
+        .oe_goal_gauge:first-child
+            margin: auto /* avoid margin-right: 16px */
+        .oe_goal_gauge
+            svg
+                margin-top: -20px
+    .oe_no_overflow
+        overflow: hidden
+
+
+    .oe_red
+        color: red
+    .oe_green
+        color: green
+    .oe_orange
+        color: orange
+
+
+    // compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell
+    .oe_form td .oe_no_padding
+        margin-left: -6px
+
+
+    .oe_mail_wall
+        .oe_mail_wall_aside
+            margin-top: 15px
+            position: relative
+            display: inline-block
+            vertical-align: top
+            width: 280px
+            border-radius: 2px
+
+            .oe_gamification_challenge_list
+                background-color: #EDEDF6
+            .oe_gamification_suggestion
+                background-color: rgb(211, 222, 241)
+                ul
+                    padding-left: 15px
+
+            h4, .oe_goals_list .oe_thead
+                text-align: center
+                padding-bottom: 15px
+
+        .oe_mail_wall_aside > div
+            border-bottom: solid 5px white
+            border-radius: 2px
+
+        .oe_goal
+            border-bottom: solid 3px white
+            padding: 5px 10px
+            .oe_update_challenge.oe_e, .oe_goal_action.oe_e
+                visibility: hidden
+                font-size: 25px
+                float: right
+                position: relative
+            div:hover > .oe_update_challenge, div:hover > .oe_goal_action, th:hover > .oe_goal_action
+                visibility: visible
+
+            .oe_goals_list
+                padding-left: 0
+                margin-top: 5px
+                margin-bottom: 10px
+                width: 100%
+
+                .oe_no_progress
+                    div
+                        display: inline-block
+                .oe_no_progress::before
+                    content: "•"
+                    padding-right: 4px
+                .oe_no_progress.oe_goal_reached::before
+                    content: "✓"
+                    padding-right: 0
+                    margin-left: -2px
+                .oe_no_progress.oe_goal_reached
+                    .oe_cell
+                        text-decoration: line-through
+
+                .oe_cell.oe_goal_current
+                    font-size: 150%
+                    font-weight: bold
+                    min-width: 50px
+                    padding: 0 5px
+                
+                .oe_goal_outer_box
+                    display: inline-block
+                    position: relative
+                    z-index: 0
+                    vertical-align: middle
+                    width: 100%
+                    border: solid 1px rgba(0,0,0,0.03)
+                    border-radius: 2px
+                .oe_goal_outer_box.oe_no_progress
+                    border: none
+
+                .oe_goal_progress_background
+                    background-color: white
+                    position: absolute
+                    height: 100%
+                    width: 100%
+                    z-index: -2
+                    top: 0
+                    left: 0
+
+                .oe_goal_progress
+                    background-color: rgb(212, 233, 222)
+                    position: absolute
+                    height: 100%
+                    width: 0
+                    z-index: -1
+                    top: 0
+                    left: 0
+
+                .oe_thead
+                    font-weight: normal
+                    padding: 5px
+                    text-align: center
+                .oe_cell
+                    padding: 3px 0
+
+        .oe_table.oe_goals_list
+            .col0
+                font-size: 200%
+                font-weight: bold
+                width: 25px
+                text-align: center
+            .col1
+                padding: 0 5px
+            .col2
+                width: auto
+        
+        .oe_user_avatar
+            width: 24px
+            padding-right: 5px
+
+        .oe_mail
+            display: inline-block
+
+        .oe_table
+            display: table
+        .oe_row
+            display: table-row
+        .oe_cell
+            display: table-cell
+            vertical-align: middle

From 25117ca97f0bc61b27a407f48b97136151fe8303 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 15:11:40 +0100
Subject: [PATCH 538/547] [REF] gamification: use statusbar instead of action
 buttons

bzr revid: mat@openerp.com-20131224141140-vc0v5lpm0ivfl6i4
---
 addons/gamification/models/challenge.py | 78 +++++++++----------------
 addons/gamification/views/challenge.xml |  6 +-
 2 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index feeb0b3642e..50b949ff03b 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -221,7 +221,9 @@ class gamification_challenge(osv.Model):
         return create_res
 
     def write(self, cr, uid, ids, vals, context=None):
-        """Overwrite the write method to add the user of groups"""
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
         # add users when change the group auto-subscription
         if vals.get('autojoin_group_id'):
             new_group = self.pool.get('res.groups').browse(cr, uid, vals['autojoin_group_id'], context=context)
@@ -230,6 +232,29 @@ class gamification_challenge(osv.Model):
                 vals['user_ids'] = []
             vals['user_ids'] += [(4, user.id) for user in new_group.users]
 
+        print vals.get('state')
+        if vals.get('state') == 'inprogress':
+
+            if not vals.get('autojoin_group_id'):
+                # starting challenge, add users in autojoin group
+                if not vals.get('user_ids'):
+                    vals['user_ids'] = []
+                for challenge in self.browse(cr, uid, ids, context=context):
+                    if challenge.autojoin_group_id:
+                        vals['user_ids'] += [(4, user.id) for user in challenge.autojoin_group_id.users]
+                    if challenge.state == 'draft':
+                        # going from draft to inprogress
+                        self.message_post(cr, uid, challenge.id, body="New challenge started.", context=context)
+            self.generate_goals_from_challenge(cr, uid, ids, context=context)
+
+        elif vals.get('state') == 'done':
+            self.check_challenge_reward(cr, uid, ids, force=True, context=context)
+
+        elif vals.get('state') == 'draft':
+            # resetting progress
+            if self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', 'in', ids), ('state', 'in', ['inprogress', 'inprogress_update'])], context=context):
+                raise osv.except_osv("Error", "You can not reset a challenge with unfinished goals.")
+        
         write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
 
         # subscribe new users to the challenge
@@ -272,6 +297,9 @@ class gamification_challenge(osv.Model):
 
         :param list(int) ids: the ids of the challenges to update, if False will
         update only challenges in progress."""
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
         goal_obj = self.pool.get('gamification.goal')
 
         # we use yesterday to update the goals that just ended
@@ -319,61 +347,13 @@ class gamification_challenge(osv.Model):
         return True
 
 
-    ##### User actions #####
-
-    def action_start(self, cr, uid, ids, context=None):
-        """Start a draft challenge
-
-        Change the state of the challenge to in progress and generate related goals
-        """
-        if isinstance(ids, (int,long)):
-            ids = [ids]
-        # subscribe users if autojoin group
-        for challenge in self.browse(cr, uid, ids, context=context):
-            if challenge.autojoin_group_id:
-                self.write(cr, uid, [challenge.id], {'user_ids': [(4, user.id) for user in challenge.autojoin_group_id.users]}, context=context)
-
-            self.write(cr, uid, challenge.id, {'state': 'inprogress'}, context=context)
-            self.message_post(cr, uid, challenge.id, body="New challenge started.", context=context)
-        return self.generate_goals_from_challenge(cr, uid, ids, context=context)
-
     def action_check(self, cr, uid, ids, context=None):
         """Check a challenge
 
         Create goals that haven't been created yet (eg: if added users)
         Recompute the current value for each goal related"""
-        if isinstance(ids, (int,long)):
-            ids = [ids]
         return self._update_all(cr, uid, ids=ids, context=context)
 
-    def action_close(self, cr, uid, ids, context=None):
-        """Close a challenge in progress
-
-        Change the state of the challenge to in done
-        Does NOT close the related goals, this is handled by the goal itself"""
-        self.check_challenge_reward(cr, uid, ids, force=True, context=context)
-        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
-
-    def action_reset(self, cr, uid, ids, context=None):
-        """Reset a closed challenge
-
-        Change the state of the challenge to in progress
-        Closing a challenge does not affect the goals so neither does reset"""
-        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        """Cancel a challenge in progress
-
-        Change the state of the challenge to draft
-        Cancel the related goals"""
-        if isinstance(ids, (int,long)):
-            ids = [ids]
-        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
-        goal_ids = self.pool.get('gamification.goal').search(cr, uid, [('challenge_id', 'in', ids)], context=context)
-        self.pool.get('gamification.goal').write(cr, uid, goal_ids, {'state': 'canceled'}, context=context)
-
-        return True
-
     def action_report_progress(self, cr, uid, ids, context=None):
         """Manual report of a goal, does not influence automatic report frequency"""
         if isinstance(ids, (int,long)):
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index 3aa4410aaf2..b10a756f71c 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -34,13 +34,9 @@
             <field name="arch" type="xml">
                 <form string="Goal definitions" version="7.0">
                     <header>
-                        <button string="Start Now" type="object" name="action_start" states="draft" class="oe_highlight"/>
                         <button string="Refresh Challenge" type="object" name="action_check" states="inprogress"/>
-                        <button string="Close Challenge" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
-                        <button string="Reset to Draft" type="object" name="action_cancel" states="inprogress"/>
-                        <button string="Reset Completion" type="object" name="action_reset" states="done"/>
                         <button string="Report Progress" type="object" name="action_report_progress" states="inprogress,done" groups="base.group_no_one"/>
-                        <field name="state" widget="statusbar"/>
+                        <field name="state" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet>
 

From be7bc54edc2fcc0abb94450d22f37ae4d4b11dce Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 15:45:14 +0100
Subject: [PATCH 539/547] [REF] gamification: use m2o to email.template for
 report progress, create new field report_template_id, cleaning code

bzr revid: mat@openerp.com-20131224144514-lmbhw88nj7aa3r8i
---
 addons/gamification/data/__init__.py          | 22 -----------
 addons/gamification/data/goal_base.xml        | 34 +++++++----------
 addons/gamification/data/goal_definition.py   | 32 ----------------
 addons/gamification/models/challenge.py       | 37 ++++++++++---------
 addons/gamification/views/challenge.xml       |  4 +-
 .../gamification_sale_crm/sale_crm_goals.xml  |  2 -
 6 files changed, 35 insertions(+), 96 deletions(-)
 delete mode 100644 addons/gamification/data/__init__.py
 delete mode 100644 addons/gamification/data/goal_definition.py

diff --git a/addons/gamification/data/__init__.py b/addons/gamification/data/__init__.py
deleted file mode 100644
index b5649616b2c..00000000000
--- a/addons/gamification/data/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import goal_definition
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 5da7b86679d..7c23ae81020 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -122,23 +122,22 @@
     <header>
         <strong>Reminder ${object.name}</strong>
     </header>
-
-    <p class="oe_grey">${object.report_header or ''}</p>
     
     <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
 
     <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
             ]]></field>
         </record>
-
-        <record id="email_template_goal_progress_perso" model="email.template">
-            <field name="name">Personal Goal Progress</field>
+        
+        <record id="simple_report_template" model="email.template">
+            <field name="name">Simple Challenge Report Progress</field>
             <field name="body_html"><![CDATA[
-    <header>
-        <strong>${object.name}</strong>
-    </header>
-    <p class="oe_grey">${object.report_header or ''}</p>
+<header>
+    <strong>${object.name}</strong>
+</header>
+<p class="oe_grey">The following message contains the current progress for the challenge ${object.name}</p>
 
+% if object.visibility_mode == 'personal':
     <table width="100%" border="1">
     <tr>
         <th>Goal</th>
@@ -166,17 +165,8 @@
             <td>${line['completeness']} %</td>
         </tr>
     % endfor
-    </table>]]></field>
-        </record>
-
-        <record id="email_template_goal_progress_group" model="email.template">
-            <field name="name">Group Goal Progress</field>
-            <field name="body_html"><![CDATA[
-    <header>
-        <strong>${object.name}</strong>
-    </header>
-    <p class="oe_grey">${object.report_header or ''}</p>
-
+    </table>
+% else:
     % for line in ctx["challenge_lines"]:
         <table width="100%" border="1">
             <tr>
@@ -209,7 +199,9 @@
         <br/><br/>
 
     % endfor
-]]></field>
+% endif
+            ]]></field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/gamification/data/goal_definition.py b/addons/gamification/data/goal_definition.py
deleted file mode 100644
index e16f2c7b11f..00000000000
--- a/addons/gamification/data/goal_definition.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013 OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from openerp.osv import osv
-
-
-class gamification_goal_definition_data(osv.Model):
-    """Goal definition data
-
-    Methods for more complex goals not possible with the 'sum' and 'count' mode.
-    Each method should return the value that will be set in the 'current' field
-    of a user's goal. The return definition must be a float or integer.
-    """
-    _inherit = 'gamification.goal.definition'
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 50b949ff03b..12f1b62c6fb 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -102,11 +102,18 @@ class gamification_challenge(osv.Model):
                 res[challenge.id] = False
 
         return res
+    
     def _get_categories(self, cr, uid, context=None):
-            return [
-                ('hr', 'Human Ressources / Engagement'),
-                ('other', 'Settings / Gamification Tools'),
-            ]
+        return [
+            ('hr', 'Human Ressources / Engagement'),
+            ('other', 'Settings / Gamification Tools'),
+        ]
+
+    def _get_report_template(self, cr, uid, context=None):
+        try:
+            return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'simple_report_template')[1]
+        except ValueError:
+            return False
 
     _order = 'end_date, start_date, name, id'
     _columns = {
@@ -163,6 +170,7 @@ class gamification_challenge(osv.Model):
                 ('ranking', 'Leader Board (Group Ranking)'),
             ],
             string="Display Mode", required=True),
+
         'report_message_frequency': fields.selection([
                 ('never', 'Never'),
                 ('onchange', 'On change'),
@@ -175,7 +183,7 @@ class gamification_challenge(osv.Model):
         'report_message_group_id': fields.many2one('mail.group',
             string='Send a copy to',
             help='Group that will receive a copy of the report in addition to the user'),
-        'report_header': fields.text('Report Header'),
+        'report_template_id': fields.many2one('email.template', string="Report Template", required=True),
         'remind_update_delay': fields.integer('Non-updated manual goals will be reminded after',
             help="Never reminded if no value or zero is specified."),
         'last_report_date': fields.date('Last Report Date'),
@@ -196,6 +204,7 @@ class gamification_challenge(osv.Model):
         'manager_id': lambda s, cr, uid, c: uid,
         'category': 'hr',
         'reward_failure': False,
+        'report_template_id': lambda s, *a, **k: s._get_report_template(*a, **k),
     }
 
 
@@ -232,7 +241,6 @@ class gamification_challenge(osv.Model):
                 vals['user_ids'] = []
             vals['user_ids'] += [(4, user.id) for user in new_group.users]
 
-        print vals.get('state')
         if vals.get('state') == 'inprogress':
 
             if not vals.get('autojoin_group_id'):
@@ -575,17 +583,14 @@ class gamification_challenge(osv.Model):
         """
         if context is None:
             context = {}
-        # template_env = TemplateHelper()
+
         temp_obj = self.pool.get('email.template')
         ctx = context.copy()
         if challenge.visibility_mode == 'ranking':
             lines_boards = self._get_serialized_challenge_lines(cr, uid, challenge, user_id=False, restrict_goal_ids=subset_goal_ids, restrict_top=False, context=context)
 
             ctx.update({'challenge_lines': lines_boards})
-            template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'email_template_goal_progress_group', context)
-            body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
-
-            # body_html = template_env.get_template('group_progress.mako').render({'object': challenge, 'lines_boards': lines_boards, 'uid': uid})
+            body_html = temp_obj.render_template(cr, uid, challenge.report_template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
 
             # send to every follower of the challenge
             self.message_post(cr, uid, challenge.id,
@@ -606,8 +611,8 @@ class gamification_challenge(osv.Model):
                     continue
 
                 ctx.update({'challenge_lines': goals})
-                template_id = self.pool.get('ir.model.data').get_object(cr, uid, 'gamification', 'email_template_goal_progress_perso', context)
-                body_html = temp_obj.render_template(cr, user.id, template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
+                body_html = temp_obj.render_template(cr, user.id,  challenge.report_template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
+
                 # send message only to users, not on the challenge
                 self.message_post(cr, uid, 0,
                                   body=body_html,
@@ -640,11 +645,9 @@ class gamification_challenge(osv.Model):
         return self.write(cr, uid, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
 
     def reply_challenge_wizard(self, cr, uid, challenge_id, context=None):
-        mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-        result = mod_obj.get_object_reference(cr, uid, 'gamification', 'challenge_wizard')
+        result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'challenge_wizard')
         id = result and result[1] or False
-        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result = self.pool.get('ir.actions.act_window').read(cr, uid, [id], context=context)[0]
         result['res_id'] = challenge_id
         return result
 
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index b10a756f71c..075afcaccfa 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -35,7 +35,7 @@
                 <form string="Goal definitions" version="7.0">
                     <header>
                         <button string="Refresh Challenge" type="object" name="action_check" states="inprogress"/>
-                        <button string="Report Progress" type="object" name="action_report_progress" states="inprogress,done" groups="base.group_no_one"/>
+                        <button string="Send Report" type="object" name="action_report_progress" states="inprogress,done" groups="base.group_no_one"/>
                         <field name="state" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet>
@@ -101,7 +101,7 @@
                                         <p>Depending on the Display mode, reports will be individual or shared.</p>
                                     </div>
                                     <field name="report_message_frequency" />
-                                    <field name="report_header" placeholder="e.g. The following message contains the current progress of the sale team..." attrs="{'invisible': [('report_message_frequency','=','never')]}" />
+                                    <field name="report_template_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
                                     <field name="report_message_group_id" attrs="{'invisible': [('report_message_frequency','=','never')]}" />
                                 </group>
                                 <group string="Reminders for Manual Goals">
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index b3dc7e37890..b48cc8a3117 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -132,7 +132,6 @@
             <field name="visibility_mode">ranking</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
             <field name="report_message_frequency">weekly</field>
-            <field name="report_header">The following message contains the current progress of the sale team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
         </record>
 
         <record model="gamification.challenge" id="challenge_crm_marketing">
@@ -141,7 +140,6 @@
             <field name="visibility_mode">ranking</field>
             <field name="autojoin_group_id" eval="ref('base.group_sale_salesman')" />
             <field name="report_message_frequency">weekly</field>
-            <field name="report_header">The following message contains the current progress of the marketing team based on several criterias. The progress is reinitialised each month and shared weekly.</field>
         </record>
 
          <!-- lines -->

From ff83d9eb4df60ff0fce9ae540bb88ef29a9f9676 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 15:54:49 +0100
Subject: [PATCH 540/547] [FIX] gamification: remove import data, add
 trackvisibility on challenge instead of sending message

bzr revid: mat@openerp.com-20131224145449-93b3z97lagu12yri
---
 addons/gamification/__init__.py         | 1 -
 addons/gamification/models/challenge.py | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/__init__.py b/addons/gamification/__init__.py
index 5fff27fedfe..21f9c9491ac 100644
--- a/addons/gamification/__init__.py
+++ b/addons/gamification/__init__.py
@@ -21,4 +21,3 @@
 
 import models
 import wizard
-import data
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 12f1b62c6fb..5bbee5bbede 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -124,8 +124,7 @@ class gamification_challenge(osv.Model):
                 ('inprogress', 'In Progress'),
                 ('done', 'Done'),
             ],
-            string='State',
-            required=True),
+            string='State', required=True, track_visibility='onchange'),
         'manager_id': fields.many2one('res.users',
             string='Responsible', help="The user responsible for the challenge."),
 
@@ -250,9 +249,7 @@ class gamification_challenge(osv.Model):
                 for challenge in self.browse(cr, uid, ids, context=context):
                     if challenge.autojoin_group_id:
                         vals['user_ids'] += [(4, user.id) for user in challenge.autojoin_group_id.users]
-                    if challenge.state == 'draft':
-                        # going from draft to inprogress
-                        self.message_post(cr, uid, challenge.id, body="New challenge started.", context=context)
+
             self.generate_goals_from_challenge(cr, uid, ids, context=context)
 
         elif vals.get('state') == 'done':

From 58994713d8ec0b92da02e7d722c8a843a6c21501 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 16:05:49 +0100
Subject: [PATCH 541/547] [FIX] gamification: move template block before
 challenge declaration

bzr revid: mat@openerp.com-20131224150549-uafyr7lyva3u9k8n
---
 addons/gamification/data/goal_base.xml | 187 +++++++++++++------------
 1 file changed, 94 insertions(+), 93 deletions(-)

diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 7c23ae81020..66dd7be7431 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -1,5 +1,99 @@
 <?xml version="1.0"?>
 <openerp>
+    <!-- Mail template is done in a NOUPDATE block
+         so users can freely customize/delete them -->
+    <data noupdate="0">
+        <!--Email template -->
+        
+        <record id="email_template_goal_reminder" model="email.template">
+            <field name="name">Reminder for Goal Update</field>
+            <field name="body_html"><![CDATA[
+    <header>
+        <strong>Reminder ${object.name}</strong>
+    </header>
+    
+    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
+
+    <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
+            ]]></field>
+        </record>
+        
+        <record id="simple_report_template" model="email.template">
+            <field name="name">Simple Challenge Report Progress</field>
+            <field name="body_html"><![CDATA[
+<header>
+    <strong>${object.name}</strong>
+</header>
+<p class="oe_grey">The following message contains the current progress for the challenge ${object.name}</p>
+
+% if object.visibility_mode == 'personal':
+    <table width="100%" border="1">
+    <tr>
+        <th>Goal</th>
+        <th>Target</th>
+        <th>Current</th>
+        <th>Completeness</th>
+    </tr>
+    % for line in ctx["challenge_lines"]:
+        <tr
+            % if line['completeness'] >= 100:
+                style="font-weight:bold;"
+            % endif
+            >
+            <td>${line['name']}</td>
+            <td>${line['target']}
+            % if line['suffix']:
+                ${line['suffix']}
+            % endif
+            </td>
+            <td>${line['current']}
+            % if line['suffix']:
+                ${line['suffix']}
+            % endif
+            </td>
+            <td>${line['completeness']} %</td>
+        </tr>
+    % endfor
+    </table>
+% else:
+    % for line in ctx["challenge_lines"]:
+        <table width="100%" border="1">
+            <tr>
+                <th colspan="4">${line['name']}</th>
+            </tr>
+            <tr>
+                <th>#</th>
+                <th>Person</th>
+                <th>Completeness</th>
+                <th>Current</th>
+            </tr>
+            % for goal in line['goals']:
+                <tr
+                    % if goal.completeness >= 100:
+                        style="font-weight:bold;"
+                    % endif
+                    >
+                    <td>${goal['rank']}</td>
+                    <td>${goal['name']}</td>
+                    <td>${goal['completeness']}%</td>
+                    <td>${goal['current']}/${line['target']}
+                    % if line['suffix']:
+                        ${line['suffix']}
+                    % endif
+                    </td>
+                </tr>
+            % endfor
+        </table>
+
+        <br/><br/>
+
+    % endfor
+% endif
+            ]]></field>
+        </record>
+
+    </data>
+
     <data>
 
         <!-- goal definitions -->
@@ -111,97 +205,4 @@
         </record>
     </data>
 
-    <!-- Mail template is done in a NOUPDATE block
-         so users can freely customize/delete them -->
-    <data noupdate="0">
-        <!--Email template -->
-        
-        <record id="email_template_goal_reminder" model="email.template">
-            <field name="name">Reminder for Goal Update</field>
-            <field name="body_html"><![CDATA[
-    <header>
-        <strong>Reminder ${object.name}</strong>
-    </header>
-    
-    <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
-
-    <p>If you have not changed your score yet, you can use the button "The current value is up to date" to indicate so.</p>
-            ]]></field>
-        </record>
-        
-        <record id="simple_report_template" model="email.template">
-            <field name="name">Simple Challenge Report Progress</field>
-            <field name="body_html"><![CDATA[
-<header>
-    <strong>${object.name}</strong>
-</header>
-<p class="oe_grey">The following message contains the current progress for the challenge ${object.name}</p>
-
-% if object.visibility_mode == 'personal':
-    <table width="100%" border="1">
-    <tr>
-        <th>Goal</th>
-        <th>Target</th>
-        <th>Current</th>
-        <th>Completeness</th>
-    </tr>
-    % for line in ctx["challenge_lines"]:
-        <tr
-            % if line['completeness'] >= 100:
-                style="font-weight:bold;"
-            % endif
-            >
-            <td>${line['name']}</td>
-            <td>${line['target']}
-            % if line['suffix']:
-                ${line['suffix']}
-            % endif
-            </td>
-            <td>${line['current']}
-            % if line['suffix']:
-                ${line['suffix']}
-            % endif
-            </td>
-            <td>${line['completeness']} %</td>
-        </tr>
-    % endfor
-    </table>
-% else:
-    % for line in ctx["challenge_lines"]:
-        <table width="100%" border="1">
-            <tr>
-                <th colspan="4">${line['name']}</th>
-            </tr>
-            <tr>
-                <th>#</th>
-                <th>Person</th>
-                <th>Completeness</th>
-                <th>Current</th>
-            </tr>
-            % for goal in line['goals']:
-                <tr
-                    % if goal.completeness >= 100:
-                        style="font-weight:bold;"
-                    % endif
-                    >
-                    <td>${goal['rank']}</td>
-                    <td>${goal['name']}</td>
-                    <td>${goal['completeness']}%</td>
-                    <td>${goal['current']}/${line['target']}
-                    % if line['suffix']:
-                        ${line['suffix']}
-                    % endif
-                    </td>
-                </tr>
-            % endfor
-        </table>
-
-        <br/><br/>
-
-    % endfor
-% endif
-            ]]></field>
-        </record>
-
-    </data>
 </openerp>

From 13bfaef3a3625deb4ba1d05c50647b6126175c6f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 16:15:43 +0100
Subject: [PATCH 542/547] [FIX] gamification: remove old calls to action_start

bzr revid: mat@openerp.com-20131224151543-oofn9wc2w3933gjy
---
 addons/gamification/models/challenge.py       | 6 +++---
 addons/gamification/tests/test_challenge.py   | 2 +-
 addons/hr_gamification/models/gamification.py | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 5bbee5bbede..ae27aa96719 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -241,7 +241,7 @@ class gamification_challenge(osv.Model):
             vals['user_ids'] += [(4, user.id) for user in new_group.users]
 
         if vals.get('state') == 'inprogress':
-
+            # starting a challenge
             if not vals.get('autojoin_group_id'):
                 # starting challenge, add users in autojoin group
                 if not vals.get('user_ids'):
@@ -284,13 +284,13 @@ class gamification_challenge(osv.Model):
         planned_challenge_ids = self.search(cr, uid, [
             ('state', '=', 'draft'),
             ('start_date', '<=', fields.date.today())])
-        self.action_start(cr, uid, planned_challenge_ids, context=context)
+        self.write(cr, uid, planned_challenge_ids, {'state': 'inprogress'}, context=context)
 
         # close planned challenges
         planned_challenge_ids = self.search(cr, uid, [
             ('state', '=', 'inprogress'),
             ('end_date', '>=', fields.date.today())])
-        self.action_close(cr, uid, planned_challenge_ids, context=context)
+        self.write(cr, uid, planned_challenge_ids, {'state': 'done'}, context=context)
 
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')], context=context)
diff --git a/addons/gamification/tests/test_challenge.py b/addons/gamification/tests/test_challenge.py
index c5dc02ef468..2655a1b26fd 100644
--- a/addons/gamification/tests/test_challenge.py
+++ b/addons/gamification/tests/test_challenge.py
@@ -63,7 +63,7 @@ class test_challenge(common.TransactionCase):
     def test_10_reach_challenge(self):
         cr, uid, context = self.cr, self.uid, {}
         
-        self.challenge_obj.action_start(cr, uid, [self.challenge_base_id], context=context)
+        self.challenge_obj.write(cr, uid, [self.challenge_base_id], {'state': 'inprogress'}, context=context)
         challenge = self.challenge_obj.browse(cr, uid, self.challenge_base_id, context=context)
         challenge_user_ids = [user.id for user in challenge.user_ids]
 
diff --git a/addons/hr_gamification/models/gamification.py b/addons/hr_gamification/models/gamification.py
index f07ed9c95c4..b2aa9039cb1 100644
--- a/addons/hr_gamification/models/gamification.py
+++ b/addons/hr_gamification/models/gamification.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-from openerp import SUPERUSER_ID
 
 
 class hr_gamification_badge_user(osv.Model):

From 90ebde3676b3f4c2a00132313417410ce4ba36b9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 24 Dec 2013 16:29:02 +0100
Subject: [PATCH 543/547] [FIX] gamification: remove old calls to action_close

bzr revid: mat@openerp.com-20131224152902-i2ozrf41y1ou2vdm
---
 addons/gamification/tests/test_challenge.py          | 2 +-
 addons/gamification_sale_crm/sale_crm_goals_demo.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/gamification/tests/test_challenge.py b/addons/gamification/tests/test_challenge.py
index 2655a1b26fd..6b93da727ac 100644
--- a/addons/gamification/tests/test_challenge.py
+++ b/addons/gamification/tests/test_challenge.py
@@ -83,7 +83,7 @@ class test_challenge(common.TransactionCase):
 
         # reward for two firsts as admin may have timezone
         self.challenge_obj.write(cr, uid, self.challenge_base_id, {'reward_first_id': self.badge_id, 'reward_second_id': self.badge_id}, context=context)
-        self.challenge_obj.action_close(cr, uid, self.challenge_base_id, context=context)
+        self.challenge_obj.write(cr, uid, self.challenge_base_id,  {'state': 'done'}, context=context)
 
         badge_ids = self.badge_user_obj.search(cr, uid, [('badge_id', '=', self.badge_id), ('user_id', '=', self.demo_user_id)])
         self.assertGreater(len(badge_ids), 0, "Demo user has not received the badge")
\ No newline at end of file
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index 5f57c7ecd36..fd69c36162f 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -13,8 +13,8 @@
             <field name="definition_id" eval="ref('definition_crm_tot_invoices')" />
             <field name="user_id" eval="ref('base.user_demo')" />
             <field name="line_id" eval="ref('line_crm_sale1')" />
-            <field name="start_date" eval="time.strftime('2013-03-01')" />
-            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="start_date" eval="time.strftime('%Y-%m-01')" />
+            <field name="end_date" eval="time.strftime('%Y-%m-31')" />
             <field name="target_goal">2000</field>
             <field name="state">inprogress</field>
         </record>

From 1e3ebc028544f5e5c85191168630b3e11106e286 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 27 Dec 2013 05:26:17 +0000
Subject: [PATCH 544/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131220051750-c2x3cf7wrd35we7a
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052617-sg1lzd37c8fk1pgm
---
 addons/web/i18n/ar.po                |    4 +-
 addons/web/i18n/bg.po                |    4 +-
 addons/web/i18n/bn.po                |    4 +-
 addons/web/i18n/bs.po                |    4 +-
 addons/web/i18n/ca.po                |    4 +-
 addons/web/i18n/cs.po                |    4 +-
 addons/web/i18n/da.po                |    4 +-
 addons/web/i18n/de.po                |    4 +-
 addons/web/i18n/en_AU.po             |    4 +-
 addons/web/i18n/en_GB.po             |    4 +-
 addons/web/i18n/es.po                |    4 +-
 addons/web/i18n/es_CL.po             |    4 +-
 addons/web/i18n/es_CR.po             |    4 +-
 addons/web/i18n/es_DO.po             |    4 +-
 addons/web/i18n/es_EC.po             |    4 +-
 addons/web/i18n/es_MX.po             |    4 +-
 addons/web/i18n/es_PE.po             |    4 +-
 addons/web/i18n/et.po                |    4 +-
 addons/web/i18n/eu.po                |    4 +-
 addons/web/i18n/fa.po                |    4 +-
 addons/web/i18n/fi.po                |    4 +-
 addons/web/i18n/fr.po                |    4 +-
 addons/web/i18n/fr_CA.po             |    4 +-
 addons/web/i18n/gl.po                |    4 +-
 addons/web/i18n/gu.po                |    4 +-
 addons/web/i18n/he.po                | 2601 ++++++++++++++++++++++++++
 addons/web/i18n/hi.po                |    4 +-
 addons/web/i18n/hr.po                |    4 +-
 addons/web/i18n/hu.po                |    4 +-
 addons/web/i18n/id.po                |    4 +-
 addons/web/i18n/it.po                |    4 +-
 addons/web/i18n/ja.po                |    4 +-
 addons/web/i18n/ka.po                |    4 +-
 addons/web/i18n/ko.po                |    4 +-
 addons/web/i18n/lo.po                |    4 +-
 addons/web/i18n/lt.po                |    4 +-
 addons/web/i18n/lv.po                |    4 +-
 addons/web/i18n/mk.po                |    4 +-
 addons/web/i18n/mn.po                |    4 +-
 addons/web/i18n/nb.po                |    4 +-
 addons/web/i18n/nl.po                |    4 +-
 addons/web/i18n/nl_BE.po             |    4 +-
 addons/web/i18n/pl.po                |    4 +-
 addons/web/i18n/pt.po                |    4 +-
 addons/web/i18n/pt_BR.po             |    4 +-
 addons/web/i18n/ro.po                |    4 +-
 addons/web/i18n/ru.po                |    4 +-
 addons/web/i18n/sk.po                |    4 +-
 addons/web/i18n/sl.po                |    4 +-
 addons/web/i18n/sq.po                |    4 +-
 addons/web/i18n/sr@latin.po          |    4 +-
 addons/web/i18n/sv.po                |    4 +-
 addons/web/i18n/th.po                |    4 +-
 addons/web/i18n/tr.po                |    4 +-
 addons/web/i18n/uk.po                |    4 +-
 addons/web/i18n/vi.po                |    4 +-
 addons/web/i18n/zh_CN.po             |    4 +-
 addons/web/i18n/zh_TW.po             |    4 +-
 addons/web_calendar/i18n/ar.po       |    4 +-
 addons/web_calendar/i18n/bg.po       |    4 +-
 addons/web_calendar/i18n/bn.po       |    4 +-
 addons/web_calendar/i18n/bs.po       |    4 +-
 addons/web_calendar/i18n/ca.po       |    4 +-
 addons/web_calendar/i18n/cs.po       |    4 +-
 addons/web_calendar/i18n/da.po       |    4 +-
 addons/web_calendar/i18n/de.po       |    4 +-
 addons/web_calendar/i18n/en_AU.po    |    4 +-
 addons/web_calendar/i18n/en_GB.po    |    4 +-
 addons/web_calendar/i18n/es.po       |    4 +-
 addons/web_calendar/i18n/es_CL.po    |    4 +-
 addons/web_calendar/i18n/es_CR.po    |    4 +-
 addons/web_calendar/i18n/es_DO.po    |    4 +-
 addons/web_calendar/i18n/es_EC.po    |    4 +-
 addons/web_calendar/i18n/es_MX.po    |    4 +-
 addons/web_calendar/i18n/es_PE.po    |    4 +-
 addons/web_calendar/i18n/et.po       |    4 +-
 addons/web_calendar/i18n/eu.po       |    4 +-
 addons/web_calendar/i18n/fa.po       |    4 +-
 addons/web_calendar/i18n/fi.po       |    4 +-
 addons/web_calendar/i18n/fr.po       |    4 +-
 addons/web_calendar/i18n/fr_CA.po    |    4 +-
 addons/web_calendar/i18n/gl.po       |    4 +-
 addons/web_calendar/i18n/gu.po       |    4 +-
 addons/web_calendar/i18n/hr.po       |    4 +-
 addons/web_calendar/i18n/hu.po       |    4 +-
 addons/web_calendar/i18n/id.po       |    4 +-
 addons/web_calendar/i18n/it.po       |    4 +-
 addons/web_calendar/i18n/ja.po       |    4 +-
 addons/web_calendar/i18n/ka.po       |    4 +-
 addons/web_calendar/i18n/ko.po       |    4 +-
 addons/web_calendar/i18n/lt.po       |    4 +-
 addons/web_calendar/i18n/mk.po       |    4 +-
 addons/web_calendar/i18n/mn.po       |    4 +-
 addons/web_calendar/i18n/nb.po       |    4 +-
 addons/web_calendar/i18n/nl.po       |    4 +-
 addons/web_calendar/i18n/nl_BE.po    |    4 +-
 addons/web_calendar/i18n/pl.po       |    4 +-
 addons/web_calendar/i18n/pt.po       |    4 +-
 addons/web_calendar/i18n/pt_BR.po    |    4 +-
 addons/web_calendar/i18n/ro.po       |    4 +-
 addons/web_calendar/i18n/ru.po       |    4 +-
 addons/web_calendar/i18n/sk.po       |    4 +-
 addons/web_calendar/i18n/sl.po       |    4 +-
 addons/web_calendar/i18n/sq.po       |    4 +-
 addons/web_calendar/i18n/sr@latin.po |    4 +-
 addons/web_calendar/i18n/sv.po       |    4 +-
 addons/web_calendar/i18n/th.po       |    4 +-
 addons/web_calendar/i18n/tr.po       |    4 +-
 addons/web_calendar/i18n/uk.po       |    4 +-
 addons/web_calendar/i18n/zh_CN.po    |    4 +-
 addons/web_calendar/i18n/zh_TW.po    |    4 +-
 addons/web_diagram/i18n/ar.po        |    4 +-
 addons/web_diagram/i18n/bg.po        |    4 +-
 addons/web_diagram/i18n/bn.po        |    4 +-
 addons/web_diagram/i18n/bs.po        |    4 +-
 addons/web_diagram/i18n/ca.po        |    4 +-
 addons/web_diagram/i18n/cs.po        |    4 +-
 addons/web_diagram/i18n/da.po        |    4 +-
 addons/web_diagram/i18n/de.po        |    4 +-
 addons/web_diagram/i18n/en_AU.po     |    4 +-
 addons/web_diagram/i18n/en_GB.po     |    4 +-
 addons/web_diagram/i18n/es.po        |    4 +-
 addons/web_diagram/i18n/es_CL.po     |    4 +-
 addons/web_diagram/i18n/es_CR.po     |    4 +-
 addons/web_diagram/i18n/es_DO.po     |    4 +-
 addons/web_diagram/i18n/es_EC.po     |    4 +-
 addons/web_diagram/i18n/es_MX.po     |    4 +-
 addons/web_diagram/i18n/es_PE.po     |    4 +-
 addons/web_diagram/i18n/et.po        |    4 +-
 addons/web_diagram/i18n/fa.po        |    4 +-
 addons/web_diagram/i18n/fi.po        |    4 +-
 addons/web_diagram/i18n/fr.po        |    4 +-
 addons/web_diagram/i18n/gl.po        |    4 +-
 addons/web_diagram/i18n/gu.po        |    4 +-
 addons/web_diagram/i18n/hr.po        |    4 +-
 addons/web_diagram/i18n/hu.po        |    4 +-
 addons/web_diagram/i18n/id.po        |    4 +-
 addons/web_diagram/i18n/it.po        |    4 +-
 addons/web_diagram/i18n/ja.po        |    4 +-
 addons/web_diagram/i18n/ka.po        |    4 +-
 addons/web_diagram/i18n/ko.po        |    4 +-
 addons/web_diagram/i18n/lt.po        |    4 +-
 addons/web_diagram/i18n/mk.po        |    4 +-
 addons/web_diagram/i18n/mn.po        |    4 +-
 addons/web_diagram/i18n/nb.po        |    4 +-
 addons/web_diagram/i18n/nl.po        |    4 +-
 addons/web_diagram/i18n/nl_BE.po     |    4 +-
 addons/web_diagram/i18n/pl.po        |    4 +-
 addons/web_diagram/i18n/pt.po        |    4 +-
 addons/web_diagram/i18n/pt_BR.po     |    4 +-
 addons/web_diagram/i18n/ro.po        |    4 +-
 addons/web_diagram/i18n/ru.po        |    4 +-
 addons/web_diagram/i18n/sl.po        |    4 +-
 addons/web_diagram/i18n/sq.po        |    4 +-
 addons/web_diagram/i18n/sr@latin.po  |    4 +-
 addons/web_diagram/i18n/sv.po        |    4 +-
 addons/web_diagram/i18n/th.po        |    4 +-
 addons/web_diagram/i18n/tr.po        |    4 +-
 addons/web_diagram/i18n/zh_CN.po     |    4 +-
 addons/web_diagram/i18n/zh_TW.po     |    4 +-
 addons/web_gantt/i18n/ar.po          |    4 +-
 addons/web_gantt/i18n/bg.po          |    4 +-
 addons/web_gantt/i18n/bn.po          |    4 +-
 addons/web_gantt/i18n/bs.po          |    4 +-
 addons/web_gantt/i18n/ca.po          |    4 +-
 addons/web_gantt/i18n/cs.po          |    4 +-
 addons/web_gantt/i18n/da.po          |    4 +-
 addons/web_gantt/i18n/de.po          |    4 +-
 addons/web_gantt/i18n/en_AU.po       |    4 +-
 addons/web_gantt/i18n/en_GB.po       |    4 +-
 addons/web_gantt/i18n/es.po          |    4 +-
 addons/web_gantt/i18n/es_CL.po       |    4 +-
 addons/web_gantt/i18n/es_CR.po       |    4 +-
 addons/web_gantt/i18n/es_DO.po       |    4 +-
 addons/web_gantt/i18n/es_EC.po       |    4 +-
 addons/web_gantt/i18n/es_MX.po       |    4 +-
 addons/web_gantt/i18n/et.po          |    4 +-
 addons/web_gantt/i18n/fa.po          |    4 +-
 addons/web_gantt/i18n/fi.po          |    4 +-
 addons/web_gantt/i18n/fr.po          |    4 +-
 addons/web_gantt/i18n/gl.po          |    4 +-
 addons/web_gantt/i18n/gu.po          |    4 +-
 addons/web_gantt/i18n/hr.po          |    4 +-
 addons/web_gantt/i18n/hu.po          |    4 +-
 addons/web_gantt/i18n/it.po          |    4 +-
 addons/web_gantt/i18n/ja.po          |    4 +-
 addons/web_gantt/i18n/ka.po          |    4 +-
 addons/web_gantt/i18n/ko.po          |    4 +-
 addons/web_gantt/i18n/lo.po          |    4 +-
 addons/web_gantt/i18n/lt.po          |    4 +-
 addons/web_gantt/i18n/mk.po          |    4 +-
 addons/web_gantt/i18n/mn.po          |    4 +-
 addons/web_gantt/i18n/nb.po          |    4 +-
 addons/web_gantt/i18n/nl.po          |    4 +-
 addons/web_gantt/i18n/nl_BE.po       |    4 +-
 addons/web_gantt/i18n/pl.po          |    4 +-
 addons/web_gantt/i18n/pt.po          |    4 +-
 addons/web_gantt/i18n/pt_BR.po       |    4 +-
 addons/web_gantt/i18n/ro.po          |    4 +-
 addons/web_gantt/i18n/ru.po          |    4 +-
 addons/web_gantt/i18n/sl.po          |    4 +-
 addons/web_gantt/i18n/sq.po          |    4 +-
 addons/web_gantt/i18n/sr@latin.po    |    4 +-
 addons/web_gantt/i18n/sv.po          |    4 +-
 addons/web_gantt/i18n/th.po          |    4 +-
 addons/web_gantt/i18n/tr.po          |    4 +-
 addons/web_gantt/i18n/zh_CN.po       |    4 +-
 addons/web_graph/i18n/ar.po          |    4 +-
 addons/web_graph/i18n/bg.po          |    4 +-
 addons/web_graph/i18n/bn.po          |    4 +-
 addons/web_graph/i18n/bs.po          |    4 +-
 addons/web_graph/i18n/ca.po          |    4 +-
 addons/web_graph/i18n/cs.po          |    4 +-
 addons/web_graph/i18n/da.po          |    4 +-
 addons/web_graph/i18n/de.po          |    4 +-
 addons/web_graph/i18n/en_AU.po       |    4 +-
 addons/web_graph/i18n/en_GB.po       |    4 +-
 addons/web_graph/i18n/es.po          |    4 +-
 addons/web_graph/i18n/es_CL.po       |    4 +-
 addons/web_graph/i18n/es_CR.po       |    4 +-
 addons/web_graph/i18n/es_DO.po       |    4 +-
 addons/web_graph/i18n/es_EC.po       |    4 +-
 addons/web_graph/i18n/es_MX.po       |    4 +-
 addons/web_graph/i18n/et.po          |    4 +-
 addons/web_graph/i18n/fa.po          |    4 +-
 addons/web_graph/i18n/fi.po          |    4 +-
 addons/web_graph/i18n/fr.po          |    4 +-
 addons/web_graph/i18n/fr_CA.po       |    4 +-
 addons/web_graph/i18n/gl.po          |    4 +-
 addons/web_graph/i18n/gu.po          |    4 +-
 addons/web_graph/i18n/hr.po          |    4 +-
 addons/web_graph/i18n/hu.po          |    4 +-
 addons/web_graph/i18n/it.po          |    4 +-
 addons/web_graph/i18n/ja.po          |    4 +-
 addons/web_graph/i18n/ka.po          |    4 +-
 addons/web_graph/i18n/ko.po          |    4 +-
 addons/web_graph/i18n/lt.po          |    4 +-
 addons/web_graph/i18n/mk.po          |    4 +-
 addons/web_graph/i18n/mn.po          |    4 +-
 addons/web_graph/i18n/nb.po          |    4 +-
 addons/web_graph/i18n/nl.po          |    4 +-
 addons/web_graph/i18n/nl_BE.po       |    4 +-
 addons/web_graph/i18n/pl.po          |    4 +-
 addons/web_graph/i18n/pt.po          |    4 +-
 addons/web_graph/i18n/pt_BR.po       |    4 +-
 addons/web_graph/i18n/ro.po          |    4 +-
 addons/web_graph/i18n/ru.po          |    4 +-
 addons/web_graph/i18n/sl.po          |    4 +-
 addons/web_graph/i18n/sq.po          |    4 +-
 addons/web_graph/i18n/sr@latin.po    |    4 +-
 addons/web_graph/i18n/sv.po          |    4 +-
 addons/web_graph/i18n/th.po          |    4 +-
 addons/web_graph/i18n/tr.po          |    4 +-
 addons/web_graph/i18n/zh_CN.po       |    4 +-
 addons/web_kanban/i18n/ar.po         |    4 +-
 addons/web_kanban/i18n/bg.po         |    4 +-
 addons/web_kanban/i18n/bn.po         |    4 +-
 addons/web_kanban/i18n/bs.po         |    4 +-
 addons/web_kanban/i18n/ca.po         |    4 +-
 addons/web_kanban/i18n/cs.po         |    4 +-
 addons/web_kanban/i18n/da.po         |    4 +-
 addons/web_kanban/i18n/de.po         |    4 +-
 addons/web_kanban/i18n/en_AU.po      |    4 +-
 addons/web_kanban/i18n/en_GB.po      |    4 +-
 addons/web_kanban/i18n/es.po         |    4 +-
 addons/web_kanban/i18n/es_CL.po      |    4 +-
 addons/web_kanban/i18n/es_CR.po      |    4 +-
 addons/web_kanban/i18n/es_DO.po      |    4 +-
 addons/web_kanban/i18n/es_EC.po      |    4 +-
 addons/web_kanban/i18n/es_MX.po      |    4 +-
 addons/web_kanban/i18n/et.po         |    4 +-
 addons/web_kanban/i18n/fa.po         |    4 +-
 addons/web_kanban/i18n/fi.po         |    4 +-
 addons/web_kanban/i18n/fr.po         |    4 +-
 addons/web_kanban/i18n/fr_CA.po      |    4 +-
 addons/web_kanban/i18n/gl.po         |    4 +-
 addons/web_kanban/i18n/gu.po         |    4 +-
 addons/web_kanban/i18n/he.po         |  161 ++
 addons/web_kanban/i18n/hr.po         |    4 +-
 addons/web_kanban/i18n/hu.po         |    4 +-
 addons/web_kanban/i18n/it.po         |    4 +-
 addons/web_kanban/i18n/ja.po         |    4 +-
 addons/web_kanban/i18n/ka.po         |    4 +-
 addons/web_kanban/i18n/ko.po         |    4 +-
 addons/web_kanban/i18n/lt.po         |    4 +-
 addons/web_kanban/i18n/mk.po         |    4 +-
 addons/web_kanban/i18n/mn.po         |    4 +-
 addons/web_kanban/i18n/nb.po         |    4 +-
 addons/web_kanban/i18n/nl.po         |    4 +-
 addons/web_kanban/i18n/nl_BE.po      |    4 +-
 addons/web_kanban/i18n/pl.po         |    4 +-
 addons/web_kanban/i18n/pt.po         |    4 +-
 addons/web_kanban/i18n/pt_BR.po      |    4 +-
 addons/web_kanban/i18n/ro.po         |    4 +-
 addons/web_kanban/i18n/ru.po         |    4 +-
 addons/web_kanban/i18n/sl.po         |    4 +-
 addons/web_kanban/i18n/sr@latin.po   |    4 +-
 addons/web_kanban/i18n/sv.po         |    4 +-
 addons/web_kanban/i18n/th.po         |    4 +-
 addons/web_kanban/i18n/tr.po         |    4 +-
 addons/web_kanban/i18n/zh_CN.po      |    4 +-
 addons/web_kanban/i18n/zh_TW.po      |    4 +-
 addons/web_view_editor/i18n/ar.po    |    4 +-
 addons/web_view_editor/i18n/bs.po    |    4 +-
 addons/web_view_editor/i18n/cs.po    |    4 +-
 addons/web_view_editor/i18n/da.po    |    4 +-
 addons/web_view_editor/i18n/de.po    |    4 +-
 addons/web_view_editor/i18n/en_AU.po |    4 +-
 addons/web_view_editor/i18n/en_GB.po |    4 +-
 addons/web_view_editor/i18n/es.po    |    4 +-
 addons/web_view_editor/i18n/es_DO.po |    4 +-
 addons/web_view_editor/i18n/es_EC.po |    4 +-
 addons/web_view_editor/i18n/es_MX.po |    4 +-
 addons/web_view_editor/i18n/et.po    |    4 +-
 addons/web_view_editor/i18n/fa.po    |    4 +-
 addons/web_view_editor/i18n/fi.po    |    4 +-
 addons/web_view_editor/i18n/fr.po    |    4 +-
 addons/web_view_editor/i18n/hr.po    |    4 +-
 addons/web_view_editor/i18n/hu.po    |    4 +-
 addons/web_view_editor/i18n/it.po    |    4 +-
 addons/web_view_editor/i18n/ko.po    |    4 +-
 addons/web_view_editor/i18n/lt.po    |    4 +-
 addons/web_view_editor/i18n/lv.po    |    4 +-
 addons/web_view_editor/i18n/mk.po    |    4 +-
 addons/web_view_editor/i18n/mn.po    |    4 +-
 addons/web_view_editor/i18n/nb.po    |    4 +-
 addons/web_view_editor/i18n/nl.po    |    4 +-
 addons/web_view_editor/i18n/nl_BE.po |    4 +-
 addons/web_view_editor/i18n/pl.po    |    4 +-
 addons/web_view_editor/i18n/pt.po    |    4 +-
 addons/web_view_editor/i18n/pt_BR.po |    4 +-
 addons/web_view_editor/i18n/ro.po    |    6 +-
 addons/web_view_editor/i18n/ru.po    |    4 +-
 addons/web_view_editor/i18n/sl.po    |    4 +-
 addons/web_view_editor/i18n/sv.po    |    4 +-
 addons/web_view_editor/i18n/th.po    |    4 +-
 addons/web_view_editor/i18n/tr.po    |    4 +-
 addons/web_view_editor/i18n/zh_CN.po |    4 +-
 338 files changed, 3435 insertions(+), 673 deletions(-)
 create mode 100644 addons/web/i18n/he.po
 create mode 100644 addons/web_kanban/i18n/he.po

diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index 4b02c7df5cd..a3fa43b3d3e 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index 9f100abe647..0d7f82cad46 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index f452cd21292..02abf4f1ac1 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index ad62146a1ba..57e16cb201b 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 06e864de39f..04fba15857c 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index 9345d3bb2fe..9bd8a084479 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index beea341961b..6664e994647 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index fe2d207312a..428fa908170 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index aa7de5dbf34..f3f6d7dbca8 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index bc9e4a397c6..879d01f06c5 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index 438cabdb7d0..1193d1e1456 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index 5f59136c3e9..9b1ccd2466c 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index 52efc24959b..a2086fbd145 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: es\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index b5bb05784da..ae3d29542f8 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/i18n/es_DO.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 1a2b6993c2e..3954cc680ad 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index 872c8b3f326..fe120620da1 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/i18n/es_MX.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_PE.po b/addons/web/i18n/es_PE.po
index f0963fc7240..9a7dfcee3ae 100644
--- a/addons/web/i18n/es_PE.po
+++ b/addons/web/i18n/es_PE.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index 59ead40aab5..277234c48dc 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index 90cb551d94d..8b6ec498861 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 61e2d4a918e..5f37f09b769 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 0b0f3bd1575..63ca4f55dab 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index a4b8e238f3c..0f37c38f0b1 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index d773612cdf7..af16404da51 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index a8d027c28da..56608bcb4c7 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 183f4fd8e0d..23f8e1f6369 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/he.po b/addons/web/i18n/he.po
new file mode 100644
index 00000000000..2cf24e81cea
--- /dev/null
+++ b/addons/web/i18n/he.po
@@ -0,0 +1,2601 @@
+# Hebrew translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-26 07:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-27 05:26+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:147
+#, python-format
+msgid "Default language:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:592
+#, python-format
+msgid "%d minutes ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:620
+#, python-format
+msgid "Still loading...<br />Please be patient."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1999
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2061
+#: code:addons/web/static/src/js/search.js:2097
+#: code:addons/web/static/src/js/search.js:2124
+#, python-format
+msgid "less or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:410
+#, python-format
+msgid "Please enter your previous password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:126
+#: code:addons/web/static/src/xml/base.xml:185
+#: code:addons/web/static/src/xml/base.xml:300
+#, python-format
+msgid "Master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:292
+#, python-format
+msgid "Change Master Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:513
+#, python-format
+msgid "Do you really want to delete the database: %s ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1502
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:559
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5220
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:593
+#, python-format
+msgid "about an hour ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:811
+#: code:addons/web/static/src/js/chrome.js:536
+#: code:addons/web/static/src/xml/base.xml:234
+#, python-format
+msgid "Backup Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:518
+#, python-format
+msgid "%(view_type)s view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:49
+#: code:addons/web/static/src/js/dates.js:53
+#, python-format
+msgid "'%s' is not a valid date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1858
+#, python-format
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:591
+#, python-format
+msgid "about a minute ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1306
+#, python-format
+msgid "File"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:869
+#, python-format
+msgid "You cannot leave any password empty."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:732
+#, python-format
+msgid "Invalid username or password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:278
+#, python-format
+msgid "Master Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1245
+#: code:addons/web/static/src/xml/base.xml:1402
+#, python-format
+msgid "Select"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Database restored successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:437
+#, python-format
+msgid "Version"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:592
+#, python-format
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1566
+#, python-format
+msgid "M2O search fields do not currently handle multiple default values"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1241
+#, python-format
+msgid "Widget type '%s' is not implemented"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1626
+#, python-format
+msgid "Share with all users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:77
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "Form"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1352
+#, python-format
+msgid "(no string)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:286
+#, python-format
+msgid "'%s' is not a correct time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1401
+#, python-format
+msgid "not a valid number"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
+#, python-format
+msgid "New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
+#, python-format
+msgid "Attachment :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1712
+#, python-format
+msgid "Fields to export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1350
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "File Upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:597
+#, python-format
+msgid "about a month ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1618
+#, python-format
+msgid "Custom Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1364
+#, python-format
+msgid "Button Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:441
+#, python-format
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1663
+#, python-format
+msgid "Custom Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:177
+#, python-format
+msgid "Duplicate Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:832
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:869
+#: code:addons/web/controllers/main.py:871
+#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:878
+#: code:addons/web/static/src/js/chrome.js:823
+#: code:addons/web/static/src/xml/base.xml:294
+#: code:addons/web/static/src/xml/base.xml:354
+#, python-format
+msgid "Change Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3528
+#, python-format
+msgid "View type '%s' is not supported in One2Many."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5082
+#: code:addons/web/static/src/js/view_list.js:2204
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:270
+#, python-format
+msgid "'%s' is not a correct datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:432
+#, python-format
+msgid "Group"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:949
+#, python-format
+msgid "Unhandled widget"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1004
+#, python-format
+msgid "Selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:881
+#, python-format
+msgid "The following fields are invalid:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:890
+#, python-format
+msgid "Languages"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1298
+#, python-format
+msgid "...Upload in progress..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1789
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:565
+#, python-format
+msgid "Could not restore the database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4982
+#, python-format
+msgid "File upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3925
+#, python-format
+msgid "Action Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:1493
+#, python-format
+msgid "Manage Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2042
+#, python-format
+msgid "contains"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "Take a minute to get a coffee,<br />because it's loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:435
+#, python-format
+msgid "Activate the developer mode"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:341
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1216
+#, python-format
+msgid "GroupBy"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#, python-format
+msgid "You must select at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:557
+#, python-format
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1071
+#, python-format
+msgid "Set Default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1000
+#, python-format
+msgid "Relation:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:590
+#, python-format
+msgid "less than a minute ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:873
+#, python-format
+msgid "Condition:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1709
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:246
+#, python-format
+msgid "'%s' is not a correct float"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Restored"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:409
+#, python-format
+msgid "%d-%d of %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2955
+#, python-format
+msgid "Create and Edit..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:736
+#, python-format
+msgid "Unknown nonliteral type "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2359
+#, python-format
+msgid "Resource error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2144
+#, python-format
+msgid "is not"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:572
+#, python-format
+msgid "Print Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:413
+#, python-format
+msgid "Please confirm your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1825
+#, python-format
+msgid "UTF-8"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "For more information visit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1880
+#, python-format
+msgid "Add All Info..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1701
+#, python-format
+msgid "Export Formats"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:996
+#, python-format
+msgid "On change:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:939
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:906
+#, python-format
+msgid "Setting 'id' attribute on existing record %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:8
+#, python-format
+msgid "List"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2058
+#: code:addons/web/static/src/js/search.js:2094
+#: code:addons/web/static/src/js/search.js:2121
+#, python-format
+msgid "greater than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1492
+#, python-format
+msgid "Save Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1372
+#, python-format
+msgid "Action ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:479
+#, python-format
+msgid "Your user's preference timezone does not match your browser timezone:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1237
+#, python-format
+msgid "Field '%s' specified in view could not be found."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1777
+#, python-format
+msgid "Saved exports:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:338
+#, python-format
+msgid "Old Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:113
+#, python-format
+msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "The database has been duplicated."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1643
+#, python-format
+msgid "Apply"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1414
+#, python-format
+msgid "Save & New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1253
+#, python-format
+msgid "Save As"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
+#, python-format
+msgid "00:00:00"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2330
+#, python-format
+msgid "E-mail error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:595
+#, python-format
+msgid "a day ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1810
+#, python-format
+msgid "Does your file have titles?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:327
+#, python-format
+msgid "Unlimited"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:788
+#, python-format
+msgid ""
+"Warning, the record has been modified, your changes will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#, python-format
+msgid "Search: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:566
+#, python-format
+msgid "Technical translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1818
+#, python-format
+msgid "Delimiter:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:484
+#, python-format
+msgid "Browser's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1623
+#, python-format
+msgid "Filter name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1490
+#, python-format
+msgid "-- Actions --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "OpenERP.com"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "Can't send email to invalid e-mail address"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:658
+#, python-format
+msgid "Add..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:424
+#, python-format
+msgid "Preferences"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:435
+#, python-format
+msgid "Wrong on change format: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:793
+#: code:addons/web/static/src/xml/base.xml:203
+#, python-format
+msgid "Drop Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:488
+#, python-format
+msgid "Click here to change your user's timezone."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:988
+#, python-format
+msgid "Modifiers:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:649
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:796
+#: code:addons/web/static/src/xml/base.xml:837
+#: code:addons/web/static/src/xml/base.xml:1410
+#: code:addons/web/static/src/xml/base.xml:1630
+#, python-format
+msgid "Save"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1074
+#: code:addons/web/static/src/xml/base.xml:370
+#, python-format
+msgid "More"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:73
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "Duplicating database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Password has been changed successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#, python-format
+msgid "Debug View#"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:77
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:199
+#: code:addons/web/static/src/js/view_list.js:346
+#: code:addons/web/static/src/xml/base.xml:1785
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:774
+#, python-format
+msgid ""
+"Local evaluation failure\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:367
+#, python-format
+msgid "Invalid database name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1714
+#, python-format
+msgid "Save fields list"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:5
+#, python-format
+msgid "Start"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:897
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:586
+#, python-format
+msgid "Creation Date:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:878
+#, python-format
+msgid "Error, password not changed !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4981
+#, python-format
+msgid "The selected file exceed the maximum file size of %s."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:635
+#, python-format
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Changed Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3139
+#: code:addons/web/static/src/js/view_form.js:3785
+#: code:addons/web/static/src/js/view_form.js:3906
+#: code:addons/web/static/src/js/view_form.js:4358
+#: code:addons/web/static/src/js/view_form.js:4482
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:327
+#, python-format
+msgid "Backup"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:76
+#: code:addons/web/static/src/js/dates.js:80
+#, python-format
+msgid "'%s' is not a valid time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:278
+#, python-format
+msgid "'%s' is not a correct date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:955
+#, python-format
+msgid "(nolabel)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:596
+#, python-format
+msgid "%d days ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1500
+#, python-format
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1936
+#: code:addons/web/static/src/xml/base.xml:356
+#: code:addons/web/static/src/xml/base.xml:1405
+#: code:addons/web/static/src/xml/base.xml:1881
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:672
+#: code:addons/web/static/src/js/coresetup.js:618
+#: code:addons/web/static/src/xml/base.xml:9
+#, python-format
+msgid "Loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:589
+#, python-format
+msgid "Latest Modification by:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:492
+#, python-format
+msgid "Timezone mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1663
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:427
+#, python-format
+msgid "%d / %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1803
+#, python-format
+msgid "2. Check your file format"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1739
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1796
+#, python-format
+msgid ""
+"Select a .CSV file to import. If you need a sample of file to import,\n"
+"       you should use the export tool with the \"Import Compatible\" option."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:598
+#, python-format
+msgid "%d months ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:205
+#: code:addons/web/static/src/xml/base.xml:326
+#, python-format
+msgid "Drop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1491
+#, python-format
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:871
+#, python-format
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:564
+#: code:addons/web/static/src/xml/base.xml:266
+#, python-format
+msgid "Restore Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:268
+#: code:addons/web/static/src/xml/base.xml:328
+#, python-format
+msgid "Restore"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1695
+#, python-format
+msgid "Export Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:428
+#, python-format
+msgid "Log out"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1192
+#, python-format
+msgid "Group by: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:154
+#, python-format
+msgid "No data provided."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:345
+#: code:addons/web/static/src/xml/base.xml:1683
+#, python-format
+msgid "Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:31
+#, python-format
+msgid "Export To File"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "Don't leave yet,<br />it's still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "Invalid Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:990
+#, python-format
+msgid "Could not find id in dataset"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1728
+#, python-format
+msgid "Remove All"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1368
+#, python-format
+msgid "Method:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1449
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:414
+#, python-format
+msgid "The confirmation does not match the password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:463
+#, python-format
+msgid "Edit Company data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "Save As..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Could not display the selected image."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Database backed up successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1795
+#, python-format
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:184
+#, python-format
+msgid "(%d records)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Change default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2044
+#: code:addons/web/static/src/js/search.js:2056
+#: code:addons/web/static/src/js/search.js:2092
+#: code:addons/web/static/src/js/search.js:2119
+#, python-format
+msgid "is equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1581
+#, python-format
+msgid "Could not serialize XML"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1637
+#, python-format
+msgid "Advanced Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:308
+#, python-format
+msgid "Confirm new master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:624
+#, python-format
+msgid "Maybe you should consider reloading the application by pressing F5..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:17
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:324
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:1404
+#, python-format
+msgid "Create"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2043
+#, python-format
+msgid "doesn't contain"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1806
+#, python-format
+msgid "Import Options"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3023
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:145
+#, python-format
+msgid "Admin password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:30
+#: code:addons/web/static/src/js/view_form.js:1077
+#: code:addons/web/static/src/xml/base.xml:1422
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:622
+#, python-format
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1800
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1879
+#, python-format
+msgid "Advanced"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_tree.js:11
+#, python-format
+msgid "Tree"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:793
+#, python-format
+msgid "Could not drop database !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:231
+#, python-format
+msgid "'%s' is not a correct integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:899
+#, python-format
+msgid "All users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1671
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1546
+#, python-format
+msgid "Node [%s] is not a JSONified XML node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1454
+#, python-format
+msgid "Advanced Search..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "Dropping database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:467
+#, python-format
+msgid "Powered by"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1484
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Yes"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "There was a problem while uploading your file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:580
+#, python-format
+msgid "XML ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:976
+#, python-format
+msgid "Size:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1845
+#, python-format
+msgid "--- Don't Import ---"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1697
+#, python-format
+msgid "Import-Compatible Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:600
+#, python-format
+msgid "%d years ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1050
+#, python-format
+msgid "Unknown m2m command %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1078
+#, python-format
+msgid "Save default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:193
+#: code:addons/web/static/src/xml/base.xml:282
+#, python-format
+msgid "New database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:411
+#, python-format
+msgid "Please enter your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "The field is empty, there's nothing to save !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:567
+#, python-format
+msgid "Manage Views"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1822
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid "Lines to skip"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2945
+#, python-format
+msgid "Create \"<strong>%s</strong>\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:362
+#, python-format
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "This resource is empty"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1710
+#, python-format
+msgid "Available fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1856
+#, python-format
+msgid "The import failed due to:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:886
+#: code:addons/web/static/src/xml/base.xml:561
+#, python-format
+msgid "JS Tests"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1771
+#, python-format
+msgid "Save as:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1024
+#, python-format
+msgid "Filter on: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#: code:addons/web/static/src/js/view_form.js:3878
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:562
+#, python-format
+msgid "View Fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:348
+#, python-format
+msgid "Confirm New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:587
+#, python-format
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:980
+#, python-format
+msgid "Context:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2114
+#: code:addons/web/static/src/js/search.js:2143
+#, python-format
+msgid "is"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:6
+#, python-format
+msgid "Export Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:984
+#, python-format
+msgid "Domain:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:856
+#, python-format
+msgid "Default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:468
+#, python-format
+msgid "OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:8
+#, python-format
+msgid "Stop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:68
+#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:243
+#, python-format
+msgid "Database:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1211
+#: code:addons/web/static/src/xml/base.xml:1268
+#, python-format
+msgid "Uploading ..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1874
+#, python-format
+msgid "Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1165
+#, python-format
+msgid "About"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search Again"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1481
+#, python-format
+msgid "-- Filters --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1698
+#, python-format
+msgid "Export all Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1344
+#, python-format
+msgid ""
+"Grouping on field '%s' is not possible because that field does not appear in "
+"the list view."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:559
+#, python-format
+msgid "Set Defaults"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1688
+#, python-format
+msgid ""
+"This wizard will export all data that matches the current search criteria to "
+"a CSV file.\n"
+"            You can export all data or only the fields that can be "
+"reimported after modification."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "The record could not be found in the database."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1498
+#, python-format
+msgid "Filter Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:968
+#, python-format
+msgid "Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:560
+#, python-format
+msgid "Incorrect super-administrator password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:964
+#, python-format
+msgid "Object:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:309
+#: code:addons/web/static/src/js/chrome.js:343
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:599
+#, python-format
+msgid "about a year ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2045
+#: code:addons/web/static/src/js/search.js:2057
+#: code:addons/web/static/src/js/search.js:2093
+#: code:addons/web/static/src/js/search.js:2120
+#, python-format
+msgid "is not equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5167
+#, python-format
+msgid ""
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:594
+#, python-format
+msgid "%d hours ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4334
+#: code:addons/web/static/src/js/view_form.js:4464
+#, python-format
+msgid "Add: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1879
+#, python-format
+msgid "Quick Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1826
+#, python-format
+msgid "Latin 1"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:277
+#: code:addons/web/static/src/js/chrome.js:286
+#: code:addons/web/static/src/js/chrome.js:466
+#: code:addons/web/static/src/js/chrome.js:847
+#: code:addons/web/static/src/js/view_form.js:575
+#: code:addons/web/static/src/js/view_form.js:1940
+#: code:addons/web/static/src/xml/base.xml:1773
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1237
+#, python-format
+msgid "Uploading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:125
+#, python-format
+msgid "Load Demonstration data:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
+#, python-format
+msgid "Created by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:22
+#: code:addons/web/static/src/js/dates.js:26
+#, python-format
+msgid "'%s' is not a valid datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
+#, python-format
+msgid "File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2059
+#: code:addons/web/static/src/js/search.js:2095
+#: code:addons/web/static/src/js/search.js:2122
+#, python-format
+msgid "less than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
+#, python-format
+msgid "Edit SearchView"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2160
+#, python-format
+msgid "is true"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4030
+#, python-format
+msgid "Add an item"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1621
+#, python-format
+msgid "Save current filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1933
+#, python-format
+msgid "Confirm"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:127
+#, python-format
+msgid "Please enter save field list name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2216
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:325
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1777
+#, python-format
+msgid "Can't convert value %s to context"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:881
+#: code:addons/web/static/src/xml/base.xml:563
+#, python-format
+msgid "Fields View Get"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:163
+#, python-format
+msgid "Confirm password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2060
+#: code:addons/web/static/src/js/search.js:2096
+#: code:addons/web/static/src/js/search.js:2123
+#, python-format
+msgid "greater or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1349
+#, python-format
+msgid "Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:375
+#, python-format
+msgid "Please select fields to export..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:304
+#, python-format
+msgid "New master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2161
+#, python-format
+msgid "is false"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:426
+#, python-format
+msgid "About OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:301
+#, python-format
+msgid "'%s' is not a correct date, datetime nor time"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:1307
+#, python-format
+msgid "No content found for field '%s' on '%s:%s'"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:322
+#, python-format
+msgid "Database Management"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Image"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:81
+#, python-format
+msgid "Manage Databases"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:770
+#, python-format
+msgid "Evaluation Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1387
+#, python-format
+msgid "not a valid integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:355
+#: code:addons/web/static/src/xml/base.xml:798
+#: code:addons/web/static/src/xml/base.xml:838
+#: code:addons/web/static/src/xml/base.xml:1404
+#: code:addons/web/static/src/xml/base.xml:1412
+#: code:addons/web/static/src/xml/base.xml:1648
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1485
+#, python-format
+msgid "No"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:313
+#, python-format
+msgid "'%s' is not convertible to date, datetime nor time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:200
+#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:325
+#, python-format
+msgid "Duplicate"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1419
+#, python-format
+msgid "Discard"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1642
+#, python-format
+msgid "Add a condition"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:619
+#, python-format
+msgid "Still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:884
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3926
+#, python-format
+msgid "The o2m record must be saved before an action can be used"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Backed"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1628
+#, python-format
+msgid "Use by default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1358
+#, python-format
+msgid "%s (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "triggered from search view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1079
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:972
+#, python-format
+msgid "Widget:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:570
+#, python-format
+msgid "Edit Action"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:577
+#, python-format
+msgid "ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:892
+#, python-format
+msgid "Only you"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:571
+#, python-format
+msgid "Edit Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1246
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:914
+#, python-format
+msgid "Technical Translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:960
+#, python-format
+msgid "Field:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:642
+#, python-format
+msgid "Modified by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "The database %s has been dropped"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:482
+#, python-format
+msgid "User's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:301
+#: code:addons/web/static/src/js/chrome.js:1276
+#, python-format
+msgid "Client Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1073
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1359
+#, python-format
+msgid "Special:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:877
+#, python-format
+msgid ""
+"The old password you provided is incorrect, your password was not changed."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:583
+#, python-format
+msgid "Creation User:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:769
+#, python-format
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1413
+#, python-format
+msgid "Save & Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2932
+#, python-format
+msgid "Search More..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:75
+#: code:addons/web/static/src/xml/base.xml:329
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:568
+#: code:addons/web/static/src/xml/base.xml:831
+#: code:addons/web/static/src/xml/base.xml:1206
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1727
+#, python-format
+msgid "Remove"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1090
+#, python-format
+msgid "Select date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1351
+#: code:addons/web/static/src/js/search.js:1369
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1305
+#, python-format
+msgid "Delete this file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:168
+#, python-format
+msgid "Create Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1816
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:616
+#: code:addons/web/static/src/xml/base.xml:1480
+#, python-format
+msgid "Filters"
+msgstr ""
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 34b5b4343f6..b17077a216c 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index 01e8ee28169..c06e4dd5435 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index 5b9ac02314c..e97890fdfcc 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index 2f06a9e9d0e..00ba12afd28 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index 4b8bac4805f..6e809a99398 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 9276441f9d0..53d189a2a22 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index e2b41022aee..88aa26f8318 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index fd1c21c33f0..5e64a936355 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/i18n/ko.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index 3229e2aad5a..99e450e8f71 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 42117299fa5..ed559da95b3 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index 5ed7310251d..061e22710d4 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index fe4914efc8d..c50812fa24b 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index 6a5edd49c6f..15f8af1b52c 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index f360291b0ac..9808df6b1b0 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 2f2d9696900..a594f2276ae 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index 88bc7ab9da1..ac8ba7bcc86 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index ab23b356ff0..3585383b2a5 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index a9a913b1d99..ac55ad8f01e 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index b40f5034008..2df94194e17 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,8 +15,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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index 87efd44df39..b9d85ef0264 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 72fdc2d7492..3bd100427a8 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -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-12-11 05:50+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index ddbd1b7c4c8..34cd8dd5052 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index f5b9e08ec4f..751daebc768 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index 338ade925ff..62a0803d355 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -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-12-11 05:49+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:15+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index d8a1f704679..787328fc05c 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index 78a72ce383a..90dabc1384b 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index 5c42b8337e3..52af95483b2 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/i18n/th.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index c9d0ebb0f57..db9346c4bf1 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index 74a9d66246e..6750f69e88b 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/vi.po b/addons/web/i18n/vi.po
index f657206d97c..42bab03c8ef 100644
--- a/addons/web/i18n/vi.po
+++ b/addons/web/i18n/vi.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:16+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index f09ed9f345b..25f9b8d9d72 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index 8b57b7096e7..075f815bef6 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index 64b6d5a06da..66ac092b21b 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index d3ccf98d9c5..7621106c8e2 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index 6e79b3d2bcd..7a675d6c071 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index ff28d90cb7f..a23a53bd84f 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index d4805c825cc..7d3cc3ffc08 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index f1a3f6194ab..a25e62db1c0 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index aba12af98ab..5dade72fb9c 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 8f7746e40cd..b6743c067ff 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 7f893903e25..6d3ac0314a8 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 2096d663521..5f91d1ddf83 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index 4ad4476bfe8..3bbc7382e4b 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index 531ad26a1bf..399ee0ff25c 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index ba3a4c4ac37..2a1dce14788 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -15,8 +15,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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: es\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index 7bea02e6d8b..d32c74367a9 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/i18n/es_DO.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index f54370ad424..8d90acd20c5 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index 2cace5508c3..c25ea888db3 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/i18n/es_MX.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_PE.po b/addons/web_calendar/i18n/es_PE.po
index df8c8e39661..ee4a059e6cf 100644
--- a/addons/web_calendar/i18n/es_PE.po
+++ b/addons/web_calendar/i18n/es_PE.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index 9e58b26a87d..87612698540 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index c04fc2a3e74..dabcc4b3085 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index 10fd37391e9..cc69182a4b0 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index 8da1b47bb8d..3575ca74824 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index 873d8c45b38..3a3b840ee8e 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 91dbfa60d9c..15828ce3751 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index f44900c864f..7d04b19aaca 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index c3caa9d0427..e237e1be647 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/i18n/gu.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 6fb6589c408..8d4c739d3c2 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index e362827db00..2e9b4f6ebd4 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 22e32889b80..5e78f12b902 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 05bbee67ecf..67b89a244f1 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index b545e61ade4..e85b9dd76bd 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index 10efe78a9f8..70583a9589d 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index 3d5df843da0..6a43d4b2e4f 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/i18n/ko.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index ea4f1d9f6f8..ebbaa2619f3 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 5a7a7a3b9d4..9aa3b5be445 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index d71d7890331..be190717ac8 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index aac77d25321..74fad773359 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 764b919374c..9db51f961c1 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index cd45fe5d4fb..286a1abe3f4 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index ec01ddb3485..9f7cd4ba669 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index 3e150b2ee96..24e8cf307ab 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 15339229a65..519b84d72cd 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index e45f2164733..4bb2e56fe5d 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index f0eeeeabcd4..7f888a20fe9 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index 06b2ec35303..f0a1c1f2814 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index 6689ab52f9a..2d354f2e8b7 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index 45e5255c113..618b63fdbc4 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index c428780739d..764481f83a4 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index fd96be700d3..6782c90723b 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index adc372ee390..7ba129d87e0 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/i18n/th.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index 3175b5a58cb..f5d6a0537d0 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index d568a890220..5ad1377d8b3 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index 04bc77e1495..7270dea0475 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_TW.po b/addons/web_calendar/i18n/zh_TW.po
index 0c22cd81f6f..f299ea1f8aa 100644
--- a/addons/web_calendar/i18n/zh_TW.po
+++ b/addons/web_calendar/i18n/zh_TW.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index 32c61ffd8ad..eea1604df47 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 586d81c0d17..c0d83f123d8 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index a5b0750e74e..205d8e6b5da 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 7e54cf0e318..471f959fa0e 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index 2f904184333..4be7cabe7c2 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 841446b6c17..6eabf8c19ae 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index bdf05a823cc..059b5e41b99 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 145eef649f0..dccdcc5a1ac 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index bb1a0962a23..b4891784bc1 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index 51ee85dd077..3ea701e2530 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index d633e422470..aed4d5740a3 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index ee6ed0089f3..8eb500a1c54 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index 62174cbbc98..5548323470f 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -15,8 +15,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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "Language: es\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index 071028a2e5e..8897c9a490e 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/i18n/es_DO.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index 88bb81dcb98..204f1f6f648 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index 6e5ea70abbc..b9c1c63836f 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/i18n/es_MX.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_PE.po b/addons/web_diagram/i18n/es_PE.po
index 4ea74349b12..5be39f86a1a 100644
--- a/addons/web_diagram/i18n/es_PE.po
+++ b/addons/web_diagram/i18n/es_PE.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index 52734a6ec06..31fe108aa12 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index 9022c91484f..4067c610cac 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index 0e1ada894dd..0238773144d 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index d4a38fc9b08..28e91e9a7dd 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index b36b22cd053..7cc467a9bc2 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 782b9c7aa3c..05115b9073d 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/i18n/gu.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index ce712b54998..082bfcbbd88 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index e2c7b393208..a8c21d4855f 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index f4153d62e8e..a3bee13e75d 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index be10d6d2096..5fe9dd05964 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index 3993812ed4b..4d5e556db45 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 22edb07afec..88986e0351e 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index b982c7cc424..e3ad71e3df8 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/i18n/ko.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 9167ecdfa89..89a673c1975 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index 9410f5afa09..5195cc14c7c 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/i18n/mk.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index 10c5228613e..ee4e7bfe87c 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index e1b54ef27c2..4691b49f1a9 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/i18n/nb.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index 6cc958e8b94..a8db4db73a2 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index ce95d06c380..690c74639ce 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index 6dab2e750c1..f5b983720df 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index 3c29d33bede..40cc030a5fa 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 78fc2336b42..146aea10ebe 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index 17babc3f71f..a58ff2ca76e 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index c6a7cc889a6..f5f54074215 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index 03df40279f7..4a7ab899fb5 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index dfd0382215d..9c9222a6fc6 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index 163583cc456..2cac392ab8d 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 6914e5fd9b3..c8214108952 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index 9af96788ff8..754e79e0cae 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/i18n/th.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index 70c5ee4a437..8f1e11329d6 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index 66baa380b3e..13b306339d4 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index 822deb1ee36..c855f66b534 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index 792e55e2fc8..a0cf1817314 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index d9d33659073..1de783e8a8d 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index 127a7753abb..3d2f117f0a8 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index e5fafa71742..3f0a5a8df25 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index 0b9ebfebe90..b978c942ada 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 5d367f54c84..421c17f27e1 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 7a1fb692c9f..d4cf17c08b5 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index 4d73514e407..91146c39667 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 6e06cda0902..86985dc62f1 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 67002761f5b..23690ac5f17 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index aae86ff3c48..cc685245ce0 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index 48cc161da86..fd4f0a266df 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index 76529104080..1cdad7e59e2 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index 7d4546b9490..d9ab8a82ef0 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/i18n/es_DO.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index 5e58cf275c6..8d3af3b7b72 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index 8a0cad3406e..dd0cf2c59f6 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/i18n/es_MX.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index 00e99b9f607..e92a7e5343f 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index 4ef686a8e01..aa60101eb6c 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index 15e0646c909..af531416ac8 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index 8b0cec9c220..8fabc62a6b2 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index fbdfaf7922b..2374aa77a4d 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index d17d39814ec..0b51d430305 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/i18n/gu.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 9af7920b981..1da5ae222ec 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index 670bc4d018a..1e21b1d8886 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index c08a2bafeb3..7c945ce5222 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index a64064fbcc1..d277f82f20b 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 11c0e77ad8d..a8c1ab4c2a3 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index 3b024f63749..18201f03e2c 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/i18n/ko.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index 1717154dd8d..536a71303f8 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index afa07a7e918..fdb27f717b0 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index 6efe8bb9a73..23bd3fd3c53 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index b16e1898c70..347f41f3d74 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index 293e6e2652a..268edea32b3 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index 374ea7a1f24..bfa13fd5ede 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index 63a33de6898..9e159399958 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index 20525192a0b..2b6f6d3008d 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index c7027054243..3734d4428e1 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index f0cd0ab4abc..c824e4c57df 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,8 +15,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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 14f58b629d0..d0a5748656a 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index 4616df90933..ec9e8c885da 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 28e794b3fa0..e87b191372f 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index 4cb7c74f531..d2d3603e9ca 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index 857710813d7..0f5549a346a 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index 3ee43df573e..1e125f07ffa 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index 8188082f9f0..5383a52d49b 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/i18n/th.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index 4d04f917bca..e0fc834890f 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 81fe30cc118..9988c5cbdd7 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index 9d5e0c4c028..bd3b2f78b76 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index f11efa935fa..a2b715a7c0c 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index 41fa3dcd6d6..8d6bb7c09cb 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index 96a20115f5e..2f4a80c6da0 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index 4b101e0d8b8..993880d62f8 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 246f8604b3e..ae03746878e 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index ed3d8955893..7e8e5f5c728 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index 6c43710fda4..66461688997 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index f6a7fb6e8fb..7dc479a93f9 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index 09df7bf0833..f6815a8232a 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index b8de549db29..27891c57de3 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index 6ba49c059ff..0f8527356f7 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 42d202f69b1..718780daa8e 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index c0873c5fccc..a51acd3abe1 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/i18n/es_DO.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index 5c8f71e6423..9b3098f41c1 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index 2b4a3dc3a65..52c9e6a1c00 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/i18n/es_MX.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index 8e94cd47fd1..2f0a6fed95f 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index bd7acd15a79..a075fb8ebb4 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index 761df8c44d0..1322228ceb6 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 89ddf9a9c0b..9e9b883ac71 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -15,8 +15,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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index b965ead29c1..3000a156583 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/i18n/fr_CA.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index 6e316cd8d91..3e6859147ee 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index 5335cc60833..ed1bb1c9b9c 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/i18n/gu.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index f7a9bd54ad5..61ed56224a1 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index 4f7074378db..7afa14b1d16 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index 1cddbe71a2b..af9d95acde7 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 0b3c18a2797..971dadd350e 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index c0da4e7ef90..d658b718548 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index 35405744173..22c7e09774d 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/i18n/ko.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index a129e5192a2..7c7bf727bc0 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index a041da13792..47856cae56b 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 89d7c80b8ae..fe330dbd1ed 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index 51ecb6b79ba..dc9d17389e8 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/i18n/nb.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index e29616b61bd..1453163606a 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index eb8e17ebb9b..189b2288cd8 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index c8751addf19..5d66c44f7c2 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index 3c518a7e0ea..f429cbb5cc2 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index e7fceb11ac7..b5ff664932b 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 27abda38a76..0a5466aeaa5 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index 2a5e7d0ba1b..7e4dee9a517 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index 9d233442106..1a19c4020ce 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 9724dd3ba5a..3e1d8cedd88 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -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-12-11 05:51+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index eabb79508f2..ebed4dc4d3f 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index 73f0ce4a406..7669afe9304 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index f8d07ccc566..e36e2dab834 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/i18n/th.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index 15e4090c771..f2664ecd661 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index de5983cf1ea..d3b1e324dc2 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index 01da4cb3064..5fec873c724 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index 96bdd8507e9..1fa4fca4440 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 95a26b38ac6..65bedd0710a 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index d7a0b9936b1..208375595a3 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index 442974422a9..26098927dbc 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index 2a07cab9199..4a081704bb6 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index f2611a894d8..79221594f75 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 34a3af3a9eb..b679393b27f 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index ba6e55d98c3..317008ad312 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index bef106f3c78..50942dbef9c 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index b67e1f11ecd..8ca3d789de1 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index a9f903c0aab..76d21254161 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index f6df0567183..4fb46630394 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index bb2b25aff5d..f2f0b477214 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/i18n/es_DO.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 5bd7702248a..25b060e1941 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 70facf54d9b..12ddf65ad0e 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/i18n/es_MX.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index 1bb1e58a408..6be6ff439e2 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index 32322921979..192b3f00769 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index 492f2b86262..87429660cc0 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index 1d0e4016c4f..c49b97886ed 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index 87f32c8a2dc..684f52aabf7 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/i18n/fr_CA.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 1b75b9787a4..5463d2944e2 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index fa62651c982..8ff8efa5e80 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/i18n/gu.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/he.po b/addons/web_kanban/i18n/he.po
new file mode 100644
index 00000000000..11237b47264
--- /dev/null
+++ b/addons/web_kanban/i18n/he.po
@@ -0,0 +1,161 @@
+# Hebrew translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-26 22:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-27 05:26+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:689
+#, python-format
+msgid "Edit column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:418
+#, python-format
+msgid "An error has occured while moving the record to this group."
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:10
+#, python-format
+msgid "Kanban"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:542
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:708
+#, python-format
+msgid "Are you sure to remove this column ?"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:47
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:192
+#, python-format
+msgid "Add column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:1085
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:24
+#, python-format
+msgid "Add a new column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:680
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:45
+#, python-format
+msgid "Fold"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:35
+#, python-format
+msgid "Quick create"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:921
+#, python-format
+msgid "Are you sure you want to delete this record ?"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:680
+#, python-format
+msgid "Unfold"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
+#, python-format
+msgid "Show more... ("
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:99
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
+#, python-format
+msgid "remaining)"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:22
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:40
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:55
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:48
+#, python-format
+msgid "Delete"
+msgstr ""
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index 61d5d349503..ed416fd5657 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index f781e2466f1..1b69f52e129 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index e378d16b373..01e6e4b3540 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 80b5d198867..dc617f8f18e 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index 10a7e403a76..2aa57b9d565 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index 663688a5785..277047d8984 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/i18n/ko.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index 3b725a7a222..3a2047baa32 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index 250c4485ee4..a1c27902069 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/i18n/mk.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index d1b97e8d8ee..32b7e91a54b 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index 180843e873b..993c4b44078 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/i18n/nb.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 135bd8f82f1..b69ff7a2623 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index b1b2bfe2d1f..394dba7654f 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index 9bbf4120580..8611f704ed2 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index 4b6f80cadef..81a206dd845 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index d6e13109f8a..4458ac88a7f 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index 3b70359c1b9..fcc94430ac2 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index 3648cb102d7..ae81a92d12e 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index 30ae1a050c6..f3cca982512 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index edde6644e13..6e6e7ca4f02 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index 9eb6f0cdefc..94e201a2da0 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index 9cc85b633be..dd300338423 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/i18n/th.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index ac65df86dcd..ce902a94e08 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index 6db9b6e727c..47bd92a22e8 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index 79947dea453..04aadf4a1ed 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index 4bd85979646..00e1264d580 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/bs.po b/addons/web_view_editor/i18n/bs.po
index 40f70efa313..3bfebd25883 100644
--- a/addons/web_view_editor/i18n/bs.po
+++ b/addons/web_view_editor/i18n/bs.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index f8187f4aa2c..97f43baeca6 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/da.po b/addons/web_view_editor/i18n/da.po
index 026ba370c47..668be002ece 100644
--- a/addons/web_view_editor/i18n/da.po
+++ b/addons/web_view_editor/i18n/da.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index 798148a97aa..9d1218a5376 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/i18n/de.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index f8b92dcbf05..9e9e6c6f673 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_GB.po b/addons/web_view_editor/i18n/en_GB.po
index a7c13a2c27f..cf7f611fa56 100644
--- a/addons/web_view_editor/i18n/en_GB.po
+++ b/addons/web_view_editor/i18n/en_GB.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index adc6ec89032..ce04bc0c16f 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index 6e63f5ed7ba..d53ffda8aa8 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/i18n/es_DO.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index 45df297354b..b02245b54a5 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index c9915f000be..146882845a1 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/i18n/es_MX.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index 6d4445c1bfb..cc1f7598d7f 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index f3485b19e76..415e0f6bba9 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index 3c07ce6639c..e6714905382 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index 32e17d7343a..6fecd66dd07 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index 893912f7268..dcda73a4374 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 2f70f015bc0..07c32418ba4 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index dfedec61b8a..0434790c1ee 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index dc2cbff18bb..03c98bb5448 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/i18n/ko.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index 2d42ee21b44..c1d2410a6ae 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index 7a3639081bb..96674ce77a1 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/i18n/lv.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index 6e789572add..a323c3ef52e 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/i18n/mk.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index 7965aca7fa9..02280e275a9 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/i18n/mn.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index 9460fd11df6..8ae57428739 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/i18n/nb.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index c2e8ee91ac0..72eb26f4997 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index 889cdfec545..8e52d482b96 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/i18n/nl_BE.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index 1cd18521fb1..89669a363bb 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 7ccee494c4a..7fc99dbf498 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index 388cf952246..0ccd0d208a3 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/i18n/pt_BR.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index 9a4d98fa7fd..345d7ed34ad 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
@@ -136,7 +136,7 @@ msgstr "Vizualizare moștenită"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:65
 #, python-format
 msgid "Remove"
-msgstr "Elimină"
+msgstr "Eliminaţi"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index bde2a51428d..0c8a53c6f11 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index 102cabfb022..02fe113c8b9 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sv.po b/addons/web_view_editor/i18n/sv.po
index f379d784ea1..30ebb831780 100644
--- a/addons/web_view_editor/i18n/sv.po
+++ b/addons/web_view_editor/i18n/sv.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index decbbdc52ac..0f27acfbd9d 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/i18n/th.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index a7137e426ed..a325123abf0 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index 068973cd275..3def07b2121 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.po
@@ -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-12-11 05:52+0000\n"
-"X-Generator: Launchpad (build 16869)\n"
+"X-Launchpad-Export-Date: 2013-12-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
 
 #. module: web_view_editor
 #. openerp-web

From f3737b122cc78c638b26ac701223497a654e4173 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 27 Dec 2013 17:49:11 +0100
Subject: [PATCH 545/547] [IMP] kanban_gauge: allow to set levelcolors in
 widget options instead of taking the default ones

bzr revid: qdp-launchpad@openerp.com-20131227164911-tk7og4pf37jmvj0c
---
 addons/web_kanban_gauge/static/src/js/kanban_gauge.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
index 1707e889687..cf4950ab639 100644
--- a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
+++ b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js
@@ -9,6 +9,7 @@ var _t = instance.web._t,
 
 instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
     className: "oe_gauge",
+
     start: function() {
         var self = this;
         var parent = this.getParent();
@@ -41,7 +42,7 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
             valueFontColor: '#333333',
             labelFontColor: '#000',
             label: label,
-            levelColors: [
+            levelColors: self.options.levelcolors || [
                 "#ff0000",
                 "#f9c802",
                 "#a9d70b"

From 216303c2fa366961b43a416c555b69a0b811c69d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 30 Dec 2013 13:53:07 +0100
Subject: [PATCH 546/547] [FIX] ir_translation: rename method load to
 load_module_terms to avoid name clash with load call from base_import

bzr revid: mat@openerp.com-20131230125307-kald7ir36bvq3o7c
---
 openerp/addons/base/ir/ir_translation.py | 2 +-
 openerp/addons/base/module/module.py     | 2 +-
 openerp/addons/base/tests/test_base.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 2ab93e2b11b..c9eaa1c53e4 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -425,7 +425,7 @@ class ir_translation(osv.osv):
         """
         return ir_translation_import_cursor(cr, uid, self, context=context)
 
-    def load(self, cr, modules, langs, context=None):
+    def load_module_terms(self, cr, modules, langs, context=None):
         context = dict(context or {}) # local copy
         for module_name in modules:
             modpath = openerp.modules.get_module_path(module_name)
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 6279a5fe6ae..d55061c3900 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -759,7 +759,7 @@ class module(osv.osv):
         elif not isinstance(filter_lang, (list, tuple)):
             filter_lang = [filter_lang]
         modules = [m.name for m in self.browse(cr, uid, ids) if m.state == 'installed']
-        self.pool.get('ir.translation').load(cr, modules, filter_lang, context=context)
+        self.pool.get('ir.translation').load_module_terms(cr, modules, filter_lang, context=context)
 
     def check(self, cr, uid, ids, context=None):
         for mod in self.browse(cr, uid, ids, context=context):
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 1ca66f57943..4cc54aeaf9d 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -311,7 +311,7 @@ class test_translation(common.TransactionCase):
         self.res_category = self.registry('res.partner.category')
         self.ir_translation = self.registry('ir.translation')
         cr, uid = self.cr, self.uid
-        self.registry('ir.translation').load(cr, ['base'], ['fr_FR'])
+        self.registry('ir.translation').load_module_terms(cr, ['base'], ['fr_FR'])
         self.cat_id = self.res_category.create(cr, uid, {'name': 'Customers'})
         self.ir_translation.create(cr, uid, {'name': 'res.partner.category,name', 'module':'base', 
             'value': 'Clients', 'res_id': self.cat_id, 'lang':'fr_FR', 'state':'translated', 'type': 'model'})

From 67e479e96e97be4d9aaba21a19ebf43511407ac8 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 31 Dec 2013 04:47:45 +0000
Subject: [PATCH 547/547] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
---
 addons/account_chart/i18n/zh_TW.po         |   10 +-
 addons/account_check_writing/i18n/zh_TW.po |   34 +-
 addons/account_followup/i18n/zh_TW.po      |   40 +-
 addons/account_payment/i18n/zh_TW.po       |   56 +-
 addons/account_voucher/i18n/zh_TW.po       |   88 +-
 addons/auth_crypt/i18n/zh_TW.po            |   45 +-
 addons/auth_signup/i18n/zh_TW.po           |   56 +-
 addons/base_action_rule/i18n/he.po         |  313 ++
 addons/base_setup/i18n/he.po               |  370 +++
 addons/base_setup/i18n/zh_TW.po            |   12 +-
 addons/base_vat/i18n/zh_TW.po              |   25 +-
 addons/board/i18n/he.po                    |  167 ++
 addons/contacts/i18n/he.po                 |   37 +
 addons/crm/i18n/he.po                      | 3014 ++++++++++++++++++++
 addons/crm_helpdesk/i18n/he.po             |  708 +++++
 addons/document/i18n/he.po                 |  758 +++++
 addons/edi/i18n/he.po                      |   87 +
 addons/email_template/i18n/he.po           |  488 ++++
 addons/hr/i18n/he.po                       |  963 +++++++
 addons/hr/i18n/zh_TW.po                    |  124 +-
 addons/hr_expense/i18n/zh_TW.po            |   80 +-
 addons/mail/i18n/he.po                     | 1687 +++++++++++
 addons/marketing/i18n/he.po                |  109 +
 addons/marketing_campaign/i18n/he.po       | 1056 +++++++
 addons/portal/i18n/he.po                   |  497 ++++
 addons/portal_crm/i18n/he.po               |  546 ++++
 addons/portal_project/i18n/he.po           |   33 +
 addons/portal_project_issue/i18n/he.po     |   40 +
 addons/process/i18n/he.po                  |  379 +++
 addons/procurement/i18n/zh_TW.po           | 1005 +++++++
 addons/project/i18n/he.po                  | 2109 ++++++++++++++
 addons/project_issue/i18n/he.po            |  984 +++++++
 addons/resource/i18n/he.po                 |  351 +++
 addons/sale/i18n/he.po                     | 2132 ++++++++++++++
 addons/sale/i18n/zh_TW.po                  |  367 +--
 addons/sale_crm/i18n/he.po                 |  160 ++
 addons/sale_crm/i18n/zh_TW.po              |   26 +-
 addons/sale_margin/i18n/zh_TW.po           |   46 +
 addons/sale_mrp/i18n/zh_TW.po              |   43 +
 addons/sale_order_dates/i18n/zh_TW.po      |   58 +
 addons/share/i18n/he.po                    |  617 ++++
 41 files changed, 19257 insertions(+), 463 deletions(-)
 create mode 100644 addons/base_action_rule/i18n/he.po
 create mode 100644 addons/base_setup/i18n/he.po
 create mode 100644 addons/board/i18n/he.po
 create mode 100644 addons/contacts/i18n/he.po
 create mode 100644 addons/crm/i18n/he.po
 create mode 100644 addons/crm_helpdesk/i18n/he.po
 create mode 100644 addons/document/i18n/he.po
 create mode 100644 addons/edi/i18n/he.po
 create mode 100644 addons/email_template/i18n/he.po
 create mode 100644 addons/hr/i18n/he.po
 create mode 100644 addons/mail/i18n/he.po
 create mode 100644 addons/marketing/i18n/he.po
 create mode 100644 addons/marketing_campaign/i18n/he.po
 create mode 100644 addons/portal/i18n/he.po
 create mode 100644 addons/portal_crm/i18n/he.po
 create mode 100644 addons/portal_project/i18n/he.po
 create mode 100644 addons/portal_project_issue/i18n/he.po
 create mode 100644 addons/process/i18n/he.po
 create mode 100644 addons/procurement/i18n/zh_TW.po
 create mode 100644 addons/project/i18n/he.po
 create mode 100644 addons/project_issue/i18n/he.po
 create mode 100644 addons/resource/i18n/he.po
 create mode 100644 addons/sale/i18n/he.po
 create mode 100644 addons/sale_crm/i18n/he.po
 create mode 100644 addons/sale_margin/i18n/zh_TW.po
 create mode 100644 addons/sale_mrp/i18n/zh_TW.po
 create mode 100644 addons/sale_order_dates/i18n/zh_TW.po
 create mode 100644 addons/share/i18n/he.po

diff --git a/addons/account_chart/i18n/zh_TW.po b/addons/account_chart/i18n/zh_TW.po
index f88ec1074c6..6d8077dbe9e 100644
--- a/addons/account_chart/i18n/zh_TW.po
+++ b/addons/account_chart/i18n/zh_TW.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2012-08-19 10:21+0000\n"
-"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"PO-Revision-Date: 2013-12-29 09:12+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:05+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "移除小的會計科目表"
+msgstr "移除最小的會計科目表"
 
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
diff --git a/addons/account_check_writing/i18n/zh_TW.po b/addons/account_check_writing/i18n/zh_TW.po
index 25e18e7f8f2..541da1a1681 100644
--- a/addons/account_check_writing/i18n/zh_TW.po
+++ b/addons/account_check_writing/i18n/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-08-22 06:48+0000\n"
-"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"PO-Revision-Date: 2013-12-29 09:09+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: Cenoq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:35+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -56,13 +56,13 @@ msgstr "支票位於底部"
 #. module: account_check_writing
 #: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
 msgid "Print Check in Batch"
-msgstr ""
+msgstr "整批列印支票"
 
 #. module: account_check_writing
 #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
 #, python-format
 msgid "One of the printed check already got a number."
-msgstr ""
+msgstr "已列印的支票中有一張已有號碼。"
 
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
@@ -109,7 +109,7 @@ msgstr "原始金額"
 #. module: account_check_writing
 #: field:res.company,check_layout:0
 msgid "Check Layout"
-msgstr ""
+msgstr "支票格式"
 
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
@@ -131,7 +131,7 @@ msgstr "使用套表列印的支票"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
 msgid "Print Check (Bottom)"
-msgstr ""
+msgstr "列印支票（底端）"
 
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
@@ -160,7 +160,7 @@ msgstr "到期日期"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
 msgid "Print Check (Middle)"
-msgstr ""
+msgstr "列印支票（中間）"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
@@ -171,12 +171,12 @@ msgstr "公司"
 #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: account_check_writing
 #: help:account.check.write,check_number:0
 msgid "The number of the next check number to be printed."
-msgstr ""
+msgstr "下一張列印的支票的號碼"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -187,7 +187,7 @@ msgstr "截止餘額"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
 msgid "Print Check (Top)"
-msgstr ""
+msgstr "列印支票（頂端）"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -204,7 +204,7 @@ msgstr "手工憑證"
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
@@ -214,22 +214,22 @@ msgstr "金額大寫"
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_check_write
 msgid "Prin Check in Batch"
-msgstr ""
+msgstr "整批列印支票"
 
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_check_writing
 #: field:account.check.write,check_number:0
 msgid "Next Check Number"
-msgstr ""
+msgstr "下一個支票號碼"
 
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "Check"
-msgstr ""
+msgstr "支票"
 
 #~ msgid ""
 #~ "The check payment form allows you to track the payment you do to your "
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index 26495b60a14..a0faebb475a 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-08-24 12:49+0000\n"
-"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"PO-Revision-Date: 2013-12-24 10:29+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:21+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-25 06:02+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -22,12 +22,12 @@ msgstr ""
 #: model:email.template,subject:account_followup.email_template_account_followup_level1
 #: model:email.template,subject:account_followup.email_template_account_followup_level2
 msgid "${user.company_id.name} Payment Reminder"
-msgstr ""
+msgstr "${user.company_id.name} 提醒付款"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
-msgstr ""
+msgstr "最大後續追蹤層級"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -48,13 +48,13 @@ msgstr ""
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "下個動作日期"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,manual_action:0
 msgid "Manual Action"
-msgstr ""
+msgstr "手動動作"
 
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "⇾ 標為已完成"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
@@ -104,17 +104,17 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-up Steps"
-msgstr ""
+msgstr "後續追蹤步驟"
 
 #. module: account_followup
 #: field:account_followup.print,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "Email內文"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
-msgstr ""
+msgstr "送出後續追蹤"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -133,7 +133,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "沒有負責人"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -209,17 +209,17 @@ msgstr "借方合計"
 #. module: account_followup
 #: field:res.partner,payment_next_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "下個動作"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Partner Name"
-msgstr ""
+msgstr "業務夥伴名稱"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "指定一負責人"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -269,7 +269,7 @@ msgstr "合夥人"
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
 msgid "Only one follow-up per company is allowed"
-msgstr ""
+msgstr "一間公司僅允許一項後續追蹤"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:254
@@ -300,7 +300,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_customer_followup
 msgid "Manual Follow-Ups"
-msgstr ""
+msgstr "手動後續追蹤"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -356,12 +356,12 @@ msgstr "借方"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Follow-up Statistics"
-msgstr ""
+msgstr "後續追蹤統計分析"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Send Overdue Email"
-msgstr ""
+msgstr "送出帳務逾期通知信"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 5c206a238c1..aee33acd84c 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-08-29 15:27+0000\n"
-"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"PO-Revision-Date: 2013-12-29 09:05+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:48+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -106,7 +106,7 @@ msgstr "到期日"
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "_Add to payment order"
-msgstr ""
+msgstr "新增至付款單"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
@@ -127,7 +127,7 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -148,7 +148,7 @@ msgstr "取消"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
 msgid "New Payment Order"
-msgstr ""
+msgstr "新增付款單"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -165,12 +165,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
 msgid "Payment Orders"
-msgstr ""
+msgstr "付款單"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Directly"
-msgstr ""
+msgstr "直接"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -217,7 +217,7 @@ msgstr ""
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import Payment Lines"
-msgstr ""
+msgstr "匯入付款細項"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -256,17 +256,17 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "付款模式的銀行或現金日記帳簿"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr ""
+msgstr "固定日期"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
@@ -282,12 +282,12 @@ msgstr "目的帳號"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "搜尋付款單"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "已建立"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -394,7 +394,7 @@ msgstr "草稿"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -424,7 +424,7 @@ msgstr "付款明細"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "日記簿項目"
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -441,7 +441,7 @@ msgstr "搜尋"
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "負責人"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -456,7 +456,7 @@ msgstr "總計:"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution Date"
-msgstr ""
+msgstr "執行日期"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -501,7 +501,7 @@ msgstr "您的參考"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Payment order"
-msgstr ""
+msgstr "付款單"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -535,7 +535,7 @@ msgstr "取消"
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank Account"
-msgstr ""
+msgstr "目的銀行帳戶"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -548,7 +548,7 @@ msgstr "資訊"
 #: model:ir.model,name:account_payment.model_payment_order
 #: view:payment.order:0
 msgid "Payment Order"
-msgstr ""
+msgstr "付款單"
 
 #. module: account_payment
 #: help:payment.line,amount:0
@@ -573,7 +573,7 @@ msgstr "通訊 2"
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "預定日期"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -584,7 +584,7 @@ msgstr "是否進行付款?"
 #: view:payment.mode:0
 #: field:payment.mode,journal:0
 msgid "Journal"
-msgstr ""
+msgstr "帳簿"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
@@ -612,12 +612,12 @@ msgstr "付款"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "付款單 / 付款"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
-msgstr ""
+msgstr "分錄細項"
 
 #. module: account_payment
 #: help:payment.line,communication:0
@@ -640,7 +640,7 @@ msgstr "銀行帳戶"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr ""
+msgstr "分錄資訊"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
@@ -673,7 +673,7 @@ msgstr ""
 #: view:account.payment.populate.statement:0
 #: view:payment.order.create:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 2c78874dd2b..4e28fedc51b 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-08-28 02:30+0000\n"
-"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"PO-Revision-Date: 2013-12-29 08:26+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:59+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "核銷"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
@@ -63,7 +63,7 @@ msgstr "計算公式 ： 憑證上输入的金额 - 憑證行的金额合計."
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "(更新)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -90,7 +90,7 @@ msgstr "三月"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未讀訊息"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -100,7 +100,7 @@ msgstr "付賬"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "你確定要取消這張收據嗎？"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -121,7 +121,7 @@ msgstr "依發票年份分組"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "業務人員"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -134,7 +134,7 @@ msgstr "換領券統計"
 msgid ""
 "You can not change the journal as you already reconciled some statement "
 "lines!"
-msgstr ""
+msgstr "你已經核銷部分項目，所以無法變更日記帳簿！"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -145,7 +145,7 @@ msgstr "驗證"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr ""
+msgstr "供應商付款"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -207,13 +207,13 @@ msgstr "備註"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "訊息"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipts"
-msgstr ""
+msgstr "採購單據"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -225,7 +225,7 @@ msgstr "會計憑證行"
 #: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -271,7 +271,7 @@ msgstr ""
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "當有新訊息時通知您。"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -294,7 +294,7 @@ msgstr "稅"
 #: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "無效的動作！"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
@@ -326,7 +326,7 @@ msgstr "付款資料"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(更新)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -395,7 +395,7 @@ msgstr "供應商換領券"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "關注者"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -406,7 +406,7 @@ msgstr "借方"
 #: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "無法變更日記帳簿！"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -544,7 +544,7 @@ msgstr ""
 #: field:account.config.settings,expense_currency_exchange_account_id:0
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "匯損科目"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -587,7 +587,7 @@ msgstr "支出明細"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sale voucher"
-msgstr ""
+msgstr "銷售單據"
 
 #. module: account_voucher
 #: help:account.voucher,is_multi_currency:0
@@ -599,7 +599,7 @@ msgstr "此字段由系統內部使用，區分該憑證是否涉及外幣"
 #. module: account_voucher
 #: view:account.invoice:0
 msgid "Register Payment"
-msgstr ""
+msgstr "登記付款紀錄"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -638,17 +638,17 @@ msgstr "應收應付"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Payment"
-msgstr ""
+msgstr "付款單據"
 
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher Status"
-msgstr ""
+msgstr "單據狀態"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "你是否要取消核銷此紀錄？"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -672,7 +672,7 @@ msgstr "核銷付款餘額"
 #: code:addons/account_voucher/account_voucher.py:1067
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "設置錯誤！"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -689,14 +689,14 @@ msgstr "連稅總額"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Purchase Voucher"
-msgstr ""
+msgstr "採購單據"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "Status"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -707,7 +707,7 @@ msgstr "分配"
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -717,7 +717,7 @@ msgstr "八月"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "認可付款"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
@@ -756,12 +756,12 @@ msgstr "已付款"
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipts"
-msgstr ""
+msgstr "銷售收據"
 
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "為關注者"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
@@ -815,7 +815,7 @@ msgstr "預付款?"
 #: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "你要付款的發票已經不再有效。"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -836,12 +836,12 @@ msgstr "公司"
 #. module: account_voucher
 #: field:account.voucher,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: account_voucher
 #: field:account.voucher,active:0
 msgid "Active"
-msgstr ""
+msgstr "啟用"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1074
@@ -854,14 +854,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "客戶付款"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipts Analysis"
-msgstr ""
+msgstr "銷售收據分析"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -956,7 +956,7 @@ msgstr "取消"
 #. module: account_voucher
 #: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
 msgid "Open Invoicing Menu"
-msgstr ""
+msgstr "開啟發票開立選單"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -1044,7 +1044,7 @@ msgstr "五月"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sale Receipt"
-msgstr ""
+msgstr "銷售收據"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1129,7 +1129,7 @@ msgstr "年份"
 #: field:account.config.settings,income_currency_exchange_account_id:0
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Gain Exchange Rate Account"
-msgstr ""
+msgstr "匯益科目"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -1155,7 +1155,7 @@ msgstr "預設類型"
 #. module: account_voucher
 #: help:account.voucher,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "訊息及聯絡紀錄"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
@@ -1194,7 +1194,7 @@ msgstr "會計分錄的生效日期"
 #. module: account_voucher
 #: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
 msgid "Status Change"
-msgstr ""
+msgstr "狀態變更"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
@@ -1241,14 +1241,14 @@ msgstr "未結餘額"
 #. module: account_voucher
 #: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
 msgid "Status <b>changed</b>"
-msgstr ""
+msgstr "狀態<b>已變更</b>"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1106
 #: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid "Insufficient Configuration!"
-msgstr ""
+msgstr "設置不夠完整！"
 
 #. module: account_voucher
 #: help:account.voucher,active:0
diff --git a/addons/auth_crypt/i18n/zh_TW.po b/addons/auth_crypt/i18n/zh_TW.po
index 0c086e1d093..054d69c1311 100644
--- a/addons/auth_crypt/i18n/zh_TW.po
+++ b/addons/auth_crypt/i18n/zh_TW.po
@@ -1,43 +1,28 @@
 # Chinese (Traditional) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-08-19 10:28+0000\n"
-"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-29 17:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "已加密的密碼"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
 msgid "Users"
-msgstr ""
-
-#~ msgid "Base - Password Encryption"
-#~ msgstr "基礎 - 密碼加密"
-
-#, python-format
-#~ msgid "Please specify the password !"
-#~ msgstr "請指定密碼 !"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "您不能同時登入二個使用者!"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "錯誤"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "所選的公司不是使用者被允許的公司。"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
+msgstr "使用者"
diff --git a/addons/auth_signup/i18n/zh_TW.po b/addons/auth_signup/i18n/zh_TW.po
index b16d2be5abf..506ef4fac35 100644
--- a/addons/auth_signup/i18n/zh_TW.po
+++ b/addons/auth_signup/i18n/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-09-19 09:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-12-29 09:17+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-20 05:38+0000\n"
-"X-Generator: Launchpad (build 16765)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -66,19 +66,19 @@ msgstr ""
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.reset_password_email
 msgid "Password reset"
-msgstr ""
+msgstr "密碼重設"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:120
 #, python-format
 msgid "Please enter a password and confirm it."
-msgstr ""
+msgstr "請輸入密碼並確認"
 
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send an email to the user to (re)set their password."
-msgstr ""
+msgstr "寄出密碼重設電子郵件給該使用者"
 
 #. module: auth_signup
 #. openerp-web
@@ -86,23 +86,23 @@ msgstr ""
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
 #, python-format
 msgid "Sign Up"
-msgstr ""
+msgstr "註冊"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "New"
-msgstr ""
+msgstr "新增"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:258
 #, python-format
 msgid "Mail sent to:"
-msgstr ""
+msgstr "信件已寄給："
 
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
-msgstr ""
+msgstr "狀態"
 
 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.reset_password_email
@@ -122,29 +122,29 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:114
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "請輸入名字"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "使用者"
 
 #. module: auth_signup
 #: field:res.partner,signup_url:0
 msgid "Signup URL"
-msgstr ""
+msgstr "註冊網址"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:117
 #, python-format
 msgid "Please enter a username."
-msgstr ""
+msgstr "請輸入使用者名稱。"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
-msgstr ""
+msgstr "啟用"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:270
@@ -159,26 +159,26 @@ msgstr ""
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "使用者名稱"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "名稱"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "請輸入使用者名稱或電子郵件地址"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Resetting Password"
-msgstr ""
+msgstr "重設密碼中"
 
 #. module: auth_signup
 #. openerp-web
@@ -202,7 +202,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
 #, python-format
 msgid "Log in"
-msgstr ""
+msgstr "登入"
 
 #. module: auth_signup
 #: field:res.partner,signup_valid:0
@@ -220,7 +220,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "登入"
 
 #. module: auth_signup
 #. openerp-web
@@ -242,36 +242,36 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "未選定資料庫！"
 
 #. module: auth_signup
 #: view:res.users:0
 msgid "Reset Password"
-msgstr ""
+msgstr "重設密碼"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
 msgid "Enable password reset from Login page"
-msgstr ""
+msgstr "於登入頁面啟用密碼重設"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
 #, python-format
 msgid "Back to Login"
-msgstr ""
+msgstr "返回登入畫面"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Sign up"
-msgstr ""
+msgstr "註冊"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "業務夥伴"
 
 #. module: auth_signup
 #: field:res.partner,signup_token:0
diff --git a/addons/base_action_rule/i18n/he.po b/addons/base_action_rule/i18n/he.po
new file mode 100644
index 00000000000..49d917c2665
--- /dev/null
+++ b/addons/base_action_rule/i18n/he.po
@@ -0,0 +1,313 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"- In this same \"Search\" view, select the menu \"Save Current Filter\", "
+"enter the name (Ex: Create the 01/01/2012) and add the option \"Share with "
+"all users\""
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay after the trigger date.You can put a negative number if you need a "
+"delay before thetrigger date, like sending a reminder 15 minutes before a "
+"meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,state:0
+msgid "Status"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Action Rule"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_id:0
+msgid ""
+"If present, this condition must be satisfied after the update of the record."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "The filter must therefore be available in this page."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"An action rule is checked when you create or modify the \"Related Document "
+"Model\". The precondition filter is checked right before the modification "
+"while the postcondition filter is checked after the modification. A "
+"precondition filter will therefore not work during a creation."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Filter Condition"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"- Go to your \"Related Document Model\" page and set the filter parameters "
+"in the \"Search\" view (Example of filter based on Leads/Opportunities: "
+"Creation Date \"is equal to\" 01/01/2012)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Timer"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server actions to run"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,filter_pre_id:0
+msgid ""
+"If present, this condition must be satisfied before the update of the record."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to setup a new automated action rule. \n"
+"              </p><p>\n"
+"                Use automated actions to automatically trigger actions for\n"
+"                various screens. Example: a lead created by a specific user "
+"may\n"
+"                be automatically set to a specific sales team, or an\n"
+"                opportunity which still has status pending after 14 days "
+"might\n"
+"                trigger an automatic reminder email.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_id:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
+msgid "Server Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/base_setup/i18n/he.po b/addons/base_setup/i18n/he.po
new file mode 100644
index 00000000000..4c4b3037c71
--- /dev/null
+++ b/addons/base_setup/i18n/he.po
@@ -0,0 +1,370 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid "Emails Integration"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid ""
+"OpenERP allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with OpenERP\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"OpenERP using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
+
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "Portal access"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "Authentication"
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid "Quotations and Sales Orders"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "Email"
+msgstr ""
+
+#. module: base_setup
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid "On Mail Client"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
+msgstr ""
+
+#. module: base_setup
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr ""
+
+#. module: base_setup
+#: field:sale.config.settings,module_plugin_thunderbird:0
+msgid "Enable Thunderbird plug-in"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid "Customer Features"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "Import / Export"
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid "Sale Features"
+msgstr ""
+
+#. module: base_setup
+#: field:sale.config.settings,module_plugin_outlook:0
+msgid "Enable Outlook plug-in"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr ""
+
+#. module: base_setup
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
+
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"                This installs the module multi_company."
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"The public portal is accessible only if you are in a single database mode. "
+"You can\n"
+"                                    launch the OpenERP Server with the option"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
+
+#. module: base_setup
+#: help:base.config.settings,module_portal_anonymous:0
+msgid "Enable the public part of openerp, openerp becomes a public website."
+msgstr ""
+
+#. module: base_setup
+#: help:sale.config.settings,module_plugin_thunderbird:0
+msgid ""
+"The plugin allows you archive email and its attachments to the selected\n"
+"                OpenERP objects. You can select a partner, or a lead and\n"
+"                attach the selected mail as a .eml file in\n"
+"                the attachment of a selected record. You can create "
+"documents for CRM Lead,\n"
+"                Partner from the selected emails.\n"
+"                This installs the module plugin_thunderbird."
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:0
+msgid "Configure Sales"
+msgstr ""
+
+#. module: base_setup
+#: help:sale.config.settings,module_plugin_outlook:0
+msgid ""
+"The Outlook plugin allows you to select an object that you would like to "
+"add\n"
+"                to your email and its attachments from MS Outlook. You can "
+"select a partner,\n"
+"                or a lead object and archive a selected\n"
+"                email into an OpenERP mail message with attachments.\n"
+"                This installs the module plugin_outlook."
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "Options"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid ""
+"to do so.\n"
+"                                    Once activated, the login page will be "
+"replaced by the public website."
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
+msgid "Activate the public portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "Configure outgoing email servers"
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:0
+msgid "Social Network Integration"
+msgstr ""
+
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+#: view:sale.config.settings:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+#: view:sale.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+#: view:sale.config.settings:0
+msgid "or"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "Configure your company data"
+msgstr ""
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index 929f62ca24d..634a16c7697 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:53+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2013-12-29 15:39+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:22+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -189,7 +189,7 @@ msgstr "客戶"
 msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+msgstr "當建立新的聯絡人時（個人或公司），你就可以從 LinkedIn 載入所有資料（照片、地址等）。"
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -212,7 +212,7 @@ msgstr ""
 msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
-msgstr ""
+msgstr "您可在貴公司的詳細資訊中找到更多選項，如表頭和頁尾的地址、付款過期通知等等。"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index 070658c056d..545b8be9e90 100644
--- a/addons/base_vat/i18n/zh_TW.po
+++ b/addons/base_vat/i18n/zh_TW.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2013-12-27 04:38+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:19+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-28 05:19+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "Check Validity"
-msgstr ""
+msgstr "檢查有效性"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:152
@@ -28,11 +28,13 @@ msgid ""
 "This VAT number does not seem to be valid.\n"
 "Note: the expected format is %s"
 msgstr ""
+"這個統編似乎是無效的。\n"
+"提醒：格式應為 %s"
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
 msgid "VIES VAT Check"
-msgstr ""
+msgstr "VIES 統編（VAT）檢查"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_company
@@ -43,7 +45,7 @@ msgstr "公司"
 #: code:addons/base_vat/base_vat.py:113
 #, python-format
 msgid "Error!"
-msgstr "錯誤!"
+msgstr "錯誤！"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -51,20 +53,23 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement.\r\n"
+"如果該業務夥伴需申報（加值型）營業稅，則勾選此框。這會用在營業稅相關的稅務報告。"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr "夥伴"
+msgstr "業務夥伴"
 
 #. module: base_vat
 #: help:res.company,vat_check_vies:0
 msgid ""
 "If checked, Partners VAT numbers will be fully validated against EU's VIES "
 "service rather than via a simple format validation (checksum)."
-msgstr ""
+msgstr "如果勾選此框，則業務夥伴的統編會以歐盟的 VIES 做完整檢查，否則僅會作基本格式檢查（checksum檢查）。"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr ""
+msgstr "營業稅報告"
diff --git a/addons/board/i18n/he.po b/addons/board/i18n/he.po
new file mode 100644
index 00000000000..d6a4466de8d
--- /dev/null
+++ b/addons/board/i18n/he.po
@@ -0,0 +1,167 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_create
+#: model:ir.ui.menu,name:board.menu_board_create
+msgid "Create Board"
+msgstr ""
+
+#. module: board
+#: view:board.create:0
+msgid "Create"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:4
+#, python-format
+msgid "Reset Layout.."
+msgstr ""
+
+#. module: board
+#: view:board.create:0
+msgid "Create New Dashboard"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:40
+#, python-format
+msgid "Choose dashboard layout"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:70
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/js/dashboard.js:139
+#, python-format
+msgid "Are you sure you want to remove this item ?"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_my_dash_action
+#: model:ir.ui.menu,name:board.menu_board_my_dash
+msgid "My Dashboard"
+msgstr ""
+
+#. module: board
+#: field:board.create,name:0
+msgid "Board Name"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_create
+msgid "Board Creation"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:67
+#, python-format
+msgid "Add to Dashboard"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:28
+#, python-format
+msgid "&nbsp;"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,help:board.open_board_my_dash_action
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Your personal dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:6
+#, python-format
+msgid "Reset"
+msgstr ""
+
+#. module: board
+#: field:board.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:8
+#, python-format
+msgid "Change Layout.."
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/js/dashboard.js:93
+#, python-format
+msgid "Edit Layout"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:10
+#, python-format
+msgid "Change Layout"
+msgstr ""
+
+#. module: board
+#: view:board.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: board
+#: view:board.create:0
+msgid "or"
+msgstr ""
+
+#. module: board
+#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:69
+#, python-format
+msgid "Title of new dashboard item"
+msgstr ""
diff --git a/addons/contacts/i18n/he.po b/addons/contacts/i18n/he.po
new file mode 100644
index 00000000000..a1cb06dbc41
--- /dev/null
+++ b/addons/contacts/i18n/he.po
@@ -0,0 +1,37 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr ""
diff --git a/addons/crm/i18n/he.po b/addons/crm/i18n/he.po
new file mode 100644
index 00000000000..1f496821c20
--- /dev/null
+++ b/addons/crm/i18n/he.po
@@ -0,0 +1,3014 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-12-26 23:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-27 05:22+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Leads"
+msgstr ""
+
+#. module: crm
+#: help:sale.config.settings,fetchmail_lead:0
+msgid ""
+"Allows you to configure your incoming mail server, and create leads from "
+"incoming emails."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:898
+#: selection:crm.case.stage,type:0
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,type:0
+#, python-format
+msgid "Lead"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,title:0
+msgid "Title"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid ""
+"Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+"            "
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,action:0
+#: field:crm.phonecall2phonecall,action:0
+msgid "Action"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:res.groups,name:crm.group_fund_raising
+#: field:sale.config.settings,group_fund_raising:0
+msgid "Manage Fund Raising"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: field:crm.phonecall.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,user_id:0
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead_report
+msgid "CRM Lead Analysis"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Company Name"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor6
+msgid "Training"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_lead_categ_action
+#: model:ir.ui.menu,name:crm.menu_crm_lead_categ
+msgid "Sales Tags"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Exp. Closing"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,message_unread:0
+#: help:crm.lead,message_unread:0
+#: help:crm.phonecall,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,creation_day:0
+msgid "Creation day"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
+#. module: crm
+#: view:crm.case.resource.type:0
+#: view:crm.lead:0
+#: field:crm.lead,type_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,type_id:0
+#: model:ir.model,name:crm.model_crm_case_resource_type
+msgid "Campaign"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Opportunities"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,deadline_month:0
+msgid "Expected closing month"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,message_summary:0
+#: help:crm.lead,message_summary:0
+#: help:crm.phonecall,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,partner_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,partner_id:0
+#: field:crm.opportunity2phonecall,partner_id:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,partner_id:0
+#: field:crm.phonecall2phonecall,partner_id:0
+#: model:ir.model,name:crm.model_res_partner
+#: model:process.node,name:crm.process_node_partner0
+msgid "Partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+msgid "Schedule Other Call"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:209
+#: view:crm.phonecall:0
+#, python-format
+msgid "Phone Call"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.server,name:crm.action_email_reminder_lead
+msgid "Reminder to User"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,segmentation_line:0
+msgid "Criteria"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Excluded Answers :"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_lead
+#: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
+msgid "Leads Analysis"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:1010
+#, python-format
+msgid "<b>%s a call</b> for the <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
+#: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
+msgid "Campaigns"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,categ_ids:0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadpartner0
+msgid "Prospect Partner"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:1002
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new customer segmentation.\n"
+"              </p><p>\n"
+"                Create specific categories which you can assign to your\n"
+"                contacts to better manage your interactions with them. The\n"
+"                segmentation tool is able to assign categories to contacts\n"
+"                according to criteria you set.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,contact_name:0
+#: field:crm.phonecall,partner_id:0
+#: field:crm.phonecall2phonecall,contact_name:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,change_responsible:0
+msgid ""
+"When escalating to this team override the salesman with the team leader."
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_opportunitymeeting0
+msgid "Opportunity Meeting"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,delay_close:0
+#: help:crm.phonecall.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_opportunities0
+msgid "When a real project/opportunity is detected"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,opportunity_ids:0
+msgid "Leads and Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.relate_partner_opportunities
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an opportunity related to this customer.\n"
+"              </p><p>\n"
+"                Use opportunities to keep track of your sales pipeline, "
+"follow\n"
+"                up potential sales and better forecast your future "
+"revenues.\n"
+"              </p><p>\n"
+"                You will be able to plan meetings and phone calls from\n"
+"                opportunities, convert them into quotations, attach related\n"
+"                documents, track all discussions, and much more.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead7
+#: view:crm.lead:0
+msgid "Dead"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,message_unread:0
+#: view:crm.lead:0
+#: field:crm.lead,message_unread:0
+#: field:crm.phonecall,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Link to an existing customer"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,user_id:0
+msgid "Team Leader"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,probability:0
+msgid ""
+"This percentage depicts the default/average probability of the Case for this "
+"stage to be a success"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.opportunity2phonecall,categ_id:0
+#: field:crm.phonecall,categ_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,categ_id:0
+#: field:crm.phonecall2phonecall,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "#Opportunities"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:640
+#, python-format
+msgid ""
+"Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads that are assigned to one of the sale teams I manage, or to me"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sales team.\n"
+"              </p><p>\n"
+"                Use sales team to organize your different salespersons or\n"
+"                departments into separate teams. Each team will work in\n"
+"                its own list of opportunities.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_opportunitymeeting0
+msgid "Normal or phone meeting for opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,state:0
+#: field:crm.lead.report,state:0
+#: field:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+msgid "Create Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:sale.config.settings:0
+msgid "Configure"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mailings"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Not Running"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Included Answers :"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,state:0
+msgid ""
+"The status is set to 'Todo', when a case is created.                         "
+"       If the case is in progress the status is set to 'Open'.               "
+"                 When the call is over, the status is set to 'Held'.         "
+"                       If the call needs to be done then the status is set "
+"to 'Not Held'."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,message_summary:0
+#: field:crm.lead,message_summary:0
+#: field:crm.phonecall,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Merge"
+msgstr ""
+
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.categ:0
+msgid "Case Category"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.server,subject:crm.action_email_reminder_lead
+msgid ""
+"Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
+"+object.partner_id.name or '']]"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling Options"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "#Phone calls"
+msgstr ""
+
+#. module: crm
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: crm
+#: selection:crm.case.stage,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a new category.\n"
+"          </p><p>\n"
+"            Create specific phone call categories to better define the type "
+"of\n"
+"            calls tracked in the system.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,reply_to:0
+msgid ""
+"The email address put in the 'Reply-To' of all emails sent by OpenERP about "
+"cases in this sales team"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,creation_month:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+#: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
+msgid "Working Time"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation.line:0
+msgid "Partner Segmentation Lines"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
+#: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
+msgid "Phone Calls Analysis"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Form"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,company_currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,probable_revenue:0
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,creation_month:0
+msgid "Creation month"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,name:0
+msgid "The name of the segmentation."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm
+#: sql_constraint:crm.lead:0
+msgid "The probability of closing the deal should be between 0% and 100%!"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Generation"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Statistics Dashboard"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:878
+#: model:crm.case.stage,name:crm.stage_lead2
+#: selection:crm.case.stage,type:0
+#: view:crm.lead:0
+#: selection:crm.lead,type:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,type:0
+#: field:crm.meeting,opportunity_id:0
+#: field:res.partner,opportunity_count:0
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead7
+msgid "Television"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
+msgid "Convert to opportunities"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Stop Process"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Search Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid ""
+"Leads/Opportunities that are assigned to one of the sale teams I manage"
+msgstr ""
+
+#. module: crm
+#: field:calendar.attendee,categ_id:0
+msgid "Event Type"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,exclusif:0
+msgid "Exclusive"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:600
+#, python-format
+msgid "From %s : %s"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2opportunity.partner.mass:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "or"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,create_date:0
+#: field:crm.phonecall.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,section_ids:0
+msgid ""
+"Link between stages and sales teams. When set, this limitate the current "
+"stage to the selected sales teams."
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0
+#: field:crm.case.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Unassigned Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead2opportunity.partner:0
+#: field:crm.lead2opportunity.partner,opportunity_ids:0
+#: field:crm.lead2opportunity.partner.mass,opportunity_ids:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
+#: model:ir.actions.act_window,name:crm.relate_partner_opportunities
+#: model:ir.ui.menu,name:crm.menu_crm_opportunities
+#: model:process.node,name:crm.process_node_opportunities0
+#: view:res.partner:0
+msgid "Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,categ_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,probability:0
+msgid "Success Rate (%)"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone2
+msgid "Outbound"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Won"
+msgstr ""
+
+#. module: crm
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Lost"
+msgstr ""
+
+#. module: crm
+#: model:ir.filters,name:crm.filter_draft_lead
+msgid "Draft Leads"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Send Email"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,mobile:0
+#: field:crm.phonecall,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid ""
+"Opportunities that are assigned to either me or one of the sale teams I "
+"manage"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,resource_calendar_id:0
+msgid "Used to compute open days"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
+#: model:ir.actions.act_window,name:crm.crm_meeting_partner
+#: view:res.partner:0
+#: field:res.partner,meeting_ids:0
+msgid "Meetings"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:780
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Show only opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "New Leads"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Show Sales Team"
+msgstr ""
+
+#. module: crm
+#: help:sale.config.settings,module_crm_claim:0
+msgid ""
+"Allows you to track your customers/suppliers claims and grievances.\n"
+"                    This installs the module crm_claim."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead6
+#: view:crm.lead:0
+msgid "Won"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.section_sales_department
+msgid "Sales Department"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,type:0
+#: field:crm.lead,type:0
+#: field:crm.lead.report,type:0
+#: view:crm.opportunity2phonecall:0
+msgid "Type"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Compute Segmentation"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,create_date:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,create_date:0
+#: field:crm.phonecall.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:715
+#, python-format
+msgid "Lead <b>converted into an Opportunity</b>"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Purchase Amount"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Year of call"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0
+#: view:crm.lead:0
+#: field:crm.lead,stage_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone Calls that are assigned to me"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls which are in pending state"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,stage_ids:0
+#: view:crm.case.stage:0
+#: model:ir.actions.act_window,name:crm.crm_case_stage_act
+#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm
+#: help:sale.config.settings,module_crm_helpdesk:0
+msgid ""
+"Allows you to communicate with Customer,  process Customer query, and "
+"provide better help and support. This installs the module crm_helpdesk."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Delete"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "í"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a new opportunity.\n"
+"          </p><p>\n"
+"          OpenERP helps you keep track of your sales pipeline to follow\n"
+"          up potential sales and better forecast your future revenues.\n"
+"          </p><p>\n"
+"          You will be able to plan meetings and phone calls from\n"
+"          opportunities, convert them into quotations, attach related\n"
+"          documents, track all discussions, and much more.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,partner_id:0
+msgid "Max Partner ID processed"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,on_change:0
+msgid ""
+"Setting this stage will change the probability automatically on the "
+"opportunity."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "oe_kanban_text_red"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
+msgid "Payment Modes"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,opening_date:0
+#: field:crm.phonecall.report,opening_date:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.channel,name:0
+msgid "Channel Name"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,deadline_day:0
+msgid "Expected closing day"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,case_default:0
+msgid ""
+"If you check this field, this stage will be proposed by default on each "
+"sales team. It will not assign this stage to existing teams."
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,type:0
+msgid ""
+"This field is used to distinguish stages related to Leads from stages "
+"related to Opportunities, or to specify stages available for both types."
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,sales_purchase_active:0
+msgid ""
+"Check if you want to use this tab as part of the segmentation rule. If not "
+"checked, the criteria beneath will be ignored"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,state:0
+msgid "Execution Status"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+msgid "Log call"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:1057
+#: field:crm.case.section,complete_name:0
+#, python-format
+msgid "unknown"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,date:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,date:0
+#: field:crm.phonecall2phonecall,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.crm_case_section_4
+msgid "Online Support"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls which are in closed state"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.crm_case_section_1
+msgid "Sales Marketing Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Date of call"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid ""
+"Phone Calls Assigned to the current user or with a team having the current "
+"user as team leader"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Description"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Lead Description"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:581
+#, python-format
+msgid "Merged opportunities"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor7
+msgid "Consulting"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,code:0
+msgid "Code"
+msgstr ""
+
+#. module: crm
+#: view:sale.config.settings:0
+msgid "Features"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,child_ids:0
+msgid "Child Teams"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls which are in draft and open state"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner.mass,user_ids:0
+msgid "Salesmen"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "References"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2opportunity.partner.mass:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Opportunities Assigned to Me or My Team(s)"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor4
+msgid "Information"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in pending state"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor8
+msgid "Other"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall,opportunity_id:0
+#: model:ir.model,name:crm.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.action_merge_opportunities
+#: model:ir.actions.act_window,name:crm.merge_opportunity_act
+msgid "Merge leads/opportunities"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,sequence:0
+msgid "Used to order stages. Lower is better."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
+msgid "Phonecall Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in open state"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
+#. module: crm
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr ""
+
+#. module: crm
+#: selection:crm.opportunity2phonecall,action:0
+#: selection:crm.phonecall2phonecall,action:0
+msgid "Log a call"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Sale Amount"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
+msgid "Phone calls"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,name:0
+#: field:crm.payment.mode,name:0
+#: field:crm.segmentation,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities that are assigned to me"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,message_ids:0
+#: help:crm.lead,message_ids:0
+#: help:crm.phonecall,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Show Countries"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+msgid "Creation"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_partner0
+msgid "Convert to prospect to business partner"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_payment_mode
+msgid "CRM Payment Mode"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in done state"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Merge Leads/Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,parent_id:0
+msgid "Parent Team"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Do not link to a customer"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,state:0
+msgid ""
+"The status of your document will automatically change regarding the selected "
+"stage. For example, if a stage is related to the status 'Close', when your "
+"document reaches this stage, it is automatically closed."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Assign opportunities to"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone1
+msgid "Inbound"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Month of call"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:290
+#, python-format
+msgid "Partner has been <b>created</b>."
+msgstr ""
+
+#. module: crm
+#: field:sale.config.settings,module_crm_claim:0
+msgid "Manage Customer Claims"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information like "
+"the treatment delays or number of leads per state. You can sort out your "
+"leads analysis by different groups to get accurate grained analysis."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor3
+msgid "Services"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,creation_year:0
+msgid "Creation year"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.lead,description:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_value:0
+msgid "Value"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Display"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadpartner0
+msgid "Prospect is converting to business partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.channel:0
+#: model:ir.actions.act_window,name:crm.crm_case_channel_action
+#: model:ir.model,name:crm.model_crm_case_channel
+#: model:ir.ui.menu,name:crm.menu_crm_case_channel
+msgid "Channels"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+#: selection:crm.phonecall.report,state:0
+msgid "Held"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Fund Raising"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Edit..."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead5
+msgid "Google Adwords"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Select Stages for this Sales Team"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,priority:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,priority:0
+#: field:crm.phonecall,priority:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
+msgid "Lead To Opportunity Partner"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,payment_mode:0
+#: view:crm.payment.mode:0
+#: model:ir.actions.act_window,name:crm.action_crm_payment_mode
+msgid "Payment Mode"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
+msgid "Mass Lead To Opportunity Partner"
+msgstr ""
+
+#. module: crm
+#: view:sale.config.settings:0
+msgid "On Mail Server"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
+#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
+msgid "CRM"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
+#: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
+msgid "Contacts Segmentation"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead1
+msgid "Telesales"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Assigned to Me or My Team(s)"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_segmentation_line
+msgid "Segmentation line"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Expected Revenues"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Referrer"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,type:0
+#: help:crm.lead.report,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Lead / Customer"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.crm_case_section_2
+msgid "Support Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Show only lead"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act
+#: model:ir.model,name:crm.model_crm_case_section
+#: model:ir.ui.menu,name:crm.menu_crm_case_section_act
+msgid "Sales Teams"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Team"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in New state"
+msgstr ""
+
+#. module: crm
+#: selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0
+msgid "Not Held"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
+#: model:ir.ui.menu,name:crm.menu_crm_leads
+#: model:process.node,name:crm.process_node_leads0
+msgid "Leads"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:579
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor5
+msgid "Design"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,name:0
+#: selection:crm.lead2opportunity.partner.mass,name:0
+msgid "Merge with existing opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+#: selection:crm.phonecall.report,state:0
+msgid "Todo"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,note:0
+#: field:crm.phonecall2phonecall,note:0
+msgid "Note"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm
+#: selection:crm.case.stage,state:0
+#: field:crm.lead,date_closed:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: field:crm.phonecall,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Open Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead2
+msgid "Email Campaign - Services"
+msgstr ""
+
+#. module: crm
+#: selection:crm.case.stage,state:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadopportunity0
+msgid "Prospect Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone
+#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
+msgid "Phone Calls"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0
+msgid "Stage Search"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,delay_open:0
+#: help:crm.phonecall.report,delay_open:0
+msgid "Number of Days to open the case"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,phone:0
+#: field:crm.opportunity2phonecall,phone:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,partner_phone:0
+#: field:crm.phonecall2phonecall,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.channel,active:0
+#: field:crm.case.section,active:0
+#: field:crm.lead,active:0
+#: field:crm.phonecall,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Mandatory Expression"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,deadline_day:0
+msgid "Exp. Closing Day"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor2
+msgid "Software"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,change_responsible:0
+msgid "Reassign Escalated"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
+#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
+msgid "Opportunities Analysis"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead.report:0
+#: selection:crm.lead.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,city:0
+msgid "City"
+msgstr ""
+
+#. module: crm
+#: selection:crm.case.stage,type:0
+msgid "Both"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Call Done"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.crm_case_section_3
+msgid "Direct Marketing"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor1
+msgid "Product"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Conversion Options"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid ""
+"Follow this salesteam to automatically track the events associated to users "
+"of this team."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Address"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,alias_id:0
+msgid ""
+"The email address associated with this team. New emails received will "
+"automatically create new leads assigned to the team."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Unassigned Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,delay_open:0
+msgid "Delay to open"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
+msgid "Scheduled Calls"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Test"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Continue Process"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,name:0
+#: selection:crm.lead2opportunity.partner.mass,name:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
+msgid "Convert to opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,user_id:0
+#: field:crm.phonecall2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_last:0
+#: field:crm.phonecall,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall,duration:0
+#: field:crm.phonecall.report,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to schedule a call \n"
+"          </p><p>\n"
+"            OpenERP allows you to easily define all the calls to be done\n"
+"            by your sales team and follow up based on their summary.\n"
+"          </p><p>  \n"
+"            You can use the import feature to massively import a new list "
+"of\n"
+"            prospects to qualify.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,fold:0
+msgid ""
+"This stage is not visible, for example in status bar or kanban view, when "
+"there are no records in that stage to display."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,nbr:0
+#: field:crm.phonecall.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,section_id:0
+msgid "Sales team to which Case belongs to."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead6
+msgid "Banner Ads"
+msgstr ""
+
+#. module: crm
+#: field:crm.merge.opportunity,opportunity_ids:0
+msgid "Leads/Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,company_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,company_id:0
+#: field:crm.phonecall,company_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Unassigned Leads"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,object_id:0
+msgid "Object Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Phone Calls Assigned to Me or My Team(s)"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Reset"
+msgstr ""
+
+#. module: crm
+#: view:sale.config.settings:0
+msgid "After-Sale Services"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,message_ids:0
+#: field:crm.lead,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
+msgstr ""
+
+#. module: crm
+#: selection:crm.case.stage,state:0
+#: selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,state:0
+msgid "Related Status"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall,name:0
+msgid "Call Summary"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
+msgid "Schedule/Log Call"
+msgstr ""
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "Select Leads/Opportunities"
+msgstr ""
+
+#. module: crm
+#: selection:crm.phonecall,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.act_oppor_stage_user
+msgid "Planned Revenue By User and Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Confirm"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Optional Expression"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,message_follower_ids:0
+#: field:crm.lead,message_follower_ids:0
+#: field:crm.phonecall,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create an unqualified lead.\n"
+"          </p><p>\n"
+"            Use leads if you need a qualification step before creating an\n"
+"            opportunity or a customer. It can be a business card you "
+"received,\n"
+"            a contact form filled in your website, or a file of unqualified\n"
+"            prospects you import, etc.\n"
+"          </p><p>\n"
+"            Once qualified, the lead can be converted into a business\n"
+"            opportunity and/or a new customer in your address book.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: crm
+#: field:sale.config.settings,fetchmail_lead:0
+msgid "Create leads from incoming mails"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,email_from:0
+#: field:crm.phonecall,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.channel:0
+#: view:crm.lead:0
+#: field:crm.lead,channel_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Schedule Call"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,exclusif:0
+msgid ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions.                        \n"
+"If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadopportunity0
+msgid "Creating business opportunities from Leads"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead3
+msgid "Email Campaign - Products"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to log the summary of a phone call. \n"
+"          </p><p>\n"
+"            OpenERP allows you to log inbound calls on the fly to track the\n"
+"            history of the communication with a customer or to inform "
+"another\n"
+"            team member.\n"
+"          </p><p>\n"
+"            In order to follow up on the call, you can trigger a request "
+"for\n"
+"            another call, a meeting or an opportunity.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_leads0
+msgid "Very first contact with new prospect"
+msgstr ""
+
+#. module: crm
+#: view:res.partner:0
+msgid "Calls"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,on_change:0
+msgid "Change Probability Automatically"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "My Phone Calls"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+msgid "Qualification"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sales tag.\n"
+"              </p><p>\n"
+"                Create specific tags that fit your company's activities\n"
+"                to better classify and analyse your leads and "
+"opportunities.\n"
+"                Such categories could for instance reflect your product\n"
+"                structure or the different types of sales you do.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,deadline_month:0
+msgid "Exp. Closing Month"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Date of Call"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_opportunity2phonecall
+msgid "Opportunity to Phonecall"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Sales Purchase"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule Meeting"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,deadline_year:0
+msgid "Ex. Closing Year"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.client,name:crm.action_client_crm_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_open:0
+#: field:crm.phonecall,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+#: field:crm.case.section,member_ids:0
+msgid "Team Members"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0
+#: view:crm.phonecall2phonecall:0
+msgid "Schedule/Log a Call"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
+msgid "Logged Calls"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
+msgid "Cases by Sales Team"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.phonecall:0
+#: model:ir.model,name:crm.model_crm_meeting
+#: model:process.node,name:crm.process_node_meeting0
+msgid "Meeting"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Planned Revenue by Stage and User"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0
+#: selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: crm
+#: field:sale.config.settings,module_crm_helpdesk:0
+msgid "Manage Helpdesk and Support"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_open:0
+msgid "Delay to Open"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,user_id:0
+#: field:crm.phonecall.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.act_opportunity_stage
+msgid "Opportunities By Stage"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm
+#: model:process.process,name:crm.process_process_contractprocess0
+msgid "Contract"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead4
+msgid "Twitter Ads"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,creation_day:0
+msgid "Creation Day"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Planned Revenues"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,deadline_year:0
+msgid "Expected closing year"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_stage
+msgid "Stage of case"
+msgstr ""
+
+#. module: crm
+#: selection:crm.opportunity2phonecall,action:0
+#: selection:crm.phonecall2phonecall,action:0
+msgid "Schedule a call"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2phonecall:0
+msgid "Log Call"
+msgstr ""
+
+#. module: crm
+#: help:sale.config.settings,group_fund_raising:0
+msgid "Allows you to trace and manage your activities for fund raising."
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,phonecall_id:0
+#: model:ir.model,name:crm.model_crm_phonecall
+msgid "Phonecall"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls that are assigned to one of the sale teams I manage"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create date"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "at"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead1
+#: selection:crm.case.stage,state:0
+#: view:crm.lead:0
+#: selection:crm.lead,state:0
+#: view:crm.lead.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,function:0
+msgid "Function"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,note:0
+#: field:crm.phonecall,description:0
+#: field:crm.segmentation,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.resource.type,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
+#: field:crm.lead,section_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,section_id:0
+#: field:crm.lead2opportunity.partner.mass,section_id:0
+#: field:crm.opportunity2phonecall,section_id:0
+#: field:crm.payment.mode,section_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,section_id:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall2phonecall,section_id:0
+#: field:res.partner,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_channel_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new channel.\n"
+"              </p><p>\n"
+"                Use channels to track the soure of your leads and "
+"opportunities. Channels\n"
+"                are mostly used in reporting to analyse sales performance\n"
+"                related to marketing efforts.\n"
+"              </p><p>\n"
+"                Some examples of channels: company website, phone call\n"
+"                campaign, reseller, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "New Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,operator:0
+msgid "Mandatory / Optional"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,street:0
+msgid "Street"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Reset to Todo"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,working_hours:0
+msgid "Working Hours"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:986
+#: view:crm.lead:0
+#: field:crm.lead2opportunity.partner,partner_id:0
+#: field:crm.lead2opportunity.partner.mass,partner_id:0
+#: field:crm.partner.binding,partner_id:0
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Schedule a Meeting"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead8
+#: view:crm.lead:0
+msgid "Lost"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
+#, python-format
+msgid "Closed/Cancelled leads cannot be converted into opportunities."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: field:crm.lead,country_id:0
+#: view:crm.lead.report:0
+#: field:crm.lead.report,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2opportunity.partner.mass:0
+#: view:crm.phonecall:0
+msgid "Convert to Opportunity"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.resource.type,name:0
+msgid "Campaign Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall_report
+msgid "Phone calls by user and section"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_name:0
+msgid "Control Variable"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead4
+msgid "Proposition"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+#: field:crm.phonecall.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead8
+msgid "Newsletter"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to set a new stage in your lead/opportunity pipeline.\n"
+"              </p><p>\n"
+"                Stages will allow salespersons to easily track how a "
+"specific\n"
+"                lead or opportunity is positioned in the sales cycle.\n"
+"              </p>\n"
+"            "
+msgstr ""
diff --git a/addons/crm_helpdesk/i18n/he.po b/addons/crm_helpdesk/i18n/he.po
new file mode 100644
index 00000000000..c7bc290288f
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/he.po
@@ -0,0 +1,708 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "Destination email for email gateway"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid ""
+"Helpdesk requests that are assigned to me or to one of the sale teams I "
+"manage"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new request. \n"
+"              </p><p>\n"
+"                Helpdesk and Support allow you to track your interventions.\n"
+"              </p><p>\n"
+"                Use the OpenERP Issues system to manage your support\n"
+"                activities. Issues can be connected to the email gateway: "
+"new\n"
+"                emails may create issues, each of them automatically gets "
+"the\n"
+"                history of the conversation with the customer.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Responsible sales team. Define Responsible user and Email account for mail "
+"gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Company"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                        "
+"          \n"
+"If the case is in progress the status is set to 'Open'.                      "
+"            \n"
+"When the case is over, the status is set to 'Done'.                          "
+"        \n"
+"If the case needs to be reviewed then the status is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Assigned to Me or My Sales Team(s)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/document/i18n/he.po b/addons/document/i18n/he.po
new file mode 100644
index 00000000000..644f64141fd
--- /dev/null
+++ b/addons/document/i18n/he.po
@@ -0,0 +1,758 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:350
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr ""
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Group By..."
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modification"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr ""
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "March"
+msgstr ""
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr ""
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
+msgstr ""
+
+#. module: document
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:340
+#: code:addons/document/document.py:345
+#, python-format
+msgid "Directory name must be unique!"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Filter on my documents"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr ""
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr ""
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr ""
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,help:document.action_document_file_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create a new document. \n"
+"          </p><p>\n"
+"            The Documents repository gives you access to all attachments, "
+"such\n"
+"            as mails, project documents, invoices etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:340
+#: code:addons/document/document.py:345
+#: code:addons/document/document.py:350
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+msgid "File Size"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+msgid "Type"
+msgstr ""
+
+#. module: document
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:310
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and there will be one folder per record of that "
+"resource."
+msgstr ""
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You cannot create recursive directories."
+msgstr ""
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr ""
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "July"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr ""
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:576
+#, python-format
+msgid "Error at doc write!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid ""
+"When executing this wizard, it will configure your directories automatically "
+"according to modules installed."
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Security"
+msgstr ""
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
+#: view:report.document.user:0
+msgid "Files by User"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "on"
+msgstr ""
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "December"
+msgstr ""
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+msgid "Month"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0
+msgid "unknown"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr ""
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Configure Directories"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr ""
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr ""
+
+#. module: document
+#: help:document.directory,ressource_tree:0
+msgid ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
+msgstr ""
+
+#. module: document
+#: help:document.directory,ressource_id:0
+msgid ""
+"Along with Parent Model, this ID attaches this folder to a specific record "
+"of Parent Model."
+msgstr ""
+
+#. module: document
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:6
+#, python-format
+msgid "Attachment(s)"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "August"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr ""
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "June"
+msgstr ""
+
+#. module: document
+#: field:document.directory,group_ids:0
+msgid "Groups"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "November"
+msgstr ""
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Such directories are \"attached\" to the specific model or "
+"record, just like attachments. Don't put a parent directory if you select a "
+"parent model."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "October"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "January"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Document Directory"
+msgstr ""
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachments"
+msgstr ""
+
+#. module: document
+#: field:document.directory,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid ""
+"OpenERP's Document Management System supports mapping virtual folders with "
+"documents. The virtual folder of a document can be used to manage the files "
+"attached to the document, or to print and download any report. This tool "
+"will create directories automatically according to modules installed."
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "September"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: document
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "May"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "Users File"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Directory Configuration"
+msgstr ""
+
+#. module: document
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: document
+#: field:document.directory,name:0
+msgid "Name"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+msgid "April"
+msgstr ""
+
+#. module: document
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+msgid "# of Files"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
+
+#. module: document
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:17
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr ""
+
+#. module: document
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,name:0
+msgid "Year"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_storage
+msgid "Storage Media"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr ""
diff --git a/addons/edi/i18n/he.po b/addons/edi/i18n/he.po
new file mode 100644
index 00000000000..6d66ac0dc1e
--- /dev/null
+++ b/addons/edi/i18n/he.po
@@ -0,0 +1,87 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:60
+#, python-format
+msgid "The document has been successfully imported!"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:65
+#, python-format
+msgid "Sorry, the document could not be imported."
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:71
+#, python-format
+msgid "Document Import Notification"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:130
+#, python-format
+msgid "Missing application."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:131
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:47
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr ""
diff --git a/addons/email_template/i18n/he.po b/addons/email_template/i18n/he.po
new file mode 100644
index 00000000000..2ce04ed39e5
--- /dev/null
+++ b/addons/email_template/i18n/he.po
@@ -0,0 +1,488 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 18:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr ""
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To (Emails)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove context action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:247
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as new template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Value Builder"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display an option on related documents to open a composition wizard with "
+"this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Preview of"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Using sample document"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Remove the contextual action to use this template on related documents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Placeholder Expression"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add context action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_id:0
+#: help:email_template.preview,model_id:0
+msgid "The kind of document with with this template can be used"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_recipients:0
+#: field:email_template.preview,email_recipients:0
+msgid "To (Partners)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addressing"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_recipients:0
+#: help:email_template.preview,email_recipients:0
+msgid ""
+"Comma-separated ids of recipient partners (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:234
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Applies to"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:199
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:234
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Default Value"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Contents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/hr/i18n/he.po b/addons/hr/i18n/he.po
new file mode 100644
index 00000000000..b4f74a25a8d
--- /dev/null
+++ b/addons/hr/i18n/he.po
@@ -0,0 +1,963 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-12-30 19:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_timesheet_sheet:0
+msgid "Allow timesheets validation by managers"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+#: model:ir.ui.menu,name:hr.menu_hr_root
+#: model:ir.ui.menu,name:hr.menu_human_resources_configuration
+msgid "Human Resources"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,image_medium:0
+msgid ""
+"Medium-sized photo of the employee. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved. Use this field in form views "
+"or some kanban views."
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Time Tracking"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.view_department_form_installer
+msgid "Create Your Departments"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_evaluation:0
+msgid "Organize employees periodic evaluation"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
+msgid "Department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work Email"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,image:0
+msgid ""
+"This field holds the image used as photo for the employee, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_holidays:0
+msgid "This installs the module hr_holidays."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr ""
+
+#. module: hr
+#: field:res.users,employee_ids:0
+msgid "Related employees"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error! You cannot create recursive Categories."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_recruitment:0
+msgid "This installs the module hr_recruitment."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Birth"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Employee Tags"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Launch Recruitement"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Leaves"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Married"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Talent Management"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_timesheet_sheet:0
+msgid "This installs the module hr_timesheet_sheet."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Mobile:"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendance"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,image_small:0
+msgid ""
+"Small-sized photo of the employee. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.client,name:hr.action_client_hr_menu
+msgid "Open HR Menu"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_account_analytic_analysis:0
+msgid ""
+"This installs the module account_analytic_analysis, which will install sales "
+"management too."
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "Human Resources Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "Current Number of Employees"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_expense:0
+msgid "Manage employees expenses"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Tel:"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Divorced"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+msgid "Departments"
+msgstr ""
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new job position.\n"
+"              </p><p>\n"
+"                Job Positions are used to define jobs and their "
+"requirements.\n"
+"                You can keep track of the number of employees you have per "
+"job\n"
+"                position and follow the evolution according to what you "
+"planned\n"
+"                for the future.\n"
+"              </p><p>\n"
+"                You can attach a survey to a job position. It will be used "
+"in\n"
+"                the recruitment process to evaluate the applicants for this "
+"job\n"
+"                position.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_evaluation:0
+msgid "This installs the module hr_evaluation."
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_attendance:0
+msgid "This installs the module hr_attendance."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_contract:0
+msgid "This installs the module hr_contract."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Related User"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "or"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Stop Recruitment"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_attendance:0
+msgid "Install attendances feature"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_holidays:0
+msgid "Manage holidays, leaves and allocation requests"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "Status"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_recruitment:0
+msgid "Manage the recruitment process"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Human Resources Management"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Install your country's payroll"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account Number"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a new employee.\n"
+"              </p><p>\n"
+"                With just a quick glance on the OpenERP employee screen, "
+"you\n"
+"                can easily find all the information you need for each "
+"person;\n"
+"                contact data, job position, availability, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "HR Settings"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Citizenship & Other Info"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You cannot create recursive departments."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Public Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,marital:0
+msgid "Marital Status"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a department.\n"
+"              </p><p>\n"
+"                OpenERP's department structure is used to manage all "
+"documents\n"
+"                related to employees by departments: expenses, timesheets,\n"
+"                leaves and holidays, recruitments, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_timesheet:0
+msgid "This installs the module hr_timesheet."
+msgstr ""
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.view_department_form_installer
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new department.\n"
+"              </p><p>\n"
+"                Your departments structure is used to manage all documents\n"
+"                related to employees by departments: expenses and "
+"timesheets,\n"
+"                leaves and holidays, recruitments, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,city:0
+msgid "City"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Work Mobile"
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Recruitement in Progress"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allow invoicing based on timesheets (the sale application will be installed)"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_timesheet:0
+msgid "Manage timesheets"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_payroll_modules
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Single"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Position"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_payroll:0
+msgid "This installs the module hr_payroll."
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_contract:0
+msgid "Record contracts per employee"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Additional Features"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Subordinate Hierarchy"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee,name_related:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee.category,employee_ids:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+msgid "Employees"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
+msgid "Reports"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_payroll:0
+msgid "Manage payroll"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+#: model:ir.actions.act_window,name:hr.action_human_resources_configuration
+msgid "Configure Human Resources"
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "No Recruitment"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,login:0
+msgid "Login"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Total Forecasted Employees"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,state:0
+msgid ""
+"By default 'In position', set it to 'In Recruitment' if recruitment process "
+"is going on for this job position."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_board_hr
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Human Resources dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr ""
+
+#. module: hr
+#: sql_constraint:hr.job:0
+msgid "The name of the job position must be unique per company!"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_expense:0
+msgid "This installs the module hr_expense."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Widower"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Apply"
+msgstr ""
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index e31a3c399fd..00daa2f9477 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 17:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2013-12-27 05:02+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:56+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-28 05:19+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 msgid "Openerp user"
-msgstr ""
+msgstr "Openerp 使用者"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "允許主管批准工時表"
 
 #. module: hr
 #: field:hr.job,requirements:0
@@ -62,7 +62,7 @@ msgstr ""
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Time Tracking"
-msgstr ""
+msgstr "追蹤時間"
 
 #. module: hr
 #: view:hr.employee:0
@@ -73,17 +73,17 @@ msgstr "分組根據..."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "建立您的部門"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "從事此職位的現有員工數量。"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_evaluation:0
 msgid "Organize employees periodic evaluation"
-msgstr ""
+msgstr "安排員工定期考評"
 
 #. module: hr
 #: view:hr.department:0
@@ -98,19 +98,19 @@ msgstr "部門"
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work Email"
-msgstr ""
+msgstr "工作電子郵件"
 
 #. module: hr
 #: help:hr.employee,image:0
 msgid ""
 "This field holds the image used as photo for the employee, limited to "
 "1024x1024px."
-msgstr ""
+msgstr "此欄位存放圖片作為員工照片，限制大小為 1024*1024 像素。"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_holidays:0
 msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "此功能將安裝 hr_holidays 模組。"
 
 #. module: hr
 #: view:hr.job:0
@@ -125,7 +125,7 @@ msgstr "正招聘"
 #. module: hr
 #: field:hr.job,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未讀訊息"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -143,7 +143,7 @@ msgstr ""
 #. module: hr
 #: field:res.users,employee_ids:0
 msgid "Related employees"
-msgstr ""
+msgstr "相關員工"
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -153,28 +153,28 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "此功能將安裝 hr_recruitment 模組。"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Birth"
-msgstr ""
+msgstr "生日"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Employee Tags"
-msgstr ""
+msgstr "員工標籤"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Launch Recruitement"
-msgstr ""
+msgstr "啟動招募"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "將一個使用者帳號連結到一位員工"
 
 #. module: hr
 #: field:hr.department,parent_id:0
@@ -184,7 +184,7 @@ msgstr "上級部門"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "休假"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -194,37 +194,37 @@ msgstr "已婚"
 #. module: hr
 #: field:hr.job,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "訊息"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Talent Management"
-msgstr ""
+msgstr "人才管理"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "This installs the module hr_timesheet_sheet."
-msgstr ""
+msgstr "此功能將安裝 hr_timesheet_sheet 模組。"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Mobile:"
-msgstr ""
+msgstr "行動電話："
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "職位"
 
 #. module: hr
 #: help:hr.job,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "當有新訊息時通知您。"
 
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "顏色索引"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -236,7 +236,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "中等尺寸照片"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -251,7 +251,7 @@ msgstr "女"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "出勤"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -277,7 +277,7 @@ msgstr "辦公室位置"
 #. module: hr
 #: field:hr.job,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "關注者"
 
 #. module: hr
 #: view:hr.employee:0
@@ -307,12 +307,12 @@ msgstr "出生日期"
 #. module: hr
 #: help:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "您期望聘雇的新員工數量。"
 
 #. module: hr
 #: model:ir.actions.client,name:hr.action_client_hr_menu
 msgid "Open HR Menu"
-msgstr ""
+msgstr "開啟人資選單"
 
 #. module: hr
 #: help:hr.job,message_summary:0
@@ -326,12 +326,12 @@ msgstr ""
 msgid ""
 "This installs the module account_analytic_analysis, which will install sales "
 "management too."
-msgstr ""
+msgstr "此功能將安裝 account_analytic_analysis 模組，同時也安裝業務銷售管理模組。"
 
 #. module: hr
 #: view:board.board:0
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "人力資源儀表板"
 
 #. module: hr
 #: view:hr.employee:0
@@ -343,7 +343,7 @@ msgstr "工作"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Current Number of Employees"
-msgstr ""
+msgstr "現有員工數目"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -353,22 +353,22 @@ msgstr "成員"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "組態設定"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "員工表單與架構"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_expense:0
 msgid "Manage employees expenses"
-msgstr ""
+msgstr "管理員工費用報支"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
-msgstr ""
+msgstr "電話："
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -430,7 +430,7 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "此功能將安裝 hr_evaluation 模組。"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -440,12 +440,12 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "此功能將安裝 hr_attendance 模組。"
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "小尺吋照片"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -456,22 +456,22 @@ msgstr "員工分類"
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "標籤"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "此功能將安裝 hr_contract 模組。"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Related User"
-msgstr ""
+msgstr "相關使用者"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -481,12 +481,12 @@ msgstr "分類"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "停止招募"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "安裝出勤管理功能"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -501,7 +501,7 @@ msgstr "備註"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr ""
+msgstr "員工架構"
 
 #. module: hr
 #: view:hr.employee:0
@@ -511,7 +511,7 @@ msgstr "聯絡資料"
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "管理假日、請假及排假。"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -528,7 +528,7 @@ msgstr "狀況"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "其他ID"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
@@ -538,12 +538,12 @@ msgstr "僱傭合約"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "合約"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "訊息及聯絡紀錄"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -553,12 +553,12 @@ msgstr "社會保障號碼（美國）"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "為關注者"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "管理招募流程"
 
 #. module: hr
 #: view:hr.employee:0
@@ -568,12 +568,12 @@ msgstr "活躍"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "人力資源管理"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "安裝您國家的薪資模組"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -588,7 +588,7 @@ msgstr "公司"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -615,12 +615,12 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "人資設定"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "公民與其他資訊"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -635,7 +635,7 @@ msgstr "辦公地址"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "公開資訊"
 
 #. module: hr
 #: field:hr.employee,marital:0
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index 29cf442efbc..227f7fd91db 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.po
@@ -7,57 +7,57 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2013-12-27 04:48+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:53+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-28 05:19+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
 msgid "Confirmed Expenses"
-msgstr ""
+msgstr "已確認費用報支"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_line
 msgid "Expense Line"
-msgstr ""
+msgstr "費用報支項目"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reimbursement0
 msgid "The accoutant reimburse the expenses"
-msgstr ""
+msgstr "會計師報支費用"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_approved
 msgid "Expense approved"
-msgstr ""
+msgstr "費用報支已核准"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "確認日期"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: view:hr.expense.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分組..."
 
 #. module: hr_expense
 #: model:product.template,name:hr_expense.air_ticket_product_template
 msgid "Air Ticket"
-msgstr ""
+msgstr "機票"
 
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Validated By"
-msgstr ""
+msgstr "已完成審核"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -65,45 +65,45 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "部門"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "New Expense"
-msgstr ""
+msgstr "新增費用報支"
 
 #. module: hr_expense
 #: field:hr.expense.line,uom_id:0
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "度量單位"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: hr_expense
 #: field:hr.expense.expense,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未讀訊息"
 
 #. module: hr_expense
 #: field:hr.expense.expense,company_id:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "設為草稿"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Pay"
-msgstr ""
+msgstr "應付款"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:172
@@ -111,12 +111,12 @@ msgstr ""
 msgid ""
 "No expense journal found. Please make sure you have a journal with type "
 "'purchase' configured."
-msgstr ""
+msgstr "未找到費用日記帳。請確認您是否有設置型態為「採購」的日記帳。"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_report
 msgid "Expenses Statistics"
-msgstr ""
+msgstr "費用報支統計"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -127,7 +127,7 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: hr_expense
 #: help:hr.expense.expense,date_valid:0
@@ -139,12 +139,12 @@ msgstr ""
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: hr_expense
 #: field:hr.expense.expense,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "訊息"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:172
@@ -154,28 +154,28 @@ msgstr ""
 #: code:addons/hr_expense/hr_expense.py:353
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_refused
 msgid "Expense refused"
-msgstr ""
+msgstr "費用報支被拒"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.hr_expense_product
 #: view:product.product:0
 msgid "Products"
-msgstr ""
+msgstr "產品"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Confirm Expenses"
-msgstr ""
+msgstr "確認費用報支"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_refused0
@@ -190,17 +190,17 @@ msgstr ""
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
 msgid "Waiting confirmation"
-msgstr ""
+msgstr "等待確認中"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
 msgid "Accepted"
-msgstr ""
+msgstr "已接受"
 
 #. module: hr_expense
 #: field:hr.expense.line,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "參考"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -228,7 +228,7 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "項目數量"
 
 #. module: hr_expense
 #: help:hr.expense.expense,message_summary:0
@@ -241,33 +241,33 @@ msgstr ""
 #: code:addons/hr_expense/hr_expense.py:453
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "(Date and signature)"
-msgstr ""
+msgstr "(日期與簽名)"
 
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Total:"
-msgstr ""
+msgstr "合計:"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
 msgid "Refuse expense"
-msgstr ""
+msgstr "拒絕費用報支"
 
 #. module: hr_expense
 #: field:hr.expense.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均價格"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:process.transition.action,name:hr_expense.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_supplierinvoice0
diff --git a/addons/mail/i18n/he.po b/addons/mail/i18n/he.po
new file mode 100644
index 00000000000..e777b8dd948
--- /dev/null
+++ b/addons/mail/i18n/he.po
@@ -0,0 +1,1687 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-12-30 19:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: mail
+#: view:mail.followers:0
+msgid "Followers Form"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,author_id:0
+#: view:mail.mail:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Comments"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body:0
+#: help:mail.message,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_name:0
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.my.openerp.com>"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Name"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Show messages to read"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0
+#: help:mail.message,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_unread:0
+#: field:mail.thread,message_unread:0
+#: field:res.partner,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:313
+#, python-format
+msgid "show"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,group_ids:0
+msgid ""
+"Members of those groups will automatically added as followers. Note that "
+"they will be able to manage their subscription manually if necessary."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:1029
+#, python-format
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+#: field:mail.notification,read:0
+msgid "Read"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Search Groups"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:157
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:737
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_medium:0
+msgid ""
+"Medium-sized photo of the group. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:212
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:738
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "Open the full mail composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "&ograve"
+msgstr ""
+
+#. module: mail
+#: field:base.config.settings,alias_domain:0
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_ids:0
+msgid "Auto Subscription"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:206
+#, python-format
+msgid "No messages."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_group
+msgid "Discussion group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:96
+#: code:addons/mail/static/src/xml/mail.xml:108
+#, python-format
+msgid "uploading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "more."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,type:0
+#: help:mail.message,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:37
+#, python-format
+msgid "<div>You have been invited to follow %s.</div>"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_unread:0
+#: help:mail.thread,message_unread:0
+#: help:res.partner,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
+#: model:ir.ui.menu,name:mail.mail_tomefeeds
+msgid "To: me"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,name:0
+msgid "Message Type"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:312
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:75
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:25
+#, python-format
+msgid "User img"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_mail
+#: model:ir.ui.menu,name:mail.menu_mail_mail
+#: view:mail.mail:0
+#: view:mail.message:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.followers,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_summary:0
+#: help:mail.thread,message_summary:0
+#: help:res.partner,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_model_id:0
+msgid ""
+"The model (OpenERP Document Kind) to which this alias corresponds. Any "
+"incoming email that does not reply to an existing record will cause the "
+"creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: selection:mail.message,type:0
+msgid "System notification"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: view:mail.message.subtype:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:36
+#: view:mail.compose.message:0
+#, python-format
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:153
+#, python-format
+msgid "No followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
+#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.ui.menu,name:mail.menu_email_followers
+#: view:mail.followers:0
+#: field:mail.group,message_follower_ids:0
+#: field:mail.thread,message_follower_ids:0
+#: field:res.partner,message_follower_ids:0
+#, python-format
+msgid "Followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_archives_feeds
+#: model:ir.ui.menu,name:mail.mail_archivesfeeds
+msgid "Archives"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:95
+#: code:addons/mail/static/src/xml/mail.xml:107
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:245
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:155
+#, python-format
+msgid "One follower"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,type:0
+#: field:mail.message,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Email"
+msgstr ""
+
+#. module: mail
+#: field:ir.ui.menu,mail_group_id:0
+msgid "Mail Group"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Comments and Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:89
+#, python-format
+msgid "%s has joined the %s network."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_small:0
+msgid ""
+"Small-sized photo of the group. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: field:mail.message,partner_ids:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:140
+#, python-format
+msgid "<<<"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:43
+#, python-format
+msgid "Write to the followers of this document..."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_public_id:0
+msgid "Authorized Group"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Join Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_from:0
+msgid "Message sender, taken from user preferences."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:40
+#, python-format
+msgid "<div>You have been invited to follow a new document.</div>"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,parent_id:0
+#: field:mail.message,parent_id:0
+msgid "Parent Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0
+#: field:mail.followers,res_id:0
+#: field:mail.message,res_id:0
+#: field:mail.wizard.invite,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_to_me_feeds
+msgid ""
+"<p>\n"
+"                    <b>No private message.</b>\n"
+"                </p><p>\n"
+"                    This list contains messages sent to you.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_rd
+msgid "R&D"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:61
+#, python-format
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:244
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:193
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid ""
+"You may not create a user. To create new users, you should use the "
+"\"Settings > Users\" menu."
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_model:0
+#: help:mail.wizard.invite,res_model:0
+msgid "Model of the followed resource"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:337
+#, python-format
+msgid "like"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:47
+#, python-format
+msgid "Share with my followers..."
+msgstr ""
+
+#. module: mail
+#: field:mail.notification,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"Only the invited followers can read the\n"
+"                                    discussions on this group."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Has attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "on"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:926
+#, python-format
+msgid ""
+"The following partners chosen as recipients for the email have no email "
+"address linked :"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_defaults:0
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notified_partner_ids:0
+#: help:mail.message,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Comment"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,notification:0
+msgid "Is Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:188
+#, python-format
+msgid "Compose a new message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:75
+#, python-format
+msgid ""
+"Unable to send email, please configure the sender's email address or alias."
+msgstr ""
+
+#. module: mail
+#: help:res.users,alias_id:0
+msgid ""
+"Email address internally associated with this user. Incoming emails will "
+"appear in the user's notifications."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:54
+#: code:addons/mail/static/src/xml/mail.xml:191
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,vote_user_ids:0
+#: help:mail.message,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,alias_id:0
+msgid ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,child_ids:0
+#: field:mail.message,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+#: field:mail.mail,mail_message_id:0
+#: view:mail.message:0
+#: field:mail.notification,message_id:0
+#: field:mail.wizard.invite,message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_id:0
+#: help:mail.wizard.invite,res_id:0
+msgid "Id of the followed resource"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body:0
+#: field:mail.message,body:0
+msgid "Contents"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_alias
+#: model:ir.ui.menu,name:mail.mail_alias_menu
+msgid "Aliases"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,vote_user_ids:0
+#: field:mail.message,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,public:0
+msgid "Privacy"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:654
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_force_thread_id:0
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_group_root
+msgid "My Groups"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_archives_feeds
+msgid ""
+"<p>\n"
+"                    No message found and no message sent yet.\n"
+"                </p><p>\n"
+"                    Click on the top-right icon to compose a message. This\n"
+"                    message will be sent by email if it's an internal "
+"contact.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: field:mail.mail,state:0
+msgid "Status"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "All feeds"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,record_name:0
+#: help:mail.message,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_notifications
+#: model:ir.model,name:mail.model_mail_notification
+#: model:ir.ui.menu,name:mail.menu_email_notifications
+#: field:mail.compose.message,notification_ids:0
+#: view:mail.message:0
+#: field:mail.message,notification_ids:0
+#: view:mail.notification:0
+msgid "Notifications"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+msgid "Search Alias"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_force_thread_id:0
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,name:0
+msgid ""
+"Message subtype gives a more precise type on the message, especially for "
+"system notifications. For example, it can be a notification related to a new "
+"record (New), or to a stage change in a process (Stage change). Message "
+"subtypes allow to precisely tune the notifications the user want to receive "
+"on its wall."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "by"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_best_sales_practices
+msgid "Best Sales Practices"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Selected Group Only"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_is_follower:0
+#: field:mail.thread,message_is_follower:0
+#: field:res.partner,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Groups"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Messages Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0
+#: field:mail.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:34
+#, python-format
+msgid "Post"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:120
+#, python-format
+msgid "To:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:193
+#, python-format
+msgid "Write to my followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,default:0
+msgid "Default"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:311
+#, python-format
+msgid "show more message"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:246
+#, python-format
+msgid "Mark as Todo"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_summary:0
+#: field:mail.thread,message_summary:0
+#: field:res.partner,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subtype_id:0
+#: field:mail.followers,subtype_ids:0
+#: field:mail.message,subtype_id:0
+#: view:mail.message.subtype:0
+msgid "Subtype"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Form"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:313
+#, python-format
+msgid "more messages"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:13
+#, python-format
+msgid "Following"
+msgstr ""
+
+#. module: mail
+#: sql_constraint:mail.alias:0
+msgid ""
+"Unfortunately this email alias is already used, please choose a unique one"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_user_id:0
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image:0
+msgid ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,attachment_ids:0
+#: view:mail.mail:0
+#: field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,record_name:0
+#: field:mail.message,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:123
+#: view:mail.compose.message:0
+#, python-format
+msgid "Followers of"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_group_feeds
+msgid "Discussion Group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:242
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_comment
+msgid "Discussions"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:11
+#, python-format
+msgid "Follow"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
+msgid "Whole Company"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:129
+#: code:addons/mail/static/src/xml/mail.xml:292
+#: view:mail.compose.message:0
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,body_html:0
+msgid "Rich-text/HTML message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:323
+#, python-format
+msgid "Compose new Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,menu_id:0
+msgid "Related Menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Content"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,notified_partner_ids:0
+#: field:mail.message,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,public:0
+msgid ""
+"This group is visible by non members.             Invisible groups can add "
+"members through the invite button."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_board
+msgid "Board meetings"
+msgstr ""
+
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_model_id:0
+msgid "Aliased Model"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0
+#: help:mail.message,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
+msgid "Description"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_followers
+msgid "Document Followers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
+#, python-format
+msgid "Remove this follower"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Never"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:930
+#, python-format
+msgid "Partners email addresses not found"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: help:res.partner,notification_email_send:0
+msgid ""
+"Choose in which case you want to receive an email when you receive new feeds."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_groups
+#: model:ir.ui.menu,name:mail.mail_allgroups
+msgid "Join a group"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_group_feeds
+msgid ""
+"<p>\n"
+"                    No message in this group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:213
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"This group is visible by everyone,\n"
+"                                    including your customers if you "
+"installed\n"
+"                                    the portal module."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:243
+#, python-format
+msgid "Set back to Todo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:126
+#, python-format
+msgid "this document"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr ""
+
+#. module: mail
+#: help:base.config.settings,alias_domain:0
+msgid ""
+"If you have setup a catch-all email domain redirected to the OpenERP server, "
+"enter the domain name here."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:139
+#, python-format
+msgid "others..."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.alias,alias_name:0
+#: field:mail.group,alias_id:0
+#: field:res.users,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notification_ids:0
+#: help:mail.message,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_feeds
+#: model:ir.ui.menu,name:mail.mail_feeds_main
+msgid "Messaging"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.message.subtype,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Unread"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,subtype_ids:0
+msgid ""
+"Message subtypes followed, meaning subtypes that will be pushed onto the "
+"user's Wall."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_ids:0
+#: help:mail.thread,message_ids:0
+#: help:res.partner,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,composition_mode:0
+msgid "Composition mode"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0
+#: field:mail.followers,res_model:0
+#: field:mail.message,model:0
+#: field:mail.wizard.invite,res_model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:338
+#, python-format
+msgid "unlike"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,author_id:0
+#: help:mail.message,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_domain:0
+msgid "Alias domain"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error during communication with the publisher warranty server."
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_star_feeds
+msgid ""
+"<p>\n"
+"                    <b>No todo.</b>\n"
+"                </p><p>\n"
+"                    When you process messages in your inbox, you can mark "
+"some\n"
+"                    as <i>todo</i>. From this menu, you can process all your "
+"todo.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,partner_ids:0
+msgid "Additional contacts"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,parent_id:0
+#: help:mail.message,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_hr_policies
+msgid "HR Policies"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Emails only"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
+#: model:ir.ui.menu,name:mail.mail_inboxfeeds
+msgid "Inbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:58
+#, python-format
+msgid "File"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/many2many_tags_email.js:63
+#, python-format
+msgid "Please complete partner's informations and Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_message_subtype
+#: model:ir.ui.menu,name:mail.menu_message_subtype
+msgid "Subtypes"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_alias
+msgid "Email Aliases"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_small:0
+msgid "Small-sized photo"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/marketing/i18n/he.po b/addons/marketing/i18n/he.po
new file mode 100644
index 00000000000..19ce42dbfa0
--- /dev/null
+++ b/addons/marketing/i18n/he.po
@@ -0,0 +1,109 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 19:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_config_settings
+msgid "marketing.config.settings"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"                This installs the module marketing_campaign_crm_demo."
+msgstr ""
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_configuration
+#: view:marketing.config.settings:0
+msgid "Configure Marketing"
+msgstr ""
+
+#. module: marketing
+#: view:crm.lead:0
+#: model:ir.ui.menu,name:marketing.menu_marketing_configuration
+msgid "Marketing"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.config.settings,module_marketing_campaign:0
+msgid "Marketing campaigns"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.config.settings:0
+msgid "or"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.config.settings:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_manager
+msgid "Manager"
+msgstr ""
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_user
+msgid "User"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.config.settings:0
+msgid "Campaigns Settings"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.config.settings:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.config.settings,module_marketing_campaign:0
+msgid ""
+"Provides leads automation through marketing campaigns.\n"
+"                Campaigns can in fact be defined on any resource, not just "
+"CRM leads.\n"
+"                This installs the module marketing_campaign."
+msgstr ""
+
+#. module: marketing
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"                This installs the module crm_profiling."
+msgstr ""
+
+#. module: marketing
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr ""
diff --git a/addons/marketing_campaign/i18n/he.po b/addons/marketing_campaign/i18n/he.po
new file mode 100644
index 00000000000..71ef53e095c
--- /dev/null
+++ b/addons/marketing_campaign/i18n/he.po
@@ -0,0 +1,1056 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 19:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:819
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Follow-Up"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_html:marketing_campaign.email_template_3
+msgid ""
+"Hi, we are delighted to let you know that you have entered the select circle "
+"of our Gold Partners"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#, python-format
+msgid ""
+"The campaign cannot be started. It does not have any starting activity. "
+"Modify campaign's activities to mark one as the starting point."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The email to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.client,name:marketing_campaign.action_client_marketing_menu
+msgid "Open Marketing Menu"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_html:marketing_campaign.email_template_1
+msgid "Hello, you will receive your welcome pack via email shortly."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "You cannot duplicate a campaign, Not supported yet."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.filters,name:marketing_campaign.filter0
+msgid "Partners"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+msgid "New"
+msgstr ""
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Email"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_2
+msgid "Congratulations! You are now a Silver Partner!"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+#: view:res.partner:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to create a marketing campaign.\n"
+"          </p><p>\n"
+"            OpenERP's marketing campaign allows you to automate "
+"communication\n"
+"            to your prospects. You can define a segment (set of conditions) "
+"on\n"
+"            your leads and partners to fullfil the campaign.\n"
+"          </p><p>\n"
+"            A campaign can have many activities like sending an email, "
+"printing\n"
+"            a letter, assigning to a team, etc. These activities are "
+"triggered\n"
+"            from specific situations; contact form, 10 days after first\n"
+"            contact, if a lead is not closed yet, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty. This is useful "
+"for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
+"views."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Follow-up"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Statistics"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign. \"No duplicates\" prevents selecting "
+"records which have already entered the campaign previously.If the campaign "
+"has a \"unique field\" set, \"no duplicates\" will also prevent selecting "
+"records which have the same value for the unique field as other records that "
+"already entered the campaign."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "Status"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: all records"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,unique_field_id:0
+msgid "Unique Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:528
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:819
+#, python-format
+msgid "No preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:530
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Marketing Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't Delete Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_3
+msgid "Congratulations! You are now one of our Gold Partners!"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,unique_field_id:0
+msgid ""
+"If set, this field will help segments that work in \"no duplicates\" mode to "
+"avoid selecting similar records twice. Similar records are records that have "
+"the same value for this unique field. For example by choosing the "
+"\"email_from\" field for CRM Leads you would prevent sending the same "
+"campaign to the same email address again. If not set, the \"no duplicates\" "
+"segments will only avoid selecting the same record again if it entered the "
+"campaign previously. Only easily comparable fields like textfields, "
+"integers, selections or single relationships may be used."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:529
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+#: view:marketing.campaign:0
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records updated after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:793
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are closed."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#, python-format
+msgid "The campaign cannot be started. There are no activities in it."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_html:marketing_campaign.email_template_2
+msgid ""
+"Hi, we are delighted to welcome you among our Silver Partners as of today!"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_1
+msgid "Welcome to the OpenERP Partner Channel!"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/portal/i18n/he.po b/addons/portal/i18n/he.po
new file mode 100644
index 00000000000..7a76965f9fd
--- /dev/null
+++ b/addons/portal/i18n/he.po
@@ -0,0 +1,497 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 19:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Mako"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:50
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid ""
+"Select which contacts should belong to the portal in the list below.\n"
+"                        The email address of each selected contact must be "
+"valid and unique.\n"
+"                        If necessary, you can fix any contact's email "
+"address directly in the list."
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard.user:0
+msgid "Contacts"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: view:res.groups:0
+msgid "Portal Groups"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,welcome_message:0
+msgid "Invitation Message"
+msgstr ""
+
+#. module: portal
+#: view:res.groups:0
+msgid "Non-Portal Groups"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Details"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_orders
+msgid "Quotations and Sales Orders"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "reference: the reference number of the document to pay"
+msgstr ""
+
+#. module: portal
+#: help:portal.payment.acquirer,visible:0
+msgid ""
+"Make this payment acquirer available in portal forms (Customer invoices, "
+"etc.)"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,email:0
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_news
+msgid ""
+"<p>\n"
+"                    Youd don't have unread company's news.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_jobs
+#: model:ir.ui.menu,name:portal.portal_jobs
+msgid "Jobs"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:82
+#, python-format
+msgid "Pay safely online"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"kind: the kind of document on which the payment form is rendered (translated "
+"to user language, e.g. \"Invoice\")"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,portal_id:0
+msgid "The portal that users can be added in or removed from."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:38
+#, python-format
+msgid "Users you already shared with"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_jobs
+msgid ""
+"<p>\n"
+"                    Youd don't have unread job offers.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_menu
+#: field:portal.wizard,portal_id:0
+#: field:res.groups,is_portal:0
+#: model:res.groups,name:portal.group_portal
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:34
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,in_portal:0
+msgid "In Portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_news
+#: model:ir.ui.menu,name:portal.portal_company_news
+msgid "News"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_after_sales
+msgid "After Sale Services"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal
+msgid ""
+"Portal members have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.action_acquirer_list
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirers"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_projects
+msgid "Projects"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal
+#: model:ir.ui.menu,name:portal.portal_inbox
+msgid "Inbox"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "uid: the current user id"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"quote(): a method to quote special string character to make them suitable "
+"for inclusion in a URL"
+msgstr ""
+
+#. module: portal
+#: help:res.groups,is_portal:0
+msgid "If checked, this group is usable as a portal."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,form_template:0
+msgid "Payment form template (HTML)"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:193
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_messages
+msgid "Messaging"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_anonymous
+msgid ""
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_payment_acquirer
+msgid "Online Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,welcome_message:0
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_company
+msgid "About Us"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"currency: the currency record in which the document is issued (e.g. "
+"currency.name could be EUR)"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been given access to %(portal)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"Username: %(login)s\n"
+"\n"
+"In order to complete the signin process, click on the following url:\n"
+"%(url)s\n"
+"\n"
+"%(welcome_message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: portal
+#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
+msgid ""
+"\n"
+"% if object.company_id.paypal_account:\n"
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
+"target=\"_blank\">\n"
+"  <input type=\"hidden\" name=\"cmd\" value=\"_xclick\"/>\n"
+"  <input type=\"hidden\" name=\"business\" "
+"value=\"${object.company_id.paypal_account}\"/>\n"
+"  <input type=\"hidden\" name=\"item_name\" "
+"value=\"${object.company_id.name} ${kind.title()} ${reference}\"/>\n"
+"  <input type=\"hidden\" name=\"amount\" value=\"${amount}\"/>\n"
+"  <input type=\"hidden\" name=\"currency_code\" "
+"value=\"${currency.name}\"/>\n"
+"  <input type=\"image\" name=\"submit\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"</form>\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"If the template renders to an empty result in a certain context it will be "
+"ignored, as if it was inactive."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:39
+#, python-format
+msgid "Existing Groups (e.g Portal Groups)"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "ctx: the current context dictionary"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"This is an HTML form template to submit a payment through this acquirer.\n"
+"                                The template will be rendered with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/mail_mail.py:42
+#, python-format
+msgid ""
+"Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Form Template"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: model:ir.model,name:portal.model_portal_wizard
+#: view:portal.wizard:0
+msgid "Portal Access Management"
+msgstr ""
diff --git a/addons/portal_crm/i18n/he.po b/addons/portal_crm/i18n/he.po
new file mode 100644
index 00000000000..b14cf413812
--- /dev/null
+++ b/addons/portal_crm/i18n/he.po
@@ -0,0 +1,546 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 19:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/portal_project/i18n/he.po b/addons/portal_project/i18n/he.po
new file mode 100644
index 00000000000..c28dd7b4313
--- /dev/null
+++ b/addons/portal_project/i18n/he.po
@@ -0,0 +1,33 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-30 19:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: portal_project
+#: model:ir.actions.act_window,help:portal_project.open_view_project
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Click to start a new project.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal_project
+#: model:ir.actions.act_window,name:portal_project.open_view_project
+#: model:ir.ui.menu,name:portal_project.portal_services_projects
+msgid "Projects"
+msgstr ""
diff --git a/addons/portal_project_issue/i18n/he.po b/addons/portal_project_issue/i18n/he.po
new file mode 100644
index 00000000000..f72d40447a6
--- /dev/null
+++ b/addons/portal_project_issue/i18n/he.po
@@ -0,0 +1,40 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-30 19:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr ""
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+msgid "Issues"
+msgstr ""
diff --git a/addons/process/i18n/he.po b/addons/process/i18n/he.po
new file mode 100644
index 00000000000..1e06adfb373
--- /dev/null
+++ b/addons/process/i18n/he.po
@@ -0,0 +1,379 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-30 19:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: process
+#: model:ir.model,name:process.model_process_node
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Node"
+msgstr ""
+
+#. module: process
+#: help:process.process,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the process "
+"without removing it."
+msgstr ""
+
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr ""
+
+#. module: process
+#: selection:process.node,kind:0
+msgid "Status"
+msgstr ""
+
+#. module: process
+#: field:process.transition,action_ids:0
+msgid "Buttons"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Group By..."
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+msgid "Kind Of Node"
+msgstr ""
+
+#. module: process
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr ""
+
+#. module: process
+#: field:process.node,flow_start:0
+msgid "Starting Flow"
+msgstr ""
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_node_form
+#: model:ir.ui.menu,name:process.menu_process_node_form
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Nodes"
+msgstr ""
+
+#. module: process
+#: view:process.process:0
+#: field:process.process,node_ids:0
+msgid "Nodes"
+msgstr ""
+
+#. module: process
+#: field:process.node,condition_ids:0
+#: view:process.process:0
+msgid "Conditions"
+msgstr ""
+
+#. module: process
+#: view:process.transition:0
+msgid "Search Process Transition"
+msgstr ""
+
+#. module: process
+#: field:process.condition,node_id:0
+msgid "Node"
+msgstr ""
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Workflow Trigger"
+msgstr ""
+
+#. module: process
+#: field:process.transition,note:0
+msgid "Description"
+msgstr ""
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition_action
+msgid "Process Transitions Actions"
+msgstr ""
+
+#. module: process
+#: field:process.condition,model_id:0
+#: view:process.node:0
+#: field:process.node,model_id:0
+#: view:process.process:0
+#: field:process.process,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: process
+#: field:process.transition,source_node_id:0
+msgid "Source Node"
+msgstr ""
+
+#. module: process
+#: view:process.transition:0
+#: field:process.transition,transition_ids:0
+msgid "Workflow Transitions"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:39
+#, python-format
+msgid "Last modified by:"
+msgstr ""
+
+#. module: process
+#: field:process.transition.action,action:0
+msgid "Action ID"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:7
+#, python-format
+msgid "Process View"
+msgstr ""
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition
+#: view:process.transition:0
+msgid "Process Transition"
+msgstr ""
+
+#. module: process
+#: model:ir.model,name:process.model_process_condition
+msgid "Condition"
+msgstr ""
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Dummy"
+msgstr ""
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.ui.menu,name:process.menu_process_form
+msgid "Processes"
+msgstr ""
+
+#. module: process
+#: field:process.transition.action,transition_id:0
+msgid "Transition"
+msgstr ""
+
+#. module: process
+#: field:process.condition,name:0
+#: field:process.node,name:0
+#: field:process.process,name:0
+#: field:process.transition,name:0
+#: field:process.transition.action,name:0
+msgid "Name"
+msgstr ""
+
+#. module: process
+#: field:process.node,transition_in:0
+msgid "Starting Transitions"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:54
+#, python-format
+msgid "Related:"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,note:0
+#: view:process.process:0
+#: field:process.process,note:0
+#: view:process.transition:0
+msgid "Notes"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:88
+#, python-format
+msgid "Edit Process"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:39
+#, python-format
+msgid "N/A"
+msgstr ""
+
+#. module: process
+#: view:process.process:0
+msgid "Search Process"
+msgstr ""
+
+#. module: process
+#: field:process.process,active:0
+msgid "Active"
+msgstr ""
+
+#. module: process
+#: view:process.transition:0
+msgid "Associated Groups"
+msgstr ""
+
+#. module: process
+#: field:process.node,model_states:0
+msgid "States Expression"
+msgstr ""
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Action"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:67
+#, python-format
+msgid "Select Process"
+msgstr ""
+
+#. module: process
+#: field:process.condition,model_states:0
+msgid "Expression"
+msgstr ""
+
+#. module: process
+#: field:process.transition,group_ids:0
+msgid "Required Groups"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: process
+#: field:process.transition.action,state:0
+msgid "Type"
+msgstr ""
+
+#. module: process
+#: field:process.node,transition_out:0
+msgid "Ending Transitions"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/js/process.js:243
+#: code:addons/process/static/src/xml/process.xml:33
+#: model:ir.model,name:process.model_process_process
+#: field:process.node,process_id:0
+#: view:process.process:0
+#, python-format
+msgid "Process"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+msgid "Search ProcessNode"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Other Conditions"
+msgstr ""
+
+#. module: process
+#: model:ir.ui.menu,name:process.menu_process
+msgid "Enterprise Process"
+msgstr ""
+
+#. module: process
+#: view:process.transition:0
+msgid "Actions"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Properties"
+msgstr ""
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_transition_form
+#: model:ir.ui.menu,name:process.menu_process_transition_form
+msgid "Process Transitions"
+msgstr ""
+
+#. module: process
+#: field:process.transition,target_node_id:0
+msgid "Target Node"
+msgstr ""
+
+#. module: process
+#: field:process.node,kind:0
+msgid "Kind of Node"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:42
+#, python-format
+msgid "Subflows:"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:36
+#, python-format
+msgid "Notes:"
+msgstr ""
+
+#. module: process
+#: selection:process.node,kind:0
+#: field:process.node,subflow_id:0
+msgid "Subflow"
+msgstr ""
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Transitions"
+msgstr ""
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Object Method"
+msgstr ""
+
+#. module: process
+#. openerp-web
+#: code:addons/process/static/src/xml/process.xml:77
+#, python-format
+msgid "Select"
+msgstr ""
diff --git a/addons/procurement/i18n/zh_TW.po b/addons/procurement/i18n/zh_TW.po
new file mode 100644
index 00000000000..dd0d842b316
--- /dev/null
+++ b/addons/procurement/i18n/zh_TW.po
@@ -0,0 +1,1005 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-30 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "排程器"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "分組..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"required quantities are always\n"
+"                           available"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"If there are not enough quantities available, the delivery order\n"
+"                           will wait for new products. To fulfill the "
+"inventory, you should\n"
+"                           create others rules like orderpoints."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+#: field:product.template,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: procurement
+#: selection:product.template,supply_method:0
+msgid "Manufacture"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Reason"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Minimum Quantity"
+msgstr ""
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "Products"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"<p>\n"
+"                Procurement Orders represent the need for a certain quantity "
+"of products, at a given time, in a given location. Sales Orders are one "
+"typical source of Procurement Orders (but these are distinct documents). "
+"Depending on the procurement parameters and the product configuration, the "
+"procurement engine will attempt to satisfy the need by reserving products "
+"from stock, ordering products from a supplier, or passing a manufacturing "
+"order, etc. A Procurement Exception occurs when the system cannot find a way "
+"to fulfill a procurement. Some exceptions will resolve themselves "
+"automatically, but others require manual intervention (those are identified "
+"by a specific error message).\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Procurement '%s' is in exception: "
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Reordering Rules Search"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:110
+#, python-format
+msgid "PROC %d: from stock - %3.2f %-5s - %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:365
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+#: view:procurement.order:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a procurement order. \n"
+"              </p><p>\n"
+"                A procurement order is used to record a need for a specific\n"
+"                product at a specific location.  Procurement orders are "
+"usually\n"
+"                created automatically from sales orders, pull logistic rules "
+"or\n"
+"                minimum stock rules.\n"
+"              </p><p>\n"
+"                When the procurement order is confirmed, it automatically\n"
+"                creates the necessary operations to fullfil the need: "
+"purchase\n"
+"                order proposition, manufacturing order, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"use the available\n"
+"                           inventory"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the status is set to 'Draft'.\n"
+" If the procurement is confirmed, the status is set to 'Confirmed'.          "
+"  \n"
+"After confirming the status is set to 'Running'.\n"
+" If any exception arises in the order then the status is set to "
+"'Exception'.\n"
+" Once the exception is removed the status becomes 'Ready'.\n"
+" It is in 'Waiting'. status when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"When you sell this service, nothing special will be triggered\n"
+"                           to deliver the customer, as you set the "
+"procurement method as\n"
+"                           'Make to Stock'."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.warehouse.orderpoint:0
+msgid ""
+"You have to select a product unit of measure in the same category than the "
+"default unit of measure of the product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"as it's a consumable (as a result of this, the quantity\n"
+"                           on hand may become negative)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes below the Min Quantity specified for this field, "
+"OpenERP generates a procurement to bring the forecasted quantity to the Max "
+"Quantity."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Run Schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: selection:product.template,supply_method:0
+msgid "Buy"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "for the delivery order."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: help:product.template,supply_method:0
+msgid ""
+"Manufacture: When procuring the product, a manufacturing order or a task "
+"will be generated, depending on the product type. \n"
+"Buy: When procuring the product, a purchase order will be generated."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:367
+#, python-format
+msgid "Not enough stock."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:312
+#, python-format
+msgid ""
+"Please check the quantity in procurement order(s) for the product \"%s\", it "
+"should not be 0 or less!"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"When you sell this product, a delivery order will be created.\n"
+"                           OpenERP will consider that the"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:133
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will be rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Logistics"
+msgstr ""
+
+#. module: procurement
+#: help:product.template,procure_method:0
+msgid ""
+"Make to Stock: When needed, the product is taken from the stock or we wait "
+"for replenishment. \n"
+"Make to Order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:311
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes below the Min Quantity, OpenERP generates a "
+"procurement to bring the forecasted quantity to the Quantity specified as "
+"Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: field:product.product,orderpoint_ids:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"Fill is this for to launch a procurement request for this\n"
+"                        product. According to the product configuration, "
+"this may\n"
+"                        trigger a draft purchase order, a manufacturing "
+"order or\n"
+"                        a new task."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_product_product
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+#: selection:procurement.order,procure_method:0
+#: selection:product.template,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: field:product.template,supply_method:0
+msgid "Supply Method"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Reordering Rules"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:139
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s state."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement started late"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "or"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:134
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "Request Procurement"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:87
+#, python-format
+msgid "PROC %d: on order - %3.2f %-5s - %s"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:339
+#, python-format
+msgid "Products reserved from stock."
+msgstr ""
diff --git a/addons/project/i18n/he.po b/addons/project/i18n/he.po
new file mode 100644
index 00000000000..714693d9df4
--- /dev/null
+++ b/addons/project/i18n/he.po
@@ -0,0 +1,2109 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-12-27 10:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-28 05:19+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: project
+#: view:project.project:0
+msgid "Email Interface"
+msgstr ""
+
+#. module: project
+#: help:account.analytic.account,use_tasks:0
+msgid ""
+"If checked, this contract will be available in the project menu and you will "
+"be able to manage tasks or track issues"
+msgstr ""
+
+#. module: project
+#: field:project.project,progress_rate:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,day:0
+msgid "Day"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Merge"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "Start Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:944
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_unread:0
+#: help:project.task,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Manage time estimation on tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_summary:0
+#: help:project.task,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:444
+#: code:addons/project/project.py:1332
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_manage_delegation_task:0
+msgid "Allow task delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.client,name:project.action_client_project_menu
+msgid "Open Project Menu"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_delegate_task
+msgid "Task Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.project,planned_hours:0
+#: field:project.task.history,planned_hours:0
+#: field:project.task.history.cumulative,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Public"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_01
+msgid "Contact's suggestion"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Allows you to compute Time Estimation on tasks."
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+#: view:project.project:0
+msgid "Templates of Projects"
+msgstr ""
+
+#. module: project
+#: field:project.project,analytic_account_id:0
+msgid "Contract/Analytic"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Project Management"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Support"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Cancel Task"
+msgstr ""
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's members are users who can have an access to the tasks related to "
+"this project."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project
+#: field:project.project,state:0
+#: field:project.task,state:0
+#: field:project.task.history,state:0
+#: field:project.task.history.cumulative,state:0
+#: field:report.project.task.user,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,complete_name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr ""
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_summary:0
+#: field:project.task,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Append this project to another one using analytic accounts hierarchy"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "In Progress Tasks"
+msgstr ""
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
+#. module: project
+#: field:project.task,user_id:0
+#: view:report.project.task.user:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1033
+#, python-format
+msgid "Delegated User should be specified"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project(s) Manager"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr ""
+
+#. module: project
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Validate planned time"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_pad:0
+msgid "Use integrated collaborative note pads on task"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "oe_kanban_text_red"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to open state"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project Settings"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My tasks"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr ""
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.my_open_tasks_action
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "My Tasks"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Pending tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,project_id:0
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: view:project.config.settings:0
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,task_id:0
+#: field:project.task.history.cumulative,task_id:0
+#: field:project.task.work,task_id:0
+#: view:report.project.task.user:0
+msgid "Task"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Allows you to compute work on tasks."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Log work activities on tasks"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_analysis
+msgid "Analysis"
+msgstr ""
+
+#. module: project
+#: field:project.task,name:0
+#: field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr ""
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr ""
+
+#. module: project
+#: field:project.task,planned_hours:0
+msgid "Initially Planned Hours"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr ""
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Click to start a new project.\n"
+"                </p><p>\n"
+"                  Projects are used to organize your activities; plan\n"
+"                  tasks, track issues, invoice timesheets. You can define\n"
+"                  internal projects (R&amp;D, Improve Sales Process),\n"
+"                  private projects (My Todos) or customer ones.\n"
+"                </p><p>\n"
+"                  You will be able collaborate with internal users on\n"
+"                  projects or invite customers to share your activities.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Planning"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Ready"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "New Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue_sheet:0
+msgid "Invoice working time on issues"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Specification"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Task's Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "New tasks"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,stage_id:0
+#: field:project.task.history,type_id:0
+#: field:project.task.history.cumulative,type_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_model:0
+msgid "Alias Model"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+msgid "Stages"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Delete"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_02
+msgid "Feature request"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:81
+#, python-format
+msgid "CHECK: %s"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Close Project"
+msgstr ""
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Task Activities"
+msgstr ""
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "í"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,company_uom_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_is_follower:0
+#: field:project.task,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_tasks_config
+msgid "GTD"
+msgstr ""
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,date:0
+#: field:project.task.history.cumulative,date:0
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue:0
+msgid ""
+"Provides management of issues/bugs in projects.\n"
+"                This installs the module project_issue."
+msgstr ""
+
+#. module: project
+#: help:project.task,kanban_state:0
+msgid ""
+"A task's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this task\n"
+" * Ready for next stage indicates the task is ready to be pulled to the next "
+"stage"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "10"
+msgstr ""
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Other Info"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_task_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Important"
+msgstr ""
+
+#. module: project
+#: field:project.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "November"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluate Task"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+#: view:project.task.type:0
+msgid "Task Stage"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Common"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_ids:0
+#: help:project.task,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"To invoice or setup invoicing and renewal options, go to the related "
+"contract:"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,state:0
+msgid "Validation State"
+msgstr ""
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Re-open project"
+msgstr ""
+
+#. module: project
+#: help:project.project,priority:0
+msgid "Gives the sequence order when displaying the list of projects"
+msgstr ""
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,message_unread:0
+#: view:project.task:0
+#: field:project.task,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,parent_ids:0
+msgid "Parent Tasks"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Stages common to all projects"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr ""
+
+#. module: project
+#: field:project.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Pending Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Show only tasks having a deadline"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_04
+msgid "Usability"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:181
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: project
+#: help:project.task.type,state:0
+msgid ""
+"The status of your document is automatically changed regarding the selected "
+"stage. For example, if a stage is related to the status 'Close', when your "
+"document reaches this stage, it is automatically closed."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Edit..."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,nbr:0
+msgid "# of tasks"
+msgstr ""
+
+#. module: project
+#: field:project.project,doc_count:0
+msgid "Number of documents attached"
+msgstr ""
+
+#. module: project
+#: field:project.task,priority:0
+#: field:report.project.task.user,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Open Projects"
+msgstr ""
+
+#. module: project
+#: help:project.project,alias_id:0
+msgid ""
+"Internal email associated with this project. Incoming emails are "
+"automatically synchronizedwith Tasks (or optionally Issues if the Issue "
+"Tracker module is installed)."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a stage in the task pipeline.\n"
+"              </p><p>\n"
+"                Define the steps that will be used in the project from the\n"
+"                creation of the task, up to the closing of the task or "
+"issue.\n"
+"                You will use these stages in order to track the progress in\n"
+"                solving a task or an issue.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:368
+#: code:addons/project/project.py:389
+#: code:addons/project/project.py:721
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task.history,remaining_hours:0
+#: field:project.task.history.cumulative,remaining_hours:0
+msgid "Remaining Time"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr ""
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Team"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,time_unit:0
+msgid "This will set the unit of measure used in projects and tasks."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_design
+msgid "Design"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Start Date"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: view:project.task.history.cumulative:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: project
+#: help:project.task,progress:0
+msgid ""
+"If the task has a progress of 99.99% you should close the task if it's "
+"finished or reevaluate the time"
+msgstr ""
+
+#. module: project
+#: field:project.task,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,time_unit:0
+msgid "Working time unit"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a member."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.project_category_action
+#: model:ir.ui.menu,name:project.menu_project_category_act
+#: view:project.category:0
+#: field:project.task,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_history
+#: model:ir.model,name:project.model_project_task_history_cumulative
+msgid "History of Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_manage_delegation_task:0
+msgid "Allows you to delegate tasks to other users."
+msgstr ""
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_category
+msgid "Category of project's task, issue, ..."
+msgstr ""
+
+#. module: project
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference between planned hours by the project manager and the "
+"total hours of the task."
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Helpdesk & Support"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr ""
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:230
+#, python-format
+msgid "Attachments"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_deployment
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: view:res.partner:0
+msgid "Done"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:182
+#, python-format
+msgid ""
+"You cannot delete a project containing tasks. You can either delete all the "
+"project's tasks and then delete the project or simply deactivate the project."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: view:project.project:0
+msgid "Open"
+msgstr ""
+
+#. module: project
+#: field:project.project,privacy_visibility:0
+msgid "Privacy / Visibility"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,user_id:0
+#: field:project.task.history.cumulative,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr ""
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr ""
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_pad:0
+msgid ""
+"Lets the company customize which Pad installation should be used to link to "
+"new pads\n"
+"                (by default, http://ietherpad.com/).\n"
+"                This installs the module pad."
+msgstr ""
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:944
+#, python-format
+msgid ""
+"Child task still open.\n"
+"Please cancel or complete child task first."
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_time_work_estimation_tasks
+msgid "Time Estimation on Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task,total_hours:0
+msgid "Total"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr ""
+
+#. module: project
+#: help:project.task.type,fold:0
+msgid ""
+"This stage is not visible, for example in status bar or kanban view, when "
+"there are no records in that stage to display."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:69
+#: code:addons/project/wizard/project_task_delegate.py:70
+#: code:addons/project/wizard/project_task_delegate.py:77
+#: code:addons/project/wizard/project_task_delegate.py:78
+#, python-format
+msgid "CHECK: "
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:444
+#, python-format
+msgid "You must assign members on the project '%s' !"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Pending Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Remaining"
+msgstr ""
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project
+#: field:project.task,company_id:0
+#: field:project.task.work,company_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_timesheet:0
+msgid ""
+"This allows you to transfer the entries under tasks defined for Project "
+"Management to\n"
+"                the timesheet line entries for particular date and user, "
+"with the effect of creating,\n"
+"                editing and deleting either ways.\n"
+"                This installs the module project_timesheet."
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue:0
+msgid "Track issues and bugs"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_mrp:0
+msgid "Generate tasks from sale orders"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_task_types_view
+msgid "Task Stages"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_ids:0
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project
+#: field:project.project,color:0
+#: field:project.task,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_dashboard
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,project_id:0
+#: field:project.task.delegate,project_id:0
+#: field:project.task.history.cumulative,project_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+msgid "Project"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_cancel
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new task.\n"
+"              </p><p>\n"
+"                OpenERP's project management allows you to manage the "
+"pipeline\n"
+"                of tasks in order to get things done efficiently. You can\n"
+"                track progress, discuss on tasks, attach documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: field:project.task,date_end:0
+#: field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,state:0
+msgid "Related Status"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Documents"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_follower_ids:0
+#: field:project.task,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+msgid "New"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
+#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
+msgid "Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_long_term:0
+msgid "Manage resources planning on gantt view"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Unassigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr ""
+
+#. module: project
+#: help:project.task,sequence:0
+msgid "Gives the sequence order when displaying a list of tasks."
+msgstr ""
+
+#. module: project
+#: field:project.task,date_start:0
+#: field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:410
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_projects
+#: view:project.project:0
+#: field:project.task.type,project_ids:0
+#: view:res.company:0
+#, python-format
+msgid "Projects"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_tasks_work_on_tasks
+msgid "Task's Work on Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,use_tasks:0
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.project:0
+#: view:project.task:0
+#: view:res.partner:0
+#: field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "or"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_mrp:0
+msgid ""
+"This feature automatically creates project tasks from service products in "
+"sale orders.\n"
+"                More precisely, tasks are created for procurement lines with "
+"product of type 'Service',\n"
+"                procurement method 'Make to Order', and supply method "
+"'Manufacture'.\n"
+"                This installs the module project_mrp."
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_03
+msgid "Experiment"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: selection:report.project.task.user,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project
+#: field:project.task,kanban_state:0
+#: field:project.task.history,kanban_state:0
+#: field:project.task.history.cumulative,kanban_state:0
+msgid "Kanban State"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_timesheet:0
+msgid "Record timesheet lines per tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Normal"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_project_user
+msgid "User"
+msgstr ""
+
+#. module: project
+#: help:project.project,alias_model:0
+msgid ""
+"The kind of document created when an email is received on this project's "
+"email alias"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_config_settings
+#: view:project.config.settings:0
+msgid "Configure Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Tasks's Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1332
+#, python-format
+msgid "Please delete the project linked with this account first."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a manager"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,description:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr ""
+
+#. module: project
+#: help:project.task.type,case_default:0
+msgid ""
+"If you check this field, this stage will be proposed by default on each new "
+"project. It will not assign this stage to existing projects."
+msgstr ""
+
+#. module: project
+#: field:project.task,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_long_term:0
+msgid ""
+"A long term project management module that tracks planning, scheduling, and "
+"resource allocation.\n"
+"                This installs the module project_long_term."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue_sheet:0
+msgid ""
+"Provides timesheet support for the issues/bugs management in project.\n"
+"                This installs the module project_issue_sheet."
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Followers Only"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: field:project.project,task_count:0
+msgid "Open Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.project,sequence:0
+#: field:project.task,sequence:0
+#: field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,year:0
+msgid "Year"
+msgstr ""
+
+#. module: project
+#: field:project.project,type_ids:0
+#: view:project.task.type:0
+msgid "Tasks Stages"
+msgstr ""
diff --git a/addons/project_issue/i18n/he.po b/addons/project_issue/i18n/he.po
new file mode 100644
index 00000000000..a371ffffa71
--- /dev/null
+++ b/addons/project_issue/i18n/he.po
@@ -0,0 +1,984 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-12-26 23:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-27 05:22+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: project_issue
+#: model:project.category,name:project_issue.project_issue_category_03
+msgid "Deadly bug"
+msgstr ""
+
+#. module: project_issue
+#: help:project.config.settings,fetchmail_issue:0
+msgid ""
+"Allows you to configure your incoming mail server, and create issues from "
+"incoming emails."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: project_issue
+#: help:account.analytic.account,use_issues:0
+msgid "Check this field if this project manages issues"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:479
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,inactivity_days:0
+msgid "Difference in days between last action and current date"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,days_since_creation:0
+msgid "Days since creation date"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,inactivity_days:0
+msgid "Days since last action"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to report a new issue.\n"
+"          </p><p>\n"
+"            The OpenERP issues tacker allows you to efficiantly manage "
+"things\n"
+"            like internal requests, software development bugs, customer\n"
+"            complaints, project troubles, material breakdowns, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,description:0
+msgid "Private Note"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Edit..."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:366
+#, python-format
+msgid "Project issue <b>converted</b> to task."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "New"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,channel_id:0
+#: field:project.issue.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:388
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Unassigned Issues"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: view:project.issue.report:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "To Do Issues"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.config.settings,fetchmail_issue:0
+msgid "Create issues from an incoming email account "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,stage_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:516
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Delete"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:371
+#, python-format
+msgid "Tasks"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: model:project.category,name:project_issue.project_issue_category_01
+msgid "Little problem"
+msgstr ""
+
+#. module: project_issue
+#: view:project.project:0
+msgid "creates"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Project:"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Open Features"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,channel_id:0
+msgid "Communication channel."
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: field:project.issue.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,kanban_state:0
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,issue_count:0
+msgid "unknown"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Category:"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "New Issues"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:479
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,days_since_creation:0
+msgid "Difference in days between creation date and current date"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_issue
+#: view:project.config.settings:0
+msgid "Configure"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_issue
+#: field:account.analytic.account,use_issues:0
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+#: view:project.project:0
+msgid "Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "To Do"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,name:0
+#: view:project.project:0
+msgid "Issue"
+msgstr ""
+
+#. module: project_issue
+#: model:project.category,name:project_issue.project_issue_category_02
+msgid "PBCK"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a new version.\n"
+"              </p><p>\n"
+"                Define here the different versions of your products on "
+"which\n"
+"                you can work on issues.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to open the project issue."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "⇒ Escalate"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
diff --git a/addons/resource/i18n/he.po b/addons/resource/i18n/he.po
new file mode 100644
index 00000000000..00e5ec58e2c
--- /dev/null
+++ b/addons/resource/i18n/he.po
@@ -0,0 +1,351 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-30 19:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of Week"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency Factor"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/resource.py:455
+#, python-format
+msgid "Make sure the Working time has been configured with proper week days!"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/resource.py:373
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.attendance:0
+msgid "Hours"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup Manager"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr ""
+
+#. module: resource
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Start and End time of working."
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Working Period"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_calendar_form
+msgid ""
+"Define working hours and time table that could be scheduled to your project "
+"members"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Starting Date of Leave"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficiency of "
+"200%, then his load will only be 50%."
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/resource.py:455
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Duration"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr ""
diff --git a/addons/sale/i18n/he.po b/addons/sale/i18n/he.po
new file mode 100644
index 00000000000..2c26dfd7674
--- /dev/null
+++ b/addons/sale/i18n/he.po
@@ -0,0 +1,2132 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-12-30 19:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:565
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:185
+#: code:addons/sale/sale.py:363
+#: code:addons/sale/sale.py:504
+#: code:addons/sale/sale.py:598
+#: code:addons/sale/sale.py:763
+#: code:addons/sale/sale.py:780
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sales "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#: code:addons/sale/sale.py:820
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the status of the quotation or sales order.              \n"
+"The exception status is automatically set when a cancel operation occurs     "
+"          in the invoice validation (Invoice Exception) or in the picking "
+"list process (Shipping Exception).\n"
+"The 'Waiting Schedule' status is set when the invoice is confirmed           "
+"    but waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:277
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Features"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:287
+#: code:addons/sale/sale.py:584
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:820
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:764
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:97
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:960
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:364
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:307
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:564
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sales Orders"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sales order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:598
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sales order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sales Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid ""
+"All items in these order lines will be invoiced. You can also invoice a "
+"percentage of the sales order\n"
+"                    or a fixed price (for advances) directly from the sales "
+"order form if you prefer."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:942
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:444
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:308
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: model:ir.model,name:sale.model_account_invoice
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:944
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order "
+msgstr ""
+
+#. module: sale
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:505
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sales order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:952
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"On demand: A draft invoice can be created from the sales order when needed. "
+"\n"
+"On delivery order: A draft invoice can be created from the delivery order "
+"when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be "
+"paid before the products can be delivered."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_quotations
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sales order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:781
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Number"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice.py:55
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sales order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sales order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sales\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sales order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:983
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:865
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 1ec788e72b9..eb5a57ff7d1 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2010-08-07 04:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2013-12-27 04:26+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:42+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-28 05:19+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "銷售分析科目"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -29,24 +29,24 @@ msgstr "確認報價"
 #. module: sale
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "業務儀錶版"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
 #, python-format
 msgid "There is no income account defined as global property."
-msgstr ""
+msgstr "沒有任何收益科目被定義為全域屬性。"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "依訂單項目開立發票"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "確認日期"
 
 #. module: sale
 #: view:sale.order:0
@@ -58,12 +58,12 @@ msgstr "分類方式..."
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr ""
+msgstr "再分配給業務夥伴"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
 msgid "Invoice Order"
-msgstr ""
+msgstr "產生訂單發票"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -82,6 +82,12 @@ msgid ""
 "invoice automatically.\n"
 "            It installs the account_analytic_analysis module."
 msgstr ""
+"讓您可以自行定義客戶的合約條款：\n"
+"開立發票方式 (固定價格，根據工時表，定金發票)。\n"
+"固定價格( 如，每一開發人員 650 歐元/日 )\n"
+"期間 (如，一年的技術支援合約)\n"
+"您可以能夠依照合約執行進度自動開立發票。\n"
+"本項功能安裝於 account_analytic_analysis 模組。"
 
 #. module: sale
 #: model:email.template,report_name:sale.email_template_edi_sale
@@ -89,6 +95,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -104,23 +112,23 @@ msgstr "採購方式"
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "銷售訂單於該日期確認"
 
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
 msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "在業務銷售中啟用多個分析科目"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: sale
 #: code:addons/sale/sale.py:565
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "請先取消此銷售訂單附帶的所有發票。"
 
 #. module: sale
 #: view:sale.order:0
@@ -140,7 +148,7 @@ msgstr "未讀訊息"
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
@@ -166,17 +174,17 @@ msgstr "發票異常情況"
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "報價 "
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr ""
+msgstr "報價單草稿"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "送貨地址"
 
 #. module: sale
 #: view:sale.report:0
@@ -188,7 +196,7 @@ msgstr "分析科目"
 #. module: sale
 #: field:sale.config.settings,module_sale_journal:0
 msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
+msgstr "允許透過日記帳的送貨單批次大量開立發票。"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -199,7 +207,7 @@ msgstr "小計"
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -215,39 +223,39 @@ msgstr "重量"
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Warehouse Features"
-msgstr ""
+msgstr "倉儲功能"
 
 #. module: sale
 #: field:sale.config.settings,time_unit:0
 msgid "The default working time unit for services is"
-msgstr ""
+msgstr "預設的服務工時單位是"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Unit of Measure "
-msgstr ""
+msgstr "度量單位 "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "錯誤的資料"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "預付款金額必須為正值(大於零)"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sales order line."
-msgstr ""
+msgstr "讓您可以對銷售訂單每個項目給予折扣"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr ""
+msgstr "銷售訂單項目在完成狀態"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -257,7 +265,7 @@ msgstr "按要求"
 #. module: sale
 #: field:sale.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "訊息"
 
 #. module: sale
 #: field:sale.report,state:0
@@ -303,6 +311,8 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
+"從庫存：當需要時，產品由庫存取得或等待庫存回補。\n"
+"依訂單：當需要時，產品是經由採購或自行生產。"
 
 #. module: sale
 #: help:sale.config.settings,module_analytic_user_function:0
@@ -315,6 +325,10 @@ msgid ""
 "available.\n"
 "                This installs the module analytic_user_function."
 msgstr ""
+"讓您可以自行定義某個使用者於指定科目的預設功能。\n"
+"主要用於當使用者加密自己的工時表。\n"
+"數值會自動取得，欄位會自動填入。但仍然可以更改相關數值。\n"
+"本功能會附帶安裝  analytic_user_function 模組。"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -326,22 +340,22 @@ msgstr "已取消"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
+msgstr "與我的銷售訂單相關的訂單項目"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Quotation Sent"
-msgstr ""
+msgstr "報價單已送出"
 
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "電子郵件撰寫精靈"
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "當有新訊息時通知您。"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -375,12 +389,12 @@ msgstr "發票地址"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "銷售訂單於該日期建立。"
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "否"
 
 #. module: sale
 #: help:sale.advance.payment.inv,advance_payment_method:0
@@ -391,17 +405,21 @@ msgid ""
 "                Use Some Order Lines to invoice a selection of the sales "
 "order lines."
 msgstr ""
+"依全部金額開立最終發票。\n"
+"                依「百分比」來按總金額比例開立發票。\n"
+"                依「固定金額」來開立預付款項的發票。\n"
+"                依「部分訂單項目」按所選的訂單項目開立發票。"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "開立發票"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "稅"
 
 #. module: sale
 #: code:addons/sale/sale.py:277
@@ -409,7 +427,7 @@ msgstr ""
 #: code:addons/sale/sale.py:983
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "無效的動作"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -425,13 +443,13 @@ msgstr ""
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "確認日期"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "明細數"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -449,7 +467,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "數量"
 
 #. module: sale
 #: report:sale.order:0
@@ -461,24 +479,24 @@ msgstr "傳真 :"
 #, python-format
 msgid ""
 "In order to delete a confirmed sales order, you must cancel it before !"
-msgstr ""
+msgstr "要刪除已確認的銷售訂單前，您必須先取消它。"
 
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(更新)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "業務夥伴"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contract Features"
-msgstr ""
+msgstr "合約功能"
 
 #. module: sale
 #: code:addons/sale/sale.py:287
@@ -497,7 +515,7 @@ msgstr "銷貨單"
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sales order lines"
-msgstr ""
+msgstr "允許依銷售訂單逐項開立發票"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -507,7 +525,7 @@ msgstr "銷貨單明㚼"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "預付款總額"
 
 #. module: sale
 #: help:sale.order,invoice_exists:0
@@ -524,12 +542,12 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "一位員工在不同合約中可以有不同角色"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Invoice the whole sales order"
-msgstr ""
+msgstr "依整張銷售訂單開立發票"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -544,13 +562,13 @@ msgstr "確認"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "準備依工時開立發票"
 
 #. module: sale
 #: code:addons/sale/sale.py:820
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
-msgstr ""
+msgstr "您無法取消已開發票的銷售訂單項目。"
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -568,27 +586,27 @@ msgstr "已運送數量"
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "允許使用不同的度量單位"
 
 #. module: sale
 #: model:mail.message.subtype,name:sale.mt_order_confirmed
 msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "銷售訂單已確認"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+msgstr "尚未確認的銷售訂單"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "列印"
 
 #. module: sale
 #: report:sale.order:0
@@ -610,7 +628,7 @@ msgstr "折扣(%)"
 #: code:addons/sale/sale.py:764
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "請為此產品定義收益科目  \"%s\" (id:%d) 。"
 
 #. module: sale
 #: field:sale.order.line,invoice_lines:0
@@ -626,7 +644,7 @@ msgstr "總價"
 #. module: sale
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sales orders."
-msgstr ""
+msgstr "讓您可為銷售訂單指定一分析科目。"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -640,24 +658,24 @@ msgstr ""
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "點選此項目，發票將以同一客戶分群"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 msgid "Make Invoices"
-msgstr ""
+msgstr "開立發票"
 
 #. module: sale
 #: code:addons/sale/res_config.py:97
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "時"
 
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr ""
+msgstr "銷售訂單數量"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -668,22 +686,25 @@ msgid ""
 "user-wise as well as month wise.\n"
 "                This installs the module account_analytic_analysis."
 msgstr ""
+"修改科目分析檢視是為了顯示重要資料提供給服務公司的專案經理。\n"
+"                您也可以檢視依使用者或依月份的科目分析摘要報表。\n"
+"                此功能將會安裝 account_analytic_analysis 模組。"
 
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "待開發票"
 
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "當前銷售訂單的發票地址。"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -693,12 +714,12 @@ msgstr "已訂數量"
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered Year of the sales order"
-msgstr ""
+msgstr "銷售訂單的年份"
 
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sales Orders"
-msgstr ""
+msgstr "銷售訂單中的地址"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -715,12 +736,12 @@ msgstr "總計 :"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines ready to be invoiced"
-msgstr ""
+msgstr "銷售訂單項目已可開立發票"
 
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "我的業務銷售"
 
 #. module: sale
 #: field:sale.order,name:0
@@ -731,12 +752,12 @@ msgstr "訂單參考"
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "財務結構"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -751,11 +772,16 @@ msgid ""
 "             \n"
 "* The 'Cancelled' status is set when a user cancel the sales order related."
 msgstr ""
+"* 「草稿」狀態，指相關的銷售訂單仍是草稿。 \n"
+"* 「確認」狀態，指相關的銷售訂單已完成確認。  \n"
+"* 「異常」狀態，指相關的銷售訂單有異常狀態 。\n"
+"* 「完成」狀態，指相關的銷售訂單已經完成取貨時。  \n"
+"* 「取消」狀態，指使用者取消該銷售訂單。"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Default Options"
-msgstr ""
+msgstr "預設選項"
 
 #. module: sale
 #: code:addons/sale/sale.py:960
@@ -768,7 +794,7 @@ msgstr "設定錯誤！"
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "業務銷售分析科目"
 
 #. module: sale
 #: view:sale.order:0
@@ -784,7 +810,7 @@ msgstr "狀態"
 msgid ""
 "After clicking 'Show Lines to Invoice', select lines to invoice and create "
 "the invoice from the 'More' dropdown menu."
-msgstr ""
+msgstr "點選 「依訂單項目開立發票」 後，選擇要開發票的項目並從下拉式選項「更多」 建立發票。"
 
 #. module: sale
 #: view:sale.order:0
@@ -800,7 +826,7 @@ msgstr "EDI 價目表 (%s)"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Delivery Order"
-msgstr ""
+msgstr "依送貨單"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -810,24 +836,24 @@ msgstr "發票程序"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "訂單日期"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "銷售訂單已完成"
 
 #. module: sale
 #: code:addons/sale/sale.py:364
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "請為此公司 \"%s\" (id:%d) 定義銷售日記帳。"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
-msgstr ""
+msgstr "報價與業務銷售"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -838,12 +864,12 @@ msgstr "已付"
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
-msgstr ""
+msgstr "允許您針對產品選擇與維護不同的度量單位"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "參考度量單位"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
@@ -853,7 +879,7 @@ msgstr "開立並檢視發票"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales order lines done"
-msgstr ""
+msgstr "銷售訂單項目已完成"
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
@@ -863,18 +889,18 @@ msgstr "發票分類"
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "預付款發票總金額"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "銷售開立發票"
 
 #. module: sale
 #: code:addons/sale/sale.py:307
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "價格表警示！"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -890,11 +916,14 @@ msgid ""
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
+"由於以下原因無法為此銷售訂單項目開立發票： \n"
+"1. 銷售訂單項目的狀態是「草稿」或「取消」！\n"
+"2. 銷售訂單項目已開立發票。"
 
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
-msgstr ""
+msgstr "新增並檢視發票"
 
 #. module: sale
 #: view:board.board:0
@@ -910,7 +939,7 @@ msgstr "發票"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "十二月"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -926,17 +955,17 @@ msgstr "已出貨"
 #: view:sale.report:0
 #: field:sale.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "貨幣"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "未開立發票"
 
 #. module: sale
 #: view:sale.report:0
@@ -948,7 +977,7 @@ msgstr "產品類別"
 #: code:addons/sale/sale.py:564
 #, python-format
 msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "無法取消此銷售訂單!"
 
 #. module: sale
 #: view:sale.order:0
@@ -958,7 +987,7 @@ msgstr "重新開立發票"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "可依客戶或產品來設定警示訊息"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -968,7 +997,7 @@ msgstr "商店名稱"
 #. module: sale
 #: view:sale.order:0
 msgid "My Sales Orders"
-msgstr ""
+msgstr "我的銷售訂單"
 
 #. module: sale
 #: report:sale.order:0
@@ -992,18 +1021,18 @@ msgstr "先開發票"
 msgid ""
 "To allow your salesman to make invoices for sales order lines using the menu "
 "'Lines to Invoice'."
-msgstr ""
+msgstr "允許您的業務人員使用「依訂單項目開立發票」為銷售訂單項目開立發票。"
 
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "開啟業務銷售選單"
 
 #. module: sale
 #: code:addons/sale/sale.py:598
 #, python-format
 msgid "You cannot confirm a sales order which has no line."
-msgstr ""
+msgstr "您無法確認沒有銷售項目的銷售訂單。"
 
 #. module: sale
 #: selection:sale.report,state:0
@@ -1019,7 +1048,7 @@ msgstr "未定義客戶 !"
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sales orders"
-msgstr ""
+msgstr "由銷售訂單自動帶出送貨單"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1036,12 +1065,12 @@ msgstr "確認"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
 #, python-format
 msgid "Advance of %s %%"
-msgstr ""
+msgstr "%s %%的預付款"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "銷售項目開立發票"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1056,12 +1085,12 @@ msgstr "郵件範本"
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "業務夥伴有特定產品業務分配"
 
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract / Analytic"
-msgstr ""
+msgstr "合約 / 分析"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1072,7 +1101,7 @@ msgstr "等待排程"
 #. module: sale
 #: field:sale.order,note:0
 msgid "Terms and conditions"
-msgstr ""
+msgstr "條款"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders
@@ -1084,37 +1113,37 @@ msgstr "銷貨單"
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "稅額"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 msgid "Invoiced Ratio"
-msgstr ""
+msgstr "已開發票比例"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "應需求"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "驅動採購與開立發票"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "待辦"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1129,6 +1158,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                點擊定義一個新的銷售店點。\n"
+"              </p><p>\n"
+"                每一張報價單或銷售訂單都必須連結到一個銷售店點，\n"
+"                銷售店點也對每筆訂單定義發貨倉庫。.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1140,29 +1176,29 @@ msgstr "訂單"
 #: model:ir.ui.menu,name:sale.menu_report_product_all
 #: view:sale.report:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "業務銷售分析"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "為關注者"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
 "Sales Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
-msgstr ""
+msgstr "已確認、已完成或在例外狀態，且尚未開立發票的銷售訂單"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "銷售訂單統計"
 
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: sale
 #: report:sale.order:0
@@ -1173,17 +1209,17 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "銷售人員"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "進階篩選..."
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
@@ -1195,7 +1231,7 @@ msgstr "報價單"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr ""
+msgstr "預付型產品"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1205,7 +1241,7 @@ msgstr "異常情況"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1214,12 +1250,14 @@ msgid ""
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
 msgstr ""
+"假如銷售訂單中的送貨方式是「送貨並手動開立發票」，則由銷售人員手動開立發票。 \r\n"
+"假如銷售訂單中的送貨方式是「先付款再送貨」，則發票會自動產生。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "銷售店點"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_stock:0
@@ -1228,6 +1266,8 @@ msgid ""
 "Manage Related Stock.\n"
 "                    This installs the module sale_stock."
 msgstr ""
+"於建立報價單、銷售訂單時，允許使用不同的下單策略並且管理與其相關庫存。\n"
+"此功能將會安裝 sale_stock 模組。"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -1236,16 +1276,18 @@ msgid ""
 "                You may have to create it and set it as a default value on "
 "this field."
 msgstr ""
+"選擇產品類型為服務的「預付型產品」。\n"
+"                你可能須建立它並且將其設為此欄位的預設值。"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sales order lines"
-msgstr ""
+msgstr "允許依銷售訂單項目設定折扣"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_in_progress
@@ -1259,7 +1301,7 @@ msgid ""
 "percentage of the sales order\n"
 "                    or a fixed price (for advances) directly from the sales "
 "order form if you prefer."
-msgstr ""
+msgstr "在訂單項目中的所有項目將會開立發票。您也能開立部分金額的發票，或者也能直接以固定金額開立發票（針對預付款）。"
 
 #. module: sale
 #: help:sale.config.settings,module_warning:0
@@ -1269,16 +1311,19 @@ msgid ""
 "Example: Product: this product is deprecated, do not purchase more than 5.\n"
 "                Supplier: don't forget to ask for an express delivery."
 msgstr ""
+"允許針對產品設定警示訊息，當使用者要求銷售指定商品或銷售給指定客戶時發出警示。\n"
+"例如：產品：本產品已停產，請勿購買超過5個。\n"
+"            供應商：別忘記要求快遞。"
 
 #. module: sale
 #: field:sale.order,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal 網址"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "銷售訂單相關的分析科目"
 
 #. module: sale
 #: view:sale.order:0
@@ -1288,19 +1333,19 @@ msgstr "檢視發票"
 #. module: sale
 #: field:sale.advance.payment.inv,advance_payment_method:0
 msgid "What do you want to invoice?"
-msgstr ""
+msgstr "您要開立什麼的發票?"
 
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "使用價格表依客戶調整報價"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
 msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
-msgstr ""
+msgstr "業務人員確認報價。銷售訂單的狀態更動為 '處理中' 或 '手動處理中'。"
 
 #. module: sale
 #: code:addons/sale/sale.py:942
@@ -1309,24 +1354,26 @@ msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"您必須在銷售表單中選擇一個價格表或者一位客戶！\n"
+"請在選擇產品前設定其中一項。"
 
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "產生此份銷售訂單需求的文件參考"
 
 #. module: sale
 #: code:addons/sale/sale.py:955
 #, python-format
 msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "找不到有效的價格表項目！"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115
 #, python-format
 msgid "Advance of %s %s"
-msgstr ""
+msgstr "預付款: %s %s"
 
 #. module: sale
 #: view:sale.report:0
@@ -1340,27 +1387,27 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "報價單"
 
 #. module: sale
 #: help:account.config.settings,module_sale_analytic_plans:0
 msgid "This allows install module sale_analytic_plans."
-msgstr ""
+msgstr "這讓您可以安裝 sale_analytic_plans 模組。"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "忽略例外情形"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "目前銷售訂單的送貨地址"
 
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr ""
+msgstr "顯示銷售訂單利潤"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1378,12 +1425,12 @@ msgstr "您的參考"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "顯示將開立發票的訂單項目"
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "下單日期"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -1401,12 +1448,12 @@ msgstr "增值稅(TVA) :"
 #: code:addons/sale/sale.py:444
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "客戶發票"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "需開立發票的已確認銷售訂單。"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
@@ -1429,7 +1476,7 @@ msgstr "銷售"
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
 "prices of existing order lines will not be updated."
-msgstr ""
+msgstr "假如你更動此訂單的價格清單(及幣別)，已經存在的訂單明細項目價格並不會被更新。"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1444,7 +1491,7 @@ msgstr "自庫存"
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "報價日期"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1478,7 +1525,7 @@ msgstr "發票"
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr ""
+msgstr "我的銷售訂單項目"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -1491,29 +1538,29 @@ msgstr "取消"
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "關注者"
 
 #. module: sale
 #: code:addons/sale/sale.py:944
 #, python-format
 msgid "No Pricelist ! : "
-msgstr ""
+msgstr "無價格表！ : "
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order "
-msgstr ""
+msgstr "銷售訂單 "
 
 #. module: sale
 #: model:mail.message.subtype,description:sale.mt_order_sent
 #: model:mail.message.subtype,name:sale.mt_order_sent
 msgid "Quotation send"
-msgstr ""
+msgstr "報價單已送出"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "尋找尚未開立發票的訂單項目"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -1523,7 +1570,7 @@ msgstr ""
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "訂單編號在同一公司內不可重複！"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -1555,7 +1602,7 @@ msgstr ""
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sales Order"
-msgstr ""
+msgstr "銷售訂單開立發票"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -1568,7 +1615,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
 msgid "Use contracts management"
-msgstr ""
+msgstr "使用合約管理"
 
 #. module: sale
 #: code:addons/sale/sale.py:952
@@ -1581,7 +1628,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "訂單預付款發票"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -1596,7 +1643,7 @@ msgstr "開立發票"
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "未稅金額"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1606,7 +1653,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "這表示此發票已支付。"
 
 #. module: sale
 #: report:sale.order:0
@@ -1617,7 +1664,7 @@ msgstr "單價"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: sale
 #: view:sale.order:0
@@ -1724,23 +1771,23 @@ msgstr "產品"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "總金額"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Sale"
-msgstr ""
+msgstr "確認銷售訂單"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:96
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "這個產品沒有定義收益科目: \"%s\" (id:%d)."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
@@ -1788,7 +1835,7 @@ msgstr "電話 :"
 #. module: sale
 #: view:sale.make.invoice:0
 msgid "Do you really want to create the invoice(s)?"
-msgstr ""
+msgstr "您真的要開立發票嗎?"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
diff --git a/addons/sale_crm/i18n/he.po b/addons/sale_crm/i18n/he.po
new file mode 100644
index 00000000000..09018b26e34
--- /dev/null
+++ b/addons/sale_crm/i18n/he.po
@@ -0,0 +1,160 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-30 19:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Insufficient Data!"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Mark Won"
+msgstr ""
+
+#. module: sale_crm
+#: field:res.users,default_section_id:0
+msgid "Default Sales Team"
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
+msgstr ""
+
+#. module: sale_crm
+#: field:sale.order,categ_ids:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:127
+#: code:addons/sale_crm/wizard/crm_make_sale.py:138
+#, python-format
+msgid "Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:95
+#, python-format
+msgid "Opportunity: %s"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:113
+#, python-format
+msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "No addresse(s) defined for this customer."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
+#. module: sale_crm
+#: view:account.invoice:0
+#: field:account.invoice,section_id:0
+#: field:account.invoice.report,section_id:0
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Create Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "or"
+msgstr ""
diff --git a/addons/sale_crm/i18n/zh_TW.po b/addons/sale_crm/i18n/zh_TW.po
index 7082c912a89..7d11cc6dbdf 100644
--- a/addons/sale_crm/i18n/zh_TW.po
+++ b/addons/sale_crm/i18n/zh_TW.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2009-01-30 13:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2013-12-29 15:49+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:19+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "資料不足！"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -31,27 +31,27 @@ msgstr ""
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "發票統計"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "標記為成交"
 
 #. module: sale_crm
 #: field:res.users,default_section_id:0
 msgid "Default Sales Team"
-msgstr ""
+msgstr "預設業務團隊"
 
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "使用者"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -62,7 +62,7 @@ msgstr ""
 #. module: sale_crm
 #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
 msgid "Quotation Send"
-msgstr ""
+msgstr "報價已送出"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
@@ -74,12 +74,12 @@ msgstr ""
 #: code:addons/sale_crm/wizard/crm_make_sale.py:138
 #, python-format
 msgid "Quotation"
-msgstr ""
+msgstr "報價單"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "客戶"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
diff --git a/addons/sale_margin/i18n/zh_TW.po b/addons/sale_margin/i18n/zh_TW.po
new file mode 100644
index 00000000000..fde65360a95
--- /dev/null
+++ b/addons/sale_margin/i18n/zh_TW.po
@@ -0,0 +1,46 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-29 16:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: sale_margin
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "成本價"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "銷售訂單"
+
+#. module: sale_margin
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "毛利"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "銷售訂單細項"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and the cost price."
+msgstr "獲利由計算單價與成本價的差異得之"
diff --git a/addons/sale_mrp/i18n/zh_TW.po b/addons/sale_mrp/i18n/zh_TW.po
new file mode 100644
index 00000000000..389235ec9fd
--- /dev/null
+++ b/addons/sale_mrp/i18n/zh_TW.po
@@ -0,0 +1,43 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-29 16:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "生產單"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "指出銷售訂單名稱。"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "指出銷售訂單中的客戶參考。"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr "銷售參考"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr "銷售名稱"
diff --git a/addons/sale_order_dates/i18n/zh_TW.po b/addons/sale_order_dates/i18n/zh_TW.po
new file mode 100644
index 00000000000..273ad1ff532
--- /dev/null
+++ b/addons/sale_order_dates/i18n/zh_TW.po
@@ -0,0 +1,58 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-29 16:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-30 04:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: sale_order_dates
+#: view:sale.order:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "承諾日期"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "有效日期"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "提貨單建立日期。"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date requested by the customer for the sale."
+msgstr "由訂單客戶所要求的日期。"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "要求日期"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "銷售訂單"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Committed date for delivery."
+msgstr "承諾交貨日期"
diff --git a/addons/share/i18n/he.po b/addons/share/i18n/he.po
new file mode 100644
index 00000000000..479447d50cf
--- /dev/null
+++ b/addons/share/i18n/he.po
@@ -0,0 +1,617 @@
+# Hebrew translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-30 19:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-31 04:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:842
+#, python-format
+msgid "Invitation to collaborate about %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:780
+#, python-format
+msgid ""
+"The share engine has not been able to fetch a record_id for your invitation."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Include an Optional Personal Message"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_option_title:0
+msgid "Display title"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access granted!"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,record_name:0
+msgid "Record name"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,message:0
+msgid ""
+"An optional personal message, to be included in the email notification."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Sharing method"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,name:0
+msgid "Share Title"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:877
+#, python-format
+msgid ""
+"The documents are not attached, you can view them online directly on my "
+"OpenERP server at:\n"
+"    %s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: model:ir.module.category,name:share.module_category_share
+msgid "Sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:843
+#: code:addons/share/wizard/share_wizard.py:875
+#, python-format
+msgid ""
+"Hello,\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Share Access URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,email_1:0
+#: field:share.wizard,email_2:0
+#: field:share.wizard,email_3:0
+msgid "New user email"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:887
+#, python-format
+msgid "You may use your current login (%s) and password to view them.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:621
+#, python-format
+msgid "(Modified)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:665
+#, python-format
+msgid "You must be a member of the Share/User group to use the share wizard."
+msgstr ""
+
+#. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:599
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_url:0
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
+#, python-format
+msgid "These are your credentials to access this protected area:\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
+#: view:share.wizard:0
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:571
+#, python-format
+msgid "(Duplicated for modified sharing permissions)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:669
+#, python-format
+msgid ""
+"Please indicate the emails of the persons to share with, one per line."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:662
+#, python-format
+msgid "Action and Access Mode are required to create a shared access."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing Options"
+msgstr ""
+
+#. module: share
+#. openerp-web
+#: code:addons/share/static/src/xml/share.xml:9
+#, python-format
+msgid "Invite"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Embedded code options"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Configuration"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:835
+#: code:addons/share/wizard/share_wizard.py:866
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Non-Share Groups"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"An email notification with instructions has been sent to the following "
+"people:"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:77
+#, python-format
+msgid "Direct link or embed code"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:856
+#: code:addons/share/wizard/share_wizard.py:890
+#, python-format
+msgid ""
+"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
+"Sales, HR, etc.)\n"
+"It is open source and can be found on http://www.openerp.com."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,record_name:0
+msgid "Name of the shared record, if sharing a precise record"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,user_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:61
+#: code:addons/share/wizard/share_wizard.py:657
+#, python-format
+msgid "Sharing access cannot be created."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:780
+#, python-format
+msgid "Record id not found"
+msgstr ""
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Share Groups"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:546
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,name:0
+msgid "Title for the share (displayed to users as menu and shortcut name)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:636
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,share_root_url:0
+msgid "Main access page for users that are granted shared access"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:206
+#, python-format
+msgid ""
+"You must configure your email address in the user preferences before using "
+"the Share button."
+msgstr ""
+
+#. module: share
+#: model:res.groups,name:share.group_share_user
+msgid "User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:658
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Use this link"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:852
+#: code:addons/share/wizard/share_wizard.py:884
+#, python-format
+msgid "Database"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share with these People (one email per line)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "{'search_default_no_share':1}"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,embed_code:0
+msgid ""
+"Embed this code in your documents to provide a link to the shared document."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:513
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:817
+#, python-format
+msgid "Invitation"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+msgid "Share your documents"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Or insert the following code where you want to embed your documents"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:886
+#, python-format
+msgid ""
+"The documents have been automatically added to your current OpenERP "
+"documents.\n"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_code:0
+msgid "Code"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:844
+#, python-format
+msgid ""
+"I have shared %s (%s) with you!\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,view_type:0
+msgid "Current View Type"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can view"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can edit"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:793
+#, python-format
+msgid "Shared access created!"
+msgstr ""
+
+#. module: share
+#: model:res.groups,comment:share.group_share_user
+msgid ""
+"\n"
+"Members of this groups have access to the sharing wizard, which allows them "
+"to invite external users to view or edit some of their documents."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:853
+#, python-format
+msgid ""
+"The documents have been automatically added to your subscriptions.\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:876
+#, python-format
+msgid ""
+"I've shared %s with you!\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,invite:0
+msgid "Invite users to OpenSocial record"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:77
+#: field:share.wizard,new_users:0
+#, python-format
+msgid "Emails"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_option_search:0
+msgid "Display search view"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,message:0
+msgid "Personal Message"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:835
+#: code:addons/share/wizard/share_wizard.py:866
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:205
+#, python-format
+msgid "No email address configured"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,login:0
+msgid "Login"
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing: preparation"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,access_mode:0
+msgid "Access rights to be granted on the shared documents."
+msgstr ""